mirror of
				https://github.com/Alfresco/alfresco-community-repo.git
				synced 2025-10-29 15:21:53 +00:00 
			
		
		
		
	Compare commits
	
		
			61 Commits
		
	
	
		
			23.7.0.2
			...
			dependabot
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 81e5bd509e | ||
|  | 00c36251d4 | ||
|  | ea9ce0c0c2 | ||
|  | 37231e50a2 | ||
|  | 26d8c7dcbe | ||
|  | 6ea97033d3 | ||
|  | cd0b2ffd24 | ||
|  | a14cbacb68 | ||
|  | fc0b9863d4 | ||
|  | 29dc42d445 | ||
|  | 39da968d76 | ||
|  | 6a4fecd46e | ||
|  | e083d4fcc2 | ||
|  | 53e8a06a6e | ||
|  | c80e1fa94b | ||
|  | 675c6f7aa1 | ||
|  | 44d67847da | ||
|  | d405043c5d | ||
|  | da50f6271c | ||
|  | a5e713c176 | ||
|  | 2dcd2788b2 | ||
|  | 6b738342c1 | ||
|  | ba5f5418ab | ||
|  | ee8f3bec18 | ||
|  | 39395af528 | ||
|  | e6f9d88779 | ||
|  | 70f70c6ed3 | ||
|  | 15045f9612 | ||
|  | c50c7c6a7e | ||
|  | 60199141f5 | ||
|  | b5e023950d | ||
|  | d4591acf2c | ||
|  | f34f2849dd | ||
|  | 52f2be49f3 | ||
|  | 748be1f4a0 | ||
|  | 52f1af2da6 | ||
|  | 626a97ff45 | ||
|  | 4a91132226 | ||
|  | b6fb8725ce | ||
|  | 5fc0d9edde | ||
|  | 44d394b1a0 | ||
|  | c1d62cca4d | ||
|  | 24ae4ce57c | ||
|  | b8f2ec252d | ||
|  | ae721c86f6 | ||
|  | aacef0c949 | ||
|  | e4edceda75 | ||
|  | 09ec6688c6 | ||
|  | 14025f00de | ||
|  | 22c5a5e134 | ||
|  | 154cad1ff8 | ||
|  | 7749b89e2b | ||
|  | bbb45e667b | ||
|  | a5f01e0d94 | ||
|  | 0c6d455ec4 | ||
|  | 5e86f5163e | ||
|  | 4981be1564 | ||
|  | 9a30fbb75a | ||
|  | 9c86fdb8b5 | ||
|  | c52f74832d | ||
|  | 70dd7642f4 | 
							
								
								
									
										184
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										184
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -44,14 +44,14 @@ jobs: | ||||
|       - uses: actions/checkout@v4 | ||||
|         with: | ||||
|           fetch-depth: 0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - id: changed-files | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/github-list-changes@v8.2.0 | ||||
|         with: | ||||
|           write-list-to-env: true | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: "Prepare maven cache and check compilation" | ||||
| @@ -69,12 +69,12 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[force') | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v8.2.0 | ||||
|         continue-on-error: true | ||||
|         with: | ||||
|           srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }} | ||||
| @@ -92,10 +92,10 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[force') | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v8.2.0 | ||||
|         with: | ||||
|           token: ${{ secrets.BOT_GITHUB_TOKEN }} | ||||
|           repository: "Alfresco/veracode-baseline-archive" | ||||
| @@ -142,9 +142,9 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[skip tests]') && | ||||
|       !contains(github.event.head_commit.message, '[force]') | ||||
|     steps: | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - uses: Alfresco/ya-pmd-scan@v4.1.0 | ||||
|         with: | ||||
|           classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\"" | ||||
| @@ -175,14 +175,14 @@ jobs: | ||||
|             testAttributes: "-Dtest=AllMmtUnitTestSuite" | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testModule }} | ||||
| @@ -213,7 +213,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -255,9 +255,9 @@ jobs: | ||||
|       REQUIRES_INSTALLED_ARTIFACTS: true | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Build" | ||||
|         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} | ||||
|         run: | | ||||
| @@ -270,7 +270,7 @@ jobs: | ||||
|         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} | ||||
| @@ -301,7 +301,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -334,9 +334,9 @@ jobs: | ||||
|         version: ['10.2.18', '10.4', '10.5'] | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: Run MariaDB ${{ matrix.version }} database | ||||
| @@ -345,7 +345,7 @@ jobs: | ||||
|           MARIADB_VERSION: ${{ matrix.version }} | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.version }} | ||||
| @@ -376,7 +376,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -405,9 +405,9 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[force') | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: "Run MariaDB 10.6 database" | ||||
| @@ -416,7 +416,7 @@ jobs: | ||||
|           MARIADB_VERSION: 10.6 | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} | ||||
| @@ -447,7 +447,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -476,9 +476,9 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[force') | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: "Run MySQL 8 database" | ||||
| @@ -487,7 +487,7 @@ jobs: | ||||
|           MYSQL_VERSION: 8 | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} | ||||
| @@ -518,7 +518,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -546,9 +546,9 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[force') | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: "Run PostgreSQL 13.12 database" | ||||
| @@ -557,7 +557,7 @@ jobs: | ||||
|           POSTGRES_VERSION: 13.12 | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} | ||||
| @@ -588,7 +588,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -616,9 +616,9 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[force') | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: "Run PostgreSQL 14.9 database" | ||||
| @@ -627,7 +627,7 @@ jobs: | ||||
|           POSTGRES_VERSION: 14.9 | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} | ||||
| @@ -658,7 +658,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -686,9 +686,9 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[force') | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: "Run PostgreSQL 15.4 database" | ||||
| @@ -697,7 +697,7 @@ jobs: | ||||
|           POSTGRES_VERSION: 15.4 | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} | ||||
| @@ -728,7 +728,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -754,16 +754,16 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[force') | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: "Run ActiveMQ" | ||||
|         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} | ||||
| @@ -794,7 +794,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -854,9 +854,9 @@ jobs: | ||||
|             mvn-options: '-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore' | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: "Set transformers tag" | ||||
| @@ -879,7 +879,7 @@ jobs: | ||||
|         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} ${{ matrix.idp }} | ||||
| @@ -910,7 +910,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -968,9 +968,9 @@ jobs: | ||||
|       REQUIRES_LOCAL_IMAGES: true | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Build" | ||||
|         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} | ||||
|         run: | | ||||
| @@ -986,7 +986,7 @@ jobs: | ||||
|         run: mvn install -pl :alfresco-community-repo-integration-test -am -DskipTests -Pall-tas-tests | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.test-name }} | ||||
| @@ -1024,7 +1024,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.tests.outcome }} | ||||
| @@ -1050,16 +1050,16 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[force') | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - name: "Run Postgres 15.4 database" | ||||
|         run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} | ||||
| @@ -1090,7 +1090,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -1124,9 +1124,9 @@ jobs: | ||||
|       REQUIRES_INSTALLED_ARTIFACTS: true | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Build" | ||||
|         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} | ||||
|         run: | | ||||
| @@ -1134,7 +1134,7 @@ jobs: | ||||
|           bash ./scripts/ci/build.sh | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (PostgreSQL) ${{ matrix.test-name }} | ||||
| @@ -1170,9 +1170,9 @@ jobs: | ||||
|       REQUIRES_INSTALLED_ARTIFACTS: true | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Build" | ||||
|         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} | ||||
|         run: | | ||||
| @@ -1180,7 +1180,7 @@ jobs: | ||||
|           bash ./scripts/ci/build.sh | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (MySQL) ${{ matrix.test-name }} | ||||
| @@ -1212,9 +1212,9 @@ jobs: | ||||
|       REQUIRES_LOCAL_IMAGES: true | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Build" | ||||
|         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} | ||||
|         run: | | ||||
| @@ -1228,7 +1228,7 @@ jobs: | ||||
|           mvn -B install -pl :alfresco-governance-services-automation-community-rest-api -am -Pags -Pall-tas-tests -DskipTests | ||||
|       - name: "Prepare Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-prepare@v8.2.0 | ||||
|         id: rp-prepare | ||||
|         with: | ||||
|           rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} | ||||
| @@ -1260,7 +1260,7 @@ jobs: | ||||
|         continue-on-error: true | ||||
|       - name: "Summarize Report Portal" | ||||
|         if: github.ref_name == 'master' | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v7.1.0 | ||||
|         uses: Alfresco/alfresco-build-tools/.github/actions/reportportal-summarize@v8.2.0 | ||||
|         id: rp-summarize | ||||
|         with: | ||||
|           tests-outcome: ${{ steps.run-tests.outcome }} | ||||
| @@ -1302,9 +1302,9 @@ jobs: | ||||
|       !contains(github.event.head_commit.message, '[force]') | ||||
|     steps: | ||||
|       - uses: actions/checkout@v4 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Build" | ||||
|         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }} | ||||
|         run: | | ||||
|   | ||||
							
								
								
									
										16
									
								
								.github/workflows/master_release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								.github/workflows/master_release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -34,12 +34,12 @@ jobs: | ||||
|       - uses: actions/checkout@v4 | ||||
|         with: | ||||
|           persist-credentials: false | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.2.0 | ||||
|         with: | ||||
|           username: ${{ env.GIT_USERNAME }} | ||||
|           email: ${{ env.GIT_EMAIL }} | ||||
| @@ -63,12 +63,12 @@ jobs: | ||||
|       - uses: actions/checkout@v4 | ||||
|         with: | ||||
|           persist-credentials: false | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.2.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0 | ||||
|       - name: "Init" | ||||
|         run: bash ./scripts/ci/init.sh | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.1.0 | ||||
|       - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v8.2.0 | ||||
|         with: | ||||
|           username: ${{ env.GIT_USERNAME }} | ||||
|           email: ${{ env.GIT_EMAIL }} | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|    <parent> | ||||
|       <groupId>org.alfresco</groupId> | ||||
|       <artifactId>alfresco-community-repo-amps</artifactId> | ||||
|       <version>23.4.0.67</version> | ||||
|       <version>25.1.0.9-SNAPSHOT</version> | ||||
|    </parent> | ||||
|  | ||||
|    <modules> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|    <parent> | ||||
|       <groupId>org.alfresco</groupId> | ||||
|       <artifactId>alfresco-governance-services-community-parent</artifactId> | ||||
|       <version>23.4.0.67</version> | ||||
|       <version>25.1.0.9-SNAPSHOT</version> | ||||
|    </parent> | ||||
|  | ||||
|    <modules> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|    <parent> | ||||
|       <groupId>org.alfresco</groupId> | ||||
|       <artifactId>alfresco-governance-services-automation-community-repo</artifactId> | ||||
|       <version>23.4.0.67</version> | ||||
|       <version>25.1.0.9-SNAPSHOT</version> | ||||
|    </parent> | ||||
|  | ||||
|    <build> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|    <parent> | ||||
|       <groupId>org.alfresco</groupId> | ||||
|       <artifactId>alfresco-governance-services-community-parent</artifactId> | ||||
|       <version>23.4.0.67</version> | ||||
|       <version>25.1.0.9-SNAPSHOT</version> | ||||
|    </parent> | ||||
|  | ||||
|    <modules> | ||||
|   | ||||
| @@ -8,7 +8,7 @@ | ||||
|    <parent> | ||||
|       <groupId>org.alfresco</groupId> | ||||
|       <artifactId>alfresco-governance-services-community-repo-parent</artifactId> | ||||
|       <version>23.4.0.67</version> | ||||
|       <version>25.1.0.9-SNAPSHOT</version> | ||||
|    </parent> | ||||
|  | ||||
|    <properties> | ||||
|   | ||||
| @@ -3,8 +3,8 @@ | ||||
| # | ||||
|  | ||||
| # Version label | ||||
| version.major=23 | ||||
| version.minor=4 | ||||
| version.major=25 | ||||
| version.minor=1 | ||||
| version.revision=0 | ||||
| version.label= | ||||
|  | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-governance-services-community-repo-parent</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <build> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <modules> | ||||
|   | ||||
| @@ -8,7 +8,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo-amps</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <properties> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|    <parent> | ||||
|       <groupId>org.alfresco</groupId> | ||||
|       <artifactId>alfresco-community-repo</artifactId> | ||||
|       <version>23.4.0.67</version> | ||||
|       <version>25.1.0.9-SNAPSHOT</version> | ||||
|    </parent> | ||||
|  | ||||
|    <dependencies> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <properties> | ||||
| @@ -118,6 +118,18 @@ | ||||
|             <groupId>org.jibx</groupId> | ||||
|             <artifactId>jibx-run</artifactId> | ||||
|             <version>1.4.2</version> | ||||
|             <exclusions> | ||||
|                 <!-- [ACS-5371] Excluded to avoid conflict in JDK9+ as it includes javax.xml--> | ||||
|                 <exclusion> | ||||
|                     <groupId>xpp3</groupId> | ||||
|                     <artifactId>xpp3</artifactId> | ||||
|                 </exclusion> | ||||
|             </exclusions> | ||||
|         </dependency> | ||||
|         <dependency> | ||||
|             <groupId>net.sf.kxml</groupId> | ||||
|             <artifactId>kxml2</artifactId> | ||||
|             <version>${dependency.kxml2.version}</version> | ||||
|         </dependency> | ||||
|         <dependency>  | ||||
|             <groupId>com.fasterxml.jackson.core</groupId>  | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <dependencies> | ||||
|   | ||||
| @@ -9,6 +9,6 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo-packaging</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
| </project> | ||||
|   | ||||
| @@ -146,6 +146,7 @@ libgif  http://giflib.sourceforge.net/ | ||||
| libfreetype http://www.freetype.org/ | ||||
| PostgreSQL  http://www.postgresql.org/ | ||||
| PostgreSQL JDBC Driver  http://www.postgresql.org/ | ||||
| kXML 2 	http://kxml.sourceforge.net/ | ||||
|  | ||||
|  | ||||
| === CDDL 1.0 === | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo-packaging</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <properties> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <modules> | ||||
|   | ||||
| @@ -6,7 +6,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo-packaging</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <modules> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo-tests</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <organization> | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo-tests</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <developers> | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo-tests</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <developers> | ||||
|   | ||||
| @@ -8,7 +8,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo-tests</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <properties> | ||||
| @@ -171,7 +171,7 @@ | ||||
|         <dependency> | ||||
|             <groupId>org.codehaus.groovy</groupId> | ||||
|             <artifactId>groovy</artifactId> | ||||
|             <version>3.0.22</version> | ||||
|             <version>3.0.23</version> | ||||
|         </dependency> | ||||
|  | ||||
|         <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json--> | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo-tests</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <developers> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo-packaging</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <properties> | ||||
|   | ||||
							
								
								
									
										35
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								pom.xml
									
									
									
									
									
								
							| @@ -2,7 +2,7 @@ | ||||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||||
|     <modelVersion>4.0.0</modelVersion> | ||||
|     <artifactId>alfresco-community-repo</artifactId> | ||||
|     <version>23.4.0.67</version> | ||||
|     <version>25.1.0.9-SNAPSHOT</version> | ||||
|     <packaging>pom</packaging> | ||||
|     <name>Alfresco Community Repo Parent</name> | ||||
|  | ||||
| @@ -23,8 +23,8 @@ | ||||
|     </modules> | ||||
|  | ||||
|     <properties> | ||||
|         <acs.version.major>23</acs.version.major> | ||||
|         <acs.version.minor>4</acs.version.minor> | ||||
|         <acs.version.major>25</acs.version.major> | ||||
|         <acs.version.minor>1</acs.version.minor> | ||||
|         <acs.version.revision>0</acs.version.revision> | ||||
|         <acs.version.label /> | ||||
|         <amp.min.version>${acs.version.major}.0.0</amp.min.version> | ||||
| @@ -64,38 +64,39 @@ | ||||
|         <dependency.cxf.version>4.0.5</dependency.cxf.version> | ||||
|         <dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.version> | ||||
|         <dependency.webscripts.version>9.4</dependency.webscripts.version> | ||||
|         <dependency.bouncycastle.version>1.78.1</dependency.bouncycastle.version> | ||||
|         <dependency.bouncycastle.version>1.79</dependency.bouncycastle.version> | ||||
|         <dependency.mockito-core.version>5.14.1</dependency.mockito-core.version> | ||||
|         <dependency.assertj.version>3.26.3</dependency.assertj.version> | ||||
|         <dependency.org-json.version>20240303</dependency.org-json.version> | ||||
|         <dependency.commons-dbcp.version>2.12.0</dependency.commons-dbcp.version> | ||||
|         <dependency.commons-io.version>2.17.0</dependency.commons-io.version> | ||||
|         <dependency.commons-dbcp.version>2.13.0</dependency.commons-dbcp.version> | ||||
|         <dependency.commons-io.version>2.18.0</dependency.commons-io.version> | ||||
|         <dependency.gson.version>2.11.0</dependency.gson.version> | ||||
|         <dependency.guava.version>33.3.1-jre</dependency.guava.version> | ||||
|         <dependency.httpclient.version>4.5.14</dependency.httpclient.version> | ||||
|         <dependency.httpcore.version>4.4.16</dependency.httpcore.version> | ||||
|         <dependency.httpcomponents-httpclient5.version>5.2.1</dependency.httpcomponents-httpclient5.version> | ||||
|         <dependency.httpcomponents-httpclient5.version>5.4.1</dependency.httpcomponents-httpclient5.version> | ||||
|         <dependency.httpcomponents-httpcore5.version>5.3</dependency.httpcomponents-httpcore5.version> | ||||
|         <dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version> | ||||
|         <dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version> | ||||
|         <dependency.slf4j.version>2.0.16</dependency.slf4j.version> | ||||
|         <dependency.log4j.version>2.23.1</dependency.log4j.version> | ||||
|         <dependency.groovy.version>3.0.22</dependency.groovy.version> | ||||
|         <dependency.groovy.version>3.0.23</dependency.groovy.version> | ||||
|         <dependency.tika.version>2.9.2</dependency.tika.version> | ||||
|         <dependency.truezip.version>7.7.10</dependency.truezip.version> | ||||
|         <dependency.poi.version>5.3.0</dependency.poi.version> | ||||
|         <dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version> | ||||
|         <dependency.camel.version>4.6.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies --> | ||||
|         <dependency.netty.version>4.1.113.Final</dependency.netty.version> <!-- must be in sync with camels transitive dependencies, e.g.: netty-common --> | ||||
|         <dependency.activemq.version>5.18.3</dependency.activemq.version> | ||||
|         <dependency.activemq.version>5.18.6</dependency.activemq.version> | ||||
|         <dependency.apache-compress.version>1.27.1</dependency.apache-compress.version> | ||||
|         <dependency.awaitility.version>4.2.2</dependency.awaitility.version> | ||||
|         <dependency.swagger-ui.version>4.1.3</dependency.swagger-ui.version> | ||||
|         <dependency.swagger-parser.version>1.0.71</dependency.swagger-parser.version> | ||||
|         <dependency.swagger-parser.version>1.0.72</dependency.swagger-parser.version> | ||||
|         <dependency.maven-filtering.version>3.1.1</dependency.maven-filtering.version> | ||||
|         <dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version> | ||||
|         <dependency.jdom2.version>2.0.6.1</dependency.jdom2.version> | ||||
|         <dependency.pooled-jms.version>3.1.6</dependency.pooled-jms.version> | ||||
|         <dependency.kxml2.version>2.3.0</dependency.kxml2.version> | ||||
|  | ||||
|         <dependency.jakarta-ee-jaxb-api.version>4.0.2</dependency.jakarta-ee-jaxb-api.version> | ||||
|         <dependency.jakarta-ee-jaxb-impl.version>4.0.5</dependency.jakarta-ee-jaxb-impl.version> | ||||
| @@ -154,7 +155,7 @@ | ||||
|         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection> | ||||
|         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection> | ||||
|         <url>https://github.com/Alfresco/alfresco-community-repo</url> | ||||
|         <tag>23.4.0.67</tag> | ||||
|         <tag>HEAD</tag> | ||||
|     </scm> | ||||
|  | ||||
|     <distributionManagement> | ||||
| @@ -371,7 +372,7 @@ | ||||
|             <dependency> | ||||
|                 <groupId>org.quartz-scheduler</groupId> | ||||
|                 <artifactId>quartz</artifactId> | ||||
|                 <version>2.3.2</version> | ||||
|                 <version>2.5.0</version> | ||||
|                 <!-- exclude c3p0 --> | ||||
|                 <!-- see https://issues.alfresco.com/jira/browse/REPO-3447 --> | ||||
|                 <exclusions> | ||||
| @@ -465,7 +466,7 @@ | ||||
|             <dependency> | ||||
|                 <groupId>org.apache.xmlbeans</groupId> | ||||
|                 <artifactId>xmlbeans</artifactId> | ||||
|                 <version>5.2.1</version> | ||||
|                 <version>5.2.2</version> | ||||
|             </dependency> | ||||
|             <dependency> | ||||
|                 <groupId>org.json</groupId> | ||||
| @@ -703,7 +704,7 @@ | ||||
|             <dependency> | ||||
|                 <groupId>com.networknt</groupId> | ||||
|                 <artifactId>json-schema-validator</artifactId> | ||||
|                 <version>1.5.1</version> | ||||
|                 <version>1.5.4</version> | ||||
|             </dependency> | ||||
|             <!-- upgrade dependency from TIKA --> | ||||
|             <dependency> | ||||
| @@ -950,7 +951,7 @@ | ||||
|             <dependency> | ||||
|                 <groupId>org.projectlombok</groupId> | ||||
|                 <artifactId>lombok</artifactId> | ||||
|                 <version>1.18.34</version> | ||||
|                 <version>1.18.36</version> | ||||
|                 <scope>provided</scope> | ||||
|             </dependency> | ||||
|             <dependency> | ||||
| @@ -1015,7 +1016,7 @@ | ||||
|                 </plugin> | ||||
|                 <plugin> | ||||
|                     <artifactId>maven-failsafe-plugin</artifactId> | ||||
|                     <version>3.5.1</version> | ||||
|                     <version>3.5.2</version> | ||||
|                 </plugin> | ||||
|                 <plugin> | ||||
|                     <artifactId>maven-jar-plugin</artifactId> | ||||
| @@ -1028,7 +1029,7 @@ | ||||
|                 <plugin> | ||||
|                     <groupId>org.apache.maven.plugins</groupId> | ||||
|                     <artifactId>maven-javadoc-plugin</artifactId> | ||||
|                     <version>3.10.1</version> | ||||
|                     <version>3.11.1</version> | ||||
|                 </plugin> | ||||
|                 <plugin> | ||||
|                     <groupId>org.apache.maven.plugins</groupId> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <dependencies> | ||||
| @@ -45,7 +45,7 @@ | ||||
|         <dependency> | ||||
|             <groupId>org.apache.santuario</groupId> | ||||
|             <artifactId>xmlsec</artifactId> | ||||
|             <version>4.0.2</version> | ||||
|             <version>4.0.3</version> | ||||
|         </dependency> | ||||
|         <!-- newer version, see REPO-3133 --> | ||||
|         <dependency> | ||||
| @@ -119,7 +119,7 @@ | ||||
|         <dependency> | ||||
|             <groupId>org.eclipse.jetty</groupId> | ||||
|             <artifactId>jetty-server</artifactId> | ||||
|             <version>11.0.15</version> | ||||
|             <version>11.0.24</version> | ||||
|             <scope>test</scope> | ||||
|             <exclusions> | ||||
|                 <exclusion> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
|     <parent> | ||||
|         <groupId>org.alfresco</groupId> | ||||
|         <artifactId>alfresco-community-repo</artifactId> | ||||
|         <version>23.4.0.67</version> | ||||
|         <version>25.1.0.9-SNAPSHOT</version> | ||||
|     </parent> | ||||
|  | ||||
|     <dependencies> | ||||
| @@ -850,12 +850,12 @@ | ||||
|                     </execution> | ||||
|                 </executions> | ||||
|                 <configuration> | ||||
|                     <complianceLevel>1.8</complianceLevel> | ||||
|                     <complianceLevel>17</complianceLevel> | ||||
|                     <outxml>false</outxml> | ||||
|                     <verbose>true</verbose> | ||||
|                     <showWeaveInfo>true</showWeaveInfo> | ||||
|                     <source>1.8</source> | ||||
|                     <target>1.8</target> | ||||
|                     <source>17</source> | ||||
|                     <target>17</target> | ||||
|                     <additionalCompilerArgs> | ||||
|                         <arg>-parameters</arg> | ||||
|                     </additionalCompilerArgs> | ||||
|   | ||||
| @@ -33,6 +33,9 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; | ||||
| import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; | ||||
| import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; | ||||
|  | ||||
| import org.apache.commons.logging.Log; | ||||
| import org.apache.commons.logging.LogFactory; | ||||
|  | ||||
| import org.alfresco.error.AlfrescoRuntimeException; | ||||
| import org.alfresco.repo.cache.SimpleCache; | ||||
| import org.alfresco.service.cmr.repository.ContentIOException; | ||||
| @@ -40,12 +43,9 @@ import org.alfresco.service.cmr.repository.ContentReader; | ||||
| import org.alfresco.service.cmr.repository.ContentWriter; | ||||
| import org.alfresco.util.GUID; | ||||
| import org.alfresco.util.Pair; | ||||
| import org.apache.commons.logging.Log; | ||||
| import org.apache.commons.logging.LogFactory; | ||||
|  | ||||
| /** | ||||
|  * A store providing support for content store implementations that provide | ||||
|  * routing of content read and write requests based on context. | ||||
|  * A store providing support for content store implementations that provide routing of content read and write requests based on context. | ||||
|  *  | ||||
|  * @see ContentContext | ||||
|  *  | ||||
| @@ -69,7 +69,8 @@ public abstract class AbstractRoutingContentStore implements ContentStore | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @param storesCache       cache of stores used to access URLs  | ||||
|      * @param storesCache | ||||
|      *            cache of stores used to access URLs | ||||
|      */ | ||||
|     public void setStoresCache(SimpleCache<Pair<String, String>, ContentStore> storesCache) | ||||
|     { | ||||
| @@ -82,21 +83,19 @@ public abstract class AbstractRoutingContentStore implements ContentStore | ||||
|     protected abstract List<ContentStore> getAllStores(); | ||||
|  | ||||
|     /** | ||||
|      * Get a content store based on the context provided.  The applicability of the | ||||
|      * context and even the types of context allowed are up to the implementation, but | ||||
|      * normally there should be a fallback case for when the parameters are not adequate | ||||
|      * to make a decision. | ||||
|      * Get a content store based on the context provided. The applicability of the context and even the types of context allowed are up to the implementation, but normally there should be a fallback case for when the parameters are not adequate to make a decision. | ||||
|      *  | ||||
|      * @param ctx       the context to use to make the choice | ||||
|      * @return          Returns the store most appropriate for the given context and | ||||
|      *                  <b>never <tt>null</tt></b> | ||||
|      * @param ctx | ||||
|      *            the context to use to make the choice | ||||
|      * @return Returns the store most appropriate for the given context and <b>never <tt>null</tt></b> | ||||
|      */ | ||||
|     protected abstract ContentStore selectWriteStore(ContentContext ctx); | ||||
|  | ||||
|     /** | ||||
|      * Checks the cache for the store and ensures that the URL is in the store. | ||||
|      *  | ||||
|      * @param contentUrl    the content URL to search for | ||||
|      * @param contentUrl | ||||
|      *            the content URL to search for | ||||
|      * @return Returns the store matching the content URL | ||||
|      */ | ||||
|     private ContentStore selectReadStore(String contentUrl) | ||||
| @@ -288,8 +287,7 @@ public abstract class AbstractRoutingContentStore implements ContentStore | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @return  Returns a valid reader from one of the stores otherwise | ||||
|      *          a {@link EmptyContentReader} is returned. | ||||
|      * @return Returns a valid reader from one of the stores otherwise a {@link EmptyContentReader} is returned. | ||||
|      */ | ||||
|     public ContentReader getReader(String contentUrl) throws ContentIOException | ||||
|     { | ||||
| @@ -335,13 +333,7 @@ public abstract class AbstractRoutingContentStore implements ContentStore | ||||
|                 { | ||||
|                     throw new ContentExistsException(this, contentUrl); | ||||
|                 } | ||||
|                 /* | ||||
|                  * We could go further and check each store for the existence of the URL, | ||||
|                  * but that would be overkill.  The main problem we need to prevent is | ||||
|                  * the simultaneous access of the same store.  The router represents | ||||
|                  * a single store and therefore if the URL is present in any of the stores, | ||||
|                  * it is effectively present in all of them. | ||||
|                  */ | ||||
|                 /* We could go further and check each store for the existence of the URL, but that would be overkill. The main problem we need to prevent is the simultaneous access of the same store. The router represents a single store and therefore if the URL is present in any of the stores, it is effectively present in all of them. */ | ||||
|             } | ||||
|             finally | ||||
|             { | ||||
| @@ -396,8 +388,7 @@ public abstract class AbstractRoutingContentStore implements ContentStore | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * This operation has to be performed on all the stores in order to maintain the | ||||
|      * {@link ContentStore#exists(String)} contract. | ||||
|      * This operation has to be performed on all the stores in order to maintain the {@link ContentStore#exists(String)} contract. | ||||
|      */ | ||||
|     public boolean delete(String contentUrl) throws ContentIOException | ||||
|     { | ||||
| @@ -470,7 +461,7 @@ public abstract class AbstractRoutingContentStore implements ContentStore | ||||
|         } | ||||
|         final String message = "Restoring content from archive: "; | ||||
|         logExecution(contentUrl, contentStore, message); | ||||
|         return ContentStore.super.requestRestoreContentFromArchive(contentUrl, restoreParams); | ||||
|         return contentStore.requestRestoreContentFromArchive(contentUrl, restoreParams); | ||||
|     } | ||||
|  | ||||
|     private void logExecution(final String contentUrl, final ContentStore contentStore, final String message) | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|  * #%L | ||||
|  * Alfresco Repository | ||||
|  * %% | ||||
|  * Copyright (C) 2005 - 2016 Alfresco Software Limited | ||||
|  * Copyright (C) 2005 - 2024 Alfresco Software Limited | ||||
|  * %% | ||||
|  * This file is part of the Alfresco software.  | ||||
|  * If the software was purchased under a paid Alfresco license, the terms of  | ||||
| @@ -25,14 +25,15 @@ | ||||
|  */ | ||||
| package org.alfresco.repo.site; | ||||
|  | ||||
| import java.util.Comparator; | ||||
| import java.util.List; | ||||
| import java.util.Optional; | ||||
|  | ||||
| import org.alfresco.api.AlfrescoPublicApi; | ||||
| import org.alfresco.query.CannedQuerySortDetails; | ||||
| import org.alfresco.service.cmr.site.SiteInfo; | ||||
| import org.alfresco.util.Pair; | ||||
|  | ||||
| import java.util.Comparator; | ||||
| import java.util.List; | ||||
|  | ||||
| /** | ||||
|  * Conveys information for a member of a site. | ||||
|  * | ||||
| @@ -76,13 +77,8 @@ public class SiteMembership extends AbstractSiteMembership | ||||
|             throw new java.lang.IllegalArgumentException( | ||||
|                     "FirstName required building site membership of " + siteInfo.getShortName()); | ||||
|         } | ||||
|         if (lastName == null) | ||||
|         { | ||||
|             throw new java.lang.IllegalArgumentException( | ||||
|                     "LastName required building site membership of " + siteInfo.getShortName()); | ||||
|         } | ||||
|         this.firstName = firstName; | ||||
|         this.lastName = lastName; | ||||
|         this.lastName = Optional.ofNullable(lastName).orElse(""); | ||||
|         this.isMemberOfGroup = isMemberOfGroup; | ||||
|     } | ||||
|  | ||||
| @@ -164,7 +160,6 @@ public class SiteMembership extends AbstractSiteMembership | ||||
|                 ", isMemberOfGroup = " + isMemberOfGroup + "]"; | ||||
|     } | ||||
|  | ||||
|  | ||||
|     static int compareTo(List<Pair<? extends Object, CannedQuerySortDetails.SortOrder>> sortPairs, SiteMembership o1, SiteMembership o2) | ||||
|     { | ||||
|         String personId1 = o1.getPersonId(); | ||||
|   | ||||
| @@ -3,7 +3,7 @@ | ||||
| repository.name=Main Repository | ||||
|  | ||||
| # Schema number | ||||
| version.schema=19300 | ||||
| version.schema=20000 | ||||
|  | ||||
| # Directory configuration | ||||
|  | ||||
|   | ||||
| @@ -2,7 +2,7 @@ | ||||
|  * #%L | ||||
|  * Alfresco Repository | ||||
|  * %% | ||||
|  * Copyright (C) 2005 - 2016 Alfresco Software Limited | ||||
|  * Copyright (C) 2005 - 2024 Alfresco Software Limited | ||||
|  * %% | ||||
|  * This file is part of the Alfresco software.  | ||||
|  * If the software was purchased under a paid Alfresco license, the terms of  | ||||
| @@ -29,11 +29,12 @@ import static org.junit.Assert.assertEquals; | ||||
|  | ||||
| import java.util.UUID; | ||||
|  | ||||
| import org.alfresco.service.cmr.site.SiteInfo; | ||||
| import org.alfresco.service.cmr.site.SiteVisibility; | ||||
| import org.junit.Before; | ||||
| import org.junit.Test; | ||||
|  | ||||
| import org.alfresco.service.cmr.site.SiteInfo; | ||||
| import org.alfresco.service.cmr.site.SiteVisibility; | ||||
|  | ||||
| /** | ||||
|  * Test Membership constructor logs. Based on REPO-2520 | ||||
|  *  | ||||
| @@ -56,10 +57,10 @@ public class SiteMembershipTest | ||||
|     @Before | ||||
|     public void createSite() | ||||
|     { | ||||
|         String sitePreset = "testSiteMembershipPreset"; | ||||
|         String shortName = "testSiteMembershipShortName"; | ||||
|         String title = "testSiteMembershipTile"; | ||||
|         String description = "testSiteMembershipDescription"; | ||||
|         var sitePreset = "testSiteMembershipPreset"; | ||||
|         var shortName = "testSiteMembershipShortName"; | ||||
|         var title = "testSiteMembershipTile"; | ||||
|         var description = "testSiteMembershipDescription"; | ||||
|         siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description, | ||||
|                 SiteVisibility.PUBLIC, null); | ||||
|     } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user