mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
Compare commits
61 Commits
23.6.0.29
...
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
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- id: changed-files
|
- 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:
|
with:
|
||||||
write-list-to-env: true
|
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"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: "Prepare maven cache and check compilation"
|
- name: "Prepare maven cache and check compilation"
|
||||||
@@ -69,12 +69,12 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[force')
|
!contains(github.event.head_commit.message, '[force')
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
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
|
continue-on-error: true
|
||||||
with:
|
with:
|
||||||
srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
|
srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
|
||||||
@@ -92,10 +92,10 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[force')
|
!contains(github.event.head_commit.message, '[force')
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/github-download-file@v8.2.0
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.BOT_GITHUB_TOKEN }}
|
token: ${{ secrets.BOT_GITHUB_TOKEN }}
|
||||||
repository: "Alfresco/veracode-baseline-archive"
|
repository: "Alfresco/veracode-baseline-archive"
|
||||||
@@ -142,9 +142,9 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[skip tests]') &&
|
!contains(github.event.head_commit.message, '[skip tests]') &&
|
||||||
!contains(github.event.head_commit.message, '[force]')
|
!contains(github.event.head_commit.message, '[force]')
|
||||||
steps:
|
steps:
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- uses: Alfresco/ya-pmd-scan@v4.1.0
|
- uses: Alfresco/ya-pmd-scan@v4.1.0
|
||||||
with:
|
with:
|
||||||
classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\""
|
classpath-build-command: "mvn test-compile -ntp -Pags -pl \"-:alfresco-community-repo-docker\""
|
||||||
@@ -175,14 +175,14 @@ jobs:
|
|||||||
testAttributes: "-Dtest=AllMmtUnitTestSuite"
|
testAttributes: "-Dtest=AllMmtUnitTestSuite"
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testModule }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testModule }}
|
||||||
@@ -213,7 +213,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -255,9 +255,9 @@ jobs:
|
|||||||
REQUIRES_INSTALLED_ARTIFACTS: true
|
REQUIRES_INSTALLED_ARTIFACTS: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Build"
|
- name: "Build"
|
||||||
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
||||||
run: |
|
run: |
|
||||||
@@ -270,7 +270,7 @@ jobs:
|
|||||||
run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
|
run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }}
|
||||||
@@ -301,7 +301,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -334,9 +334,9 @@ jobs:
|
|||||||
version: ['10.2.18', '10.4', '10.5']
|
version: ['10.2.18', '10.4', '10.5']
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: Run MariaDB ${{ matrix.version }} database
|
- name: Run MariaDB ${{ matrix.version }} database
|
||||||
@@ -345,7 +345,7 @@ jobs:
|
|||||||
MARIADB_VERSION: ${{ matrix.version }}
|
MARIADB_VERSION: ${{ matrix.version }}
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.version }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.version }}
|
||||||
@@ -376,7 +376,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -405,9 +405,9 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[force')
|
!contains(github.event.head_commit.message, '[force')
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: "Run MariaDB 10.6 database"
|
- name: "Run MariaDB 10.6 database"
|
||||||
@@ -416,7 +416,7 @@ jobs:
|
|||||||
MARIADB_VERSION: 10.6
|
MARIADB_VERSION: 10.6
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
||||||
@@ -447,7 +447,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -476,9 +476,9 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[force')
|
!contains(github.event.head_commit.message, '[force')
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: "Run MySQL 8 database"
|
- name: "Run MySQL 8 database"
|
||||||
@@ -487,7 +487,7 @@ jobs:
|
|||||||
MYSQL_VERSION: 8
|
MYSQL_VERSION: 8
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
||||||
@@ -518,7 +518,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -546,9 +546,9 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[force')
|
!contains(github.event.head_commit.message, '[force')
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: "Run PostgreSQL 13.12 database"
|
- name: "Run PostgreSQL 13.12 database"
|
||||||
@@ -557,7 +557,7 @@ jobs:
|
|||||||
POSTGRES_VERSION: 13.12
|
POSTGRES_VERSION: 13.12
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
||||||
@@ -588,7 +588,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -616,9 +616,9 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[force')
|
!contains(github.event.head_commit.message, '[force')
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: "Run PostgreSQL 14.9 database"
|
- name: "Run PostgreSQL 14.9 database"
|
||||||
@@ -627,7 +627,7 @@ jobs:
|
|||||||
POSTGRES_VERSION: 14.9
|
POSTGRES_VERSION: 14.9
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
||||||
@@ -658,7 +658,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -686,9 +686,9 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[force')
|
!contains(github.event.head_commit.message, '[force')
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: "Run PostgreSQL 15.4 database"
|
- name: "Run PostgreSQL 15.4 database"
|
||||||
@@ -697,7 +697,7 @@ jobs:
|
|||||||
POSTGRES_VERSION: 15.4
|
POSTGRES_VERSION: 15.4
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
||||||
@@ -728,7 +728,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -754,16 +754,16 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[force')
|
!contains(github.event.head_commit.message, '[force')
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: "Run ActiveMQ"
|
- name: "Run ActiveMQ"
|
||||||
run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d
|
run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile activemq up -d
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
||||||
@@ -794,7 +794,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
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'
|
mvn-options: '-Dencryption.ssl.keystore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.keystore -Dencryption.ssl.truststore.location=${CI_WORKSPACE}/keystores/alfresco/alfresco.truststore'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: "Set transformers tag"
|
- 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
|
run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile ${{ matrix.compose-profile }} up -d
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} ${{ matrix.idp }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.testSuite }} ${{ matrix.idp }}
|
||||||
@@ -910,7 +910,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -968,9 +968,9 @@ jobs:
|
|||||||
REQUIRES_LOCAL_IMAGES: true
|
REQUIRES_LOCAL_IMAGES: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Build"
|
- name: "Build"
|
||||||
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
||||||
run: |
|
run: |
|
||||||
@@ -986,7 +986,7 @@ jobs:
|
|||||||
run: mvn install -pl :alfresco-community-repo-integration-test -am -DskipTests -Pall-tas-tests
|
run: mvn install -pl :alfresco-community-repo-integration-test -am -DskipTests -Pall-tas-tests
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.test-name }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} - ${{ matrix.test-name }}
|
||||||
@@ -1024,7 +1024,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.tests.outcome }}
|
tests-outcome: ${{ steps.tests.outcome }}
|
||||||
@@ -1050,16 +1050,16 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[force')
|
!contains(github.event.head_commit.message, '[force')
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
run: bash ./scripts/ci/init.sh
|
||||||
- name: "Run Postgres 15.4 database"
|
- name: "Run Postgres 15.4 database"
|
||||||
run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
|
run: docker compose -f ./scripts/ci/docker-compose/docker-compose.yaml --profile postgres up -d
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
||||||
@@ -1090,7 +1090,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -1124,9 +1124,9 @@ jobs:
|
|||||||
REQUIRES_INSTALLED_ARTIFACTS: true
|
REQUIRES_INSTALLED_ARTIFACTS: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Build"
|
- name: "Build"
|
||||||
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
||||||
run: |
|
run: |
|
||||||
@@ -1134,7 +1134,7 @@ jobs:
|
|||||||
bash ./scripts/ci/build.sh
|
bash ./scripts/ci/build.sh
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (PostgreSQL) ${{ matrix.test-name }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (PostgreSQL) ${{ matrix.test-name }}
|
||||||
@@ -1170,9 +1170,9 @@ jobs:
|
|||||||
REQUIRES_INSTALLED_ARTIFACTS: true
|
REQUIRES_INSTALLED_ARTIFACTS: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Build"
|
- name: "Build"
|
||||||
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
||||||
run: |
|
run: |
|
||||||
@@ -1180,7 +1180,7 @@ jobs:
|
|||||||
bash ./scripts/ci/build.sh
|
bash ./scripts/ci/build.sh
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (MySQL) ${{ matrix.test-name }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }} 0${{ matrix.part }} - (MySQL) ${{ matrix.test-name }}
|
||||||
@@ -1212,9 +1212,9 @@ jobs:
|
|||||||
REQUIRES_LOCAL_IMAGES: true
|
REQUIRES_LOCAL_IMAGES: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Build"
|
- name: "Build"
|
||||||
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
||||||
run: |
|
run: |
|
||||||
@@ -1228,7 +1228,7 @@ jobs:
|
|||||||
mvn -B install -pl :alfresco-governance-services-automation-community-rest-api -am -Pags -Pall-tas-tests -DskipTests
|
mvn -B install -pl :alfresco-governance-services-automation-community-rest-api -am -Pags -Pall-tas-tests -DskipTests
|
||||||
- name: "Prepare Report Portal"
|
- name: "Prepare Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-prepare
|
||||||
with:
|
with:
|
||||||
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
rp-launch-prefix: ${{ env.RP_LAUNCH_PREFIX }}
|
||||||
@@ -1260,7 +1260,7 @@ jobs:
|
|||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
- name: "Summarize Report Portal"
|
- name: "Summarize Report Portal"
|
||||||
if: github.ref_name == 'master'
|
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
|
id: rp-summarize
|
||||||
with:
|
with:
|
||||||
tests-outcome: ${{ steps.run-tests.outcome }}
|
tests-outcome: ${{ steps.run-tests.outcome }}
|
||||||
@@ -1302,9 +1302,9 @@ jobs:
|
|||||||
!contains(github.event.head_commit.message, '[force]')
|
!contains(github.event.head_commit.message, '[force]')
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Build"
|
- name: "Build"
|
||||||
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
|
||||||
run: |
|
run: |
|
||||||
|
16
.github/workflows/master_release.yml
vendored
16
.github/workflows/master_release.yml
vendored
@@ -34,12 +34,12 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
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:
|
with:
|
||||||
username: ${{ env.GIT_USERNAME }}
|
username: ${{ env.GIT_USERNAME }}
|
||||||
email: ${{ env.GIT_EMAIL }}
|
email: ${{ env.GIT_EMAIL }}
|
||||||
@@ -63,12 +63,12 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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@v7.1.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@v7.1.0
|
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.2.0
|
||||||
- name: "Init"
|
- name: "Init"
|
||||||
run: bash ./scripts/ci/init.sh
|
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:
|
with:
|
||||||
username: ${{ env.GIT_USERNAME }}
|
username: ${{ env.GIT_USERNAME }}
|
||||||
email: ${{ env.GIT_EMAIL }}
|
email: ${{ env.GIT_EMAIL }}
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-amps</artifactId>
|
<artifactId>alfresco-community-repo-amps</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-governance-services-community-parent</artifactId>
|
<artifactId>alfresco-governance-services-community-parent</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-governance-services-automation-community-repo</artifactId>
|
<artifactId>alfresco-governance-services-automation-community-repo</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-governance-services-community-parent</artifactId>
|
<artifactId>alfresco-governance-services-community-parent</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
|
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@@ -3,8 +3,8 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# Version label
|
# Version label
|
||||||
version.major=23
|
version.major=25
|
||||||
version.minor=4
|
version.minor=1
|
||||||
version.revision=0
|
version.revision=0
|
||||||
version.label=
|
version.label=
|
||||||
|
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
|
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-amps</artifactId>
|
<artifactId>alfresco-community-repo-amps</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
@@ -118,6 +118,18 @@
|
|||||||
<groupId>org.jibx</groupId>
|
<groupId>org.jibx</groupId>
|
||||||
<artifactId>jibx-run</artifactId>
|
<artifactId>jibx-run</artifactId>
|
||||||
<version>1.4.2</version>
|
<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>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@@ -9,6 +9,6 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
</project>
|
</project>
|
||||||
|
@@ -146,6 +146,7 @@ libgif http://giflib.sourceforge.net/
|
|||||||
libfreetype http://www.freetype.org/
|
libfreetype http://www.freetype.org/
|
||||||
PostgreSQL http://www.postgresql.org/
|
PostgreSQL http://www.postgresql.org/
|
||||||
PostgreSQL JDBC Driver http://www.postgresql.org/
|
PostgreSQL JDBC Driver http://www.postgresql.org/
|
||||||
|
kXML 2 http://kxml.sourceforge.net/
|
||||||
|
|
||||||
|
|
||||||
=== CDDL 1.0 ===
|
=== CDDL 1.0 ===
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<organization>
|
<organization>
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<developers>
|
<developers>
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<developers>
|
<developers>
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
@@ -171,7 +171,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.groovy</groupId>
|
<groupId>org.codehaus.groovy</groupId>
|
||||||
<artifactId>groovy</artifactId>
|
<artifactId>groovy</artifactId>
|
||||||
<version>3.0.22</version>
|
<version>3.0.23</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json-->
|
<!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-json-->
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-tests</artifactId>
|
<artifactId>alfresco-community-repo-tests</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<developers>
|
<developers>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo-packaging</artifactId>
|
<artifactId>alfresco-community-repo-packaging</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<properties>
|
<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">
|
<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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>Alfresco Community Repo Parent</name>
|
<name>Alfresco Community Repo Parent</name>
|
||||||
|
|
||||||
@@ -23,8 +23,8 @@
|
|||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<acs.version.major>23</acs.version.major>
|
<acs.version.major>25</acs.version.major>
|
||||||
<acs.version.minor>4</acs.version.minor>
|
<acs.version.minor>1</acs.version.minor>
|
||||||
<acs.version.revision>0</acs.version.revision>
|
<acs.version.revision>0</acs.version.revision>
|
||||||
<acs.version.label />
|
<acs.version.label />
|
||||||
<amp.min.version>${acs.version.major}.0.0</amp.min.version>
|
<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.cxf.version>4.0.5</dependency.cxf.version>
|
||||||
<dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.version>
|
<dependency.opencmis.version>1.0.0-jakarta-1</dependency.opencmis.version>
|
||||||
<dependency.webscripts.version>9.4</dependency.webscripts.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.mockito-core.version>5.14.1</dependency.mockito-core.version>
|
||||||
<dependency.assertj.version>3.26.3</dependency.assertj.version>
|
<dependency.assertj.version>3.26.3</dependency.assertj.version>
|
||||||
<dependency.org-json.version>20240303</dependency.org-json.version>
|
<dependency.org-json.version>20240303</dependency.org-json.version>
|
||||||
<dependency.commons-dbcp.version>2.12.0</dependency.commons-dbcp.version>
|
<dependency.commons-dbcp.version>2.13.0</dependency.commons-dbcp.version>
|
||||||
<dependency.commons-io.version>2.17.0</dependency.commons-io.version>
|
<dependency.commons-io.version>2.18.0</dependency.commons-io.version>
|
||||||
<dependency.gson.version>2.11.0</dependency.gson.version>
|
<dependency.gson.version>2.11.0</dependency.gson.version>
|
||||||
<dependency.guava.version>33.3.1-jre</dependency.guava.version>
|
<dependency.guava.version>33.3.1-jre</dependency.guava.version>
|
||||||
<dependency.httpclient.version>4.5.14</dependency.httpclient.version>
|
<dependency.httpclient.version>4.5.14</dependency.httpclient.version>
|
||||||
<dependency.httpcore.version>4.4.16</dependency.httpcore.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.httpcomponents-httpcore5.version>5.3</dependency.httpcomponents-httpcore5.version>
|
||||||
<dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
|
<dependency.commons-httpclient.version>3.1-HTTPCLIENT-1265</dependency.commons-httpclient.version>
|
||||||
<dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
|
<dependency.xercesImpl.version>2.12.2</dependency.xercesImpl.version>
|
||||||
<dependency.slf4j.version>2.0.16</dependency.slf4j.version>
|
<dependency.slf4j.version>2.0.16</dependency.slf4j.version>
|
||||||
<dependency.log4j.version>2.23.1</dependency.log4j.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.tika.version>2.9.2</dependency.tika.version>
|
||||||
<dependency.truezip.version>7.7.10</dependency.truezip.version>
|
<dependency.truezip.version>7.7.10</dependency.truezip.version>
|
||||||
<dependency.poi.version>5.3.0</dependency.poi.version>
|
<dependency.poi.version>5.3.0</dependency.poi.version>
|
||||||
<dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.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.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.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.apache-compress.version>1.27.1</dependency.apache-compress.version>
|
||||||
<dependency.awaitility.version>4.2.2</dependency.awaitility.version>
|
<dependency.awaitility.version>4.2.2</dependency.awaitility.version>
|
||||||
<dependency.swagger-ui.version>4.1.3</dependency.swagger-ui.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-filtering.version>3.1.1</dependency.maven-filtering.version>
|
||||||
<dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
|
<dependency.maven-artifact.version>3.8.6</dependency.maven-artifact.version>
|
||||||
<dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
|
<dependency.jdom2.version>2.0.6.1</dependency.jdom2.version>
|
||||||
<dependency.pooled-jms.version>3.1.6</dependency.pooled-jms.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-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>
|
<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>
|
<connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
|
||||||
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
|
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
|
||||||
<url>https://github.com/Alfresco/alfresco-community-repo</url>
|
<url>https://github.com/Alfresco/alfresco-community-repo</url>
|
||||||
<tag>23.4.0.67</tag>
|
<tag>HEAD</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
@@ -371,7 +372,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.quartz-scheduler</groupId>
|
<groupId>org.quartz-scheduler</groupId>
|
||||||
<artifactId>quartz</artifactId>
|
<artifactId>quartz</artifactId>
|
||||||
<version>2.3.2</version>
|
<version>2.5.0</version>
|
||||||
<!-- exclude c3p0 -->
|
<!-- exclude c3p0 -->
|
||||||
<!-- see https://issues.alfresco.com/jira/browse/REPO-3447 -->
|
<!-- see https://issues.alfresco.com/jira/browse/REPO-3447 -->
|
||||||
<exclusions>
|
<exclusions>
|
||||||
@@ -465,7 +466,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.xmlbeans</groupId>
|
<groupId>org.apache.xmlbeans</groupId>
|
||||||
<artifactId>xmlbeans</artifactId>
|
<artifactId>xmlbeans</artifactId>
|
||||||
<version>5.2.1</version>
|
<version>5.2.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.json</groupId>
|
<groupId>org.json</groupId>
|
||||||
@@ -703,7 +704,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.networknt</groupId>
|
<groupId>com.networknt</groupId>
|
||||||
<artifactId>json-schema-validator</artifactId>
|
<artifactId>json-schema-validator</artifactId>
|
||||||
<version>1.5.1</version>
|
<version>1.5.4</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- upgrade dependency from TIKA -->
|
<!-- upgrade dependency from TIKA -->
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -950,7 +951,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.projectlombok</groupId>
|
<groupId>org.projectlombok</groupId>
|
||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
<version>1.18.34</version>
|
<version>1.18.36</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -1015,7 +1016,7 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-failsafe-plugin</artifactId>
|
<artifactId>maven-failsafe-plugin</artifactId>
|
||||||
<version>3.5.1</version>
|
<version>3.5.2</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
@@ -1028,7 +1029,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
<version>3.10.1</version>
|
<version>3.11.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@@ -45,7 +45,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.santuario</groupId>
|
<groupId>org.apache.santuario</groupId>
|
||||||
<artifactId>xmlsec</artifactId>
|
<artifactId>xmlsec</artifactId>
|
||||||
<version>4.0.2</version>
|
<version>4.0.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- newer version, see REPO-3133 -->
|
<!-- newer version, see REPO-3133 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -119,7 +119,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-server</artifactId>
|
<artifactId>jetty-server</artifactId>
|
||||||
<version>11.0.15</version>
|
<version>11.0.24</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
|
@@ -7,7 +7,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.alfresco</groupId>
|
<groupId>org.alfresco</groupId>
|
||||||
<artifactId>alfresco-community-repo</artifactId>
|
<artifactId>alfresco-community-repo</artifactId>
|
||||||
<version>23.4.0.67</version>
|
<version>25.1.0.9-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@@ -850,12 +850,12 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
<complianceLevel>1.8</complianceLevel>
|
<complianceLevel>17</complianceLevel>
|
||||||
<outxml>false</outxml>
|
<outxml>false</outxml>
|
||||||
<verbose>true</verbose>
|
<verbose>true</verbose>
|
||||||
<showWeaveInfo>true</showWeaveInfo>
|
<showWeaveInfo>true</showWeaveInfo>
|
||||||
<source>1.8</source>
|
<source>17</source>
|
||||||
<target>1.8</target>
|
<target>17</target>
|
||||||
<additionalCompilerArgs>
|
<additionalCompilerArgs>
|
||||||
<arg>-parameters</arg>
|
<arg>-parameters</arg>
|
||||||
</additionalCompilerArgs>
|
</additionalCompilerArgs>
|
||||||
|
@@ -1,493 +1,484 @@
|
|||||||
/*
|
/*
|
||||||
* #%L
|
* #%L
|
||||||
* Alfresco Repository
|
* Alfresco Repository
|
||||||
* %%
|
* %%
|
||||||
* Copyright (C) 2005 - 2021 Alfresco Software Limited
|
* Copyright (C) 2005 - 2021 Alfresco Software Limited
|
||||||
* %%
|
* %%
|
||||||
* This file is part of the Alfresco software.
|
* This file is part of the Alfresco software.
|
||||||
* If the software was purchased under a paid Alfresco license, the terms of
|
* If the software was purchased under a paid Alfresco license, the terms of
|
||||||
* the paid license agreement will prevail. Otherwise, the software is
|
* the paid license agreement will prevail. Otherwise, the software is
|
||||||
* provided under the following open source license terms:
|
* provided under the following open source license terms:
|
||||||
*
|
*
|
||||||
* Alfresco is free software: you can redistribute it and/or modify
|
* Alfresco is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
* Alfresco is distributed in the hope that it will be useful,
|
* Alfresco is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU Lesser General Public License for more details.
|
* GNU Lesser General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* #L%
|
* #L%
|
||||||
*/
|
*/
|
||||||
package org.alfresco.repo.content;
|
package org.alfresco.repo.content;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||||
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
|
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
|
||||||
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
|
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
|
||||||
|
|
||||||
import org.alfresco.error.AlfrescoRuntimeException;
|
import org.apache.commons.logging.Log;
|
||||||
import org.alfresco.repo.cache.SimpleCache;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.alfresco.service.cmr.repository.ContentIOException;
|
|
||||||
import org.alfresco.service.cmr.repository.ContentReader;
|
import org.alfresco.error.AlfrescoRuntimeException;
|
||||||
import org.alfresco.service.cmr.repository.ContentWriter;
|
import org.alfresco.repo.cache.SimpleCache;
|
||||||
import org.alfresco.util.GUID;
|
import org.alfresco.service.cmr.repository.ContentIOException;
|
||||||
import org.alfresco.util.Pair;
|
import org.alfresco.service.cmr.repository.ContentReader;
|
||||||
import org.apache.commons.logging.Log;
|
import org.alfresco.service.cmr.repository.ContentWriter;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.alfresco.util.GUID;
|
||||||
|
import org.alfresco.util.Pair;
|
||||||
/**
|
|
||||||
* 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
|
* @see ContentContext
|
||||||
*
|
*
|
||||||
* @since 2.1
|
* @since 2.1
|
||||||
* @author Derek Hulley
|
* @author Derek Hulley
|
||||||
*/
|
*/
|
||||||
public abstract class AbstractRoutingContentStore implements ContentStore
|
public abstract class AbstractRoutingContentStore implements ContentStore
|
||||||
{
|
{
|
||||||
private static Log logger = LogFactory.getLog(AbstractRoutingContentStore.class);
|
private static Log logger = LogFactory.getLog(AbstractRoutingContentStore.class);
|
||||||
|
|
||||||
private String instanceKey = GUID.generate();
|
private String instanceKey = GUID.generate();
|
||||||
private SimpleCache<Pair<String, String>, ContentStore> storesByContentUrl;
|
private SimpleCache<Pair<String, String>, ContentStore> storesByContentUrl;
|
||||||
private ReadLock storesCacheReadLock;
|
private ReadLock storesCacheReadLock;
|
||||||
private WriteLock storesCacheWriteLock;
|
private WriteLock storesCacheWriteLock;
|
||||||
|
|
||||||
protected AbstractRoutingContentStore()
|
protected AbstractRoutingContentStore()
|
||||||
{
|
{
|
||||||
ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
|
ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
|
||||||
storesCacheReadLock = lock.readLock();
|
storesCacheReadLock = lock.readLock();
|
||||||
storesCacheWriteLock = lock.writeLock();
|
storesCacheWriteLock = lock.writeLock();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @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)
|
*/
|
||||||
{
|
public void setStoresCache(SimpleCache<Pair<String, String>, ContentStore> storesCache)
|
||||||
this.storesByContentUrl = storesCache;
|
{
|
||||||
}
|
this.storesByContentUrl = storesCache;
|
||||||
|
}
|
||||||
/**
|
|
||||||
* @return Returns a list of all possible stores available for reading or writing
|
/**
|
||||||
*/
|
* @return Returns a list of all possible stores available for reading or writing
|
||||||
protected abstract List<ContentStore> getAllStores();
|
*/
|
||||||
|
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
|
* 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.
|
||||||
* 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
|
||||||
* @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>
|
||||||
* @return Returns the store most appropriate for the given context and
|
*/
|
||||||
* <b>never <tt>null</tt></b>
|
protected abstract ContentStore selectWriteStore(ContentContext ctx);
|
||||||
*/
|
|
||||||
protected abstract ContentStore selectWriteStore(ContentContext ctx);
|
/**
|
||||||
|
* Checks the cache for the store and ensures that the URL is in the store.
|
||||||
/**
|
*
|
||||||
* 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
|
||||||
* @return Returns the store matching the content URL
|
*/
|
||||||
*/
|
private ContentStore selectReadStore(String contentUrl)
|
||||||
private ContentStore selectReadStore(String contentUrl)
|
{
|
||||||
{
|
Pair<String, String> cacheKey = new Pair<String, String>(instanceKey, contentUrl);
|
||||||
Pair<String, String> cacheKey = new Pair<String, String>(instanceKey, contentUrl);
|
storesCacheReadLock.lock();
|
||||||
storesCacheReadLock.lock();
|
try
|
||||||
try
|
{
|
||||||
{
|
// Check if the store is in the cache
|
||||||
// Check if the store is in the cache
|
ContentStore store = storesByContentUrl.get(cacheKey);
|
||||||
ContentStore store = storesByContentUrl.get(cacheKey);
|
if (store != null)
|
||||||
if (store != null)
|
{
|
||||||
{
|
// We found a store that was previously used
|
||||||
// We found a store that was previously used
|
try
|
||||||
try
|
{
|
||||||
{
|
// It is possible for content to be removed from a store and
|
||||||
// It is possible for content to be removed from a store and
|
// it might have moved into another store.
|
||||||
// it might have moved into another store.
|
if (store.exists(contentUrl))
|
||||||
if (store.exists(contentUrl))
|
{
|
||||||
{
|
// We found a store and can use it
|
||||||
// We found a store and can use it
|
return store;
|
||||||
return store;
|
}
|
||||||
}
|
}
|
||||||
}
|
catch (UnsupportedContentUrlException e)
|
||||||
catch (UnsupportedContentUrlException e)
|
{
|
||||||
{
|
// This is odd. The store that previously supported the content URL
|
||||||
// This is odd. The store that previously supported the content URL
|
// no longer does so. I can't think of a reason why that would be.
|
||||||
// no longer does so. I can't think of a reason why that would be.
|
throw new AlfrescoRuntimeException(
|
||||||
throw new AlfrescoRuntimeException(
|
"Found a content store that previously supported a URL, but no longer does: \n" +
|
||||||
"Found a content store that previously supported a URL, but no longer does: \n" +
|
" Store: " + store + "\n" +
|
||||||
" Store: " + store + "\n" +
|
" Content URL: " + contentUrl);
|
||||||
" Content URL: " + contentUrl);
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
finally
|
||||||
finally
|
{
|
||||||
{
|
storesCacheReadLock.unlock();
|
||||||
storesCacheReadLock.unlock();
|
}
|
||||||
}
|
// Get the write lock and double check
|
||||||
// Get the write lock and double check
|
storesCacheWriteLock.lock();
|
||||||
storesCacheWriteLock.lock();
|
try
|
||||||
try
|
{
|
||||||
{
|
// Double check
|
||||||
// Double check
|
ContentStore store = storesByContentUrl.get(cacheKey);
|
||||||
ContentStore store = storesByContentUrl.get(cacheKey);
|
if (store != null && store.exists(contentUrl))
|
||||||
if (store != null && store.exists(contentUrl))
|
{
|
||||||
{
|
// We found a store and can use it
|
||||||
// We found a store and can use it
|
if (logger.isDebugEnabled())
|
||||||
if (logger.isDebugEnabled())
|
{
|
||||||
{
|
logger.debug(
|
||||||
logger.debug(
|
"Found mapped store for content URL: \n" +
|
||||||
"Found mapped store for content URL: \n" +
|
" Content URL: " + contentUrl + "\n" +
|
||||||
" Content URL: " + contentUrl + "\n" +
|
" Store: " + store);
|
||||||
" Store: " + store);
|
}
|
||||||
}
|
return store;
|
||||||
return store;
|
}
|
||||||
}
|
else
|
||||||
else
|
{
|
||||||
{
|
store = null;
|
||||||
store = null;
|
}
|
||||||
}
|
// It isn't, so search all the stores
|
||||||
// It isn't, so search all the stores
|
List<ContentStore> stores = getAllStores();
|
||||||
List<ContentStore> stores = getAllStores();
|
// Keep track of the unsupported state of the content URL - it might be a rubbish URL
|
||||||
// Keep track of the unsupported state of the content URL - it might be a rubbish URL
|
boolean contentUrlSupported = false;
|
||||||
boolean contentUrlSupported = false;
|
for (ContentStore storeInList : stores)
|
||||||
for (ContentStore storeInList : stores)
|
{
|
||||||
{
|
boolean exists = false;
|
||||||
boolean exists = false;
|
try
|
||||||
try
|
{
|
||||||
{
|
exists = storeInList.exists(contentUrl);
|
||||||
exists = storeInList.exists(contentUrl);
|
// At least the content URL was supported
|
||||||
// At least the content URL was supported
|
contentUrlSupported = true;
|
||||||
contentUrlSupported = true;
|
}
|
||||||
}
|
catch (UnsupportedContentUrlException e)
|
||||||
catch (UnsupportedContentUrlException e)
|
{
|
||||||
{
|
// The store can't handle the content URL
|
||||||
// The store can't handle the content URL
|
}
|
||||||
}
|
if (!exists)
|
||||||
if (!exists)
|
{
|
||||||
{
|
// It is not in the store
|
||||||
// It is not in the store
|
continue;
|
||||||
continue;
|
}
|
||||||
}
|
// We found one
|
||||||
// We found one
|
store = storeInList;
|
||||||
store = storeInList;
|
// Put the value in the cache
|
||||||
// Put the value in the cache
|
storesByContentUrl.put(cacheKey, store);
|
||||||
storesByContentUrl.put(cacheKey, store);
|
break;
|
||||||
break;
|
}
|
||||||
}
|
// Check if the content URL was supported
|
||||||
// Check if the content URL was supported
|
if (!contentUrlSupported)
|
||||||
if (!contentUrlSupported)
|
{
|
||||||
{
|
throw new UnsupportedContentUrlException(this, contentUrl);
|
||||||
throw new UnsupportedContentUrlException(this, contentUrl);
|
}
|
||||||
}
|
// Done
|
||||||
// Done
|
if (logger.isDebugEnabled())
|
||||||
if (logger.isDebugEnabled())
|
{
|
||||||
{
|
logger.debug(
|
||||||
logger.debug(
|
"Mapped content URL to store for reading: \n" +
|
||||||
"Mapped content URL to store for reading: \n" +
|
" Content URL: " + contentUrl + "\n" +
|
||||||
" Content URL: " + contentUrl + "\n" +
|
" Store: " + store);
|
||||||
" Store: " + store);
|
}
|
||||||
}
|
return store;
|
||||||
return store;
|
}
|
||||||
}
|
finally
|
||||||
finally
|
{
|
||||||
{
|
storesCacheWriteLock.unlock();
|
||||||
storesCacheWriteLock.unlock();
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* @return Returns <tt>true</tt> if the URL is supported by any of the stores.
|
||||||
* @return Returns <tt>true</tt> if the URL is supported by any of the stores.
|
*/
|
||||||
*/
|
public boolean isContentUrlSupported(String contentUrl)
|
||||||
public boolean isContentUrlSupported(String contentUrl)
|
{
|
||||||
{
|
List<ContentStore> stores = getAllStores();
|
||||||
List<ContentStore> stores = getAllStores();
|
boolean supported = false;
|
||||||
boolean supported = false;
|
for (ContentStore store : stores)
|
||||||
for (ContentStore store : stores)
|
{
|
||||||
{
|
if (store.isContentUrlSupported(contentUrl))
|
||||||
if (store.isContentUrlSupported(contentUrl))
|
{
|
||||||
{
|
supported = true;
|
||||||
supported = true;
|
break;
|
||||||
break;
|
}
|
||||||
}
|
}
|
||||||
}
|
// Done
|
||||||
// Done
|
if (logger.isDebugEnabled())
|
||||||
if (logger.isDebugEnabled())
|
{
|
||||||
{
|
logger.debug("The url " + (supported ? "is" : "is not") + " supported by at least one store.");
|
||||||
logger.debug("The url " + (supported ? "is" : "is not") + " supported by at least one store.");
|
}
|
||||||
}
|
return supported;
|
||||||
return supported;
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* @return Returns <tt>true</tt> if write is supported by any of the stores.
|
||||||
* @return Returns <tt>true</tt> if write is supported by any of the stores.
|
*/
|
||||||
*/
|
public boolean isWriteSupported()
|
||||||
public boolean isWriteSupported()
|
{
|
||||||
{
|
List<ContentStore> stores = getAllStores();
|
||||||
List<ContentStore> stores = getAllStores();
|
boolean supported = false;
|
||||||
boolean supported = false;
|
for (ContentStore store : stores)
|
||||||
for (ContentStore store : stores)
|
{
|
||||||
{
|
if (store.isWriteSupported())
|
||||||
if (store.isWriteSupported())
|
{
|
||||||
{
|
supported = true;
|
||||||
supported = true;
|
break;
|
||||||
break;
|
}
|
||||||
}
|
}
|
||||||
}
|
// Done
|
||||||
// Done
|
if (logger.isDebugEnabled())
|
||||||
if (logger.isDebugEnabled())
|
{
|
||||||
{
|
logger.debug("Writing " + (supported ? "is" : "is not") + " supported by at least one store.");
|
||||||
logger.debug("Writing " + (supported ? "is" : "is not") + " supported by at least one store.");
|
}
|
||||||
}
|
return supported;
|
||||||
return supported;
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* @return Returns <b>.</b> always
|
||||||
* @return Returns <b>.</b> always
|
*/
|
||||||
*/
|
public String getRootLocation()
|
||||||
public String getRootLocation()
|
{
|
||||||
{
|
return ".";
|
||||||
return ".";
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* @return Returns <tt>-1</tt> always
|
||||||
* @return Returns <tt>-1</tt> always
|
*/
|
||||||
*/
|
@Override
|
||||||
@Override
|
public long getSpaceFree()
|
||||||
public long getSpaceFree()
|
{
|
||||||
{
|
return -1L;
|
||||||
return -1L;
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* @return Returns <tt>-1</tt> always
|
||||||
* @return Returns <tt>-1</tt> always
|
*/
|
||||||
*/
|
@Override
|
||||||
@Override
|
public long getSpaceTotal()
|
||||||
public long getSpaceTotal()
|
{
|
||||||
{
|
return -1L;
|
||||||
return -1L;
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* @see #selectReadStore(String)
|
||||||
* @see #selectReadStore(String)
|
*/
|
||||||
*/
|
public boolean exists(String contentUrl) throws ContentIOException
|
||||||
public boolean exists(String contentUrl) throws ContentIOException
|
{
|
||||||
{
|
ContentStore store = selectReadStore(contentUrl);
|
||||||
ContentStore store = selectReadStore(contentUrl);
|
return (store != null);
|
||||||
return (store != null);
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* @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
|
||||||
*/
|
{
|
||||||
public ContentReader getReader(String contentUrl) throws ContentIOException
|
ContentStore store = selectReadStore(contentUrl);
|
||||||
{
|
if (store != null)
|
||||||
ContentStore store = selectReadStore(contentUrl);
|
{
|
||||||
if (store != null)
|
if (logger.isDebugEnabled())
|
||||||
{
|
{
|
||||||
if (logger.isDebugEnabled())
|
logger.debug("Getting reader from store: \n" +
|
||||||
{
|
" Content URL: " + contentUrl + "\n" +
|
||||||
logger.debug("Getting reader from store: \n" +
|
" Store: " + store);
|
||||||
" Content URL: " + contentUrl + "\n" +
|
}
|
||||||
" Store: " + store);
|
return store.getReader(contentUrl);
|
||||||
}
|
}
|
||||||
return store.getReader(contentUrl);
|
else
|
||||||
}
|
{
|
||||||
else
|
if (logger.isDebugEnabled())
|
||||||
{
|
{
|
||||||
if (logger.isDebugEnabled())
|
logger.debug("Getting empty reader for content URL: " + contentUrl);
|
||||||
{
|
}
|
||||||
logger.debug("Getting empty reader for content URL: " + contentUrl);
|
return new EmptyContentReader(contentUrl);
|
||||||
}
|
}
|
||||||
return new EmptyContentReader(contentUrl);
|
}
|
||||||
}
|
|
||||||
}
|
/**
|
||||||
|
* Selects a store for the given context and caches store that was used.
|
||||||
/**
|
*
|
||||||
* Selects a store for the given context and caches store that was used.
|
* @see #selectWriteStore(ContentContext)
|
||||||
*
|
*/
|
||||||
* @see #selectWriteStore(ContentContext)
|
public ContentWriter getWriter(ContentContext context) throws ContentIOException
|
||||||
*/
|
{
|
||||||
public ContentWriter getWriter(ContentContext context) throws ContentIOException
|
String contentUrl = context.getContentUrl();
|
||||||
{
|
Pair<String, String> cacheKey = new Pair<String, String>(instanceKey, contentUrl);
|
||||||
String contentUrl = context.getContentUrl();
|
if (contentUrl != null)
|
||||||
Pair<String, String> cacheKey = new Pair<String, String>(instanceKey, contentUrl);
|
{
|
||||||
if (contentUrl != null)
|
// Check to see if it is in the cache
|
||||||
{
|
storesCacheReadLock.lock();
|
||||||
// Check to see if it is in the cache
|
try
|
||||||
storesCacheReadLock.lock();
|
{
|
||||||
try
|
// Check if the store is in the cache
|
||||||
{
|
ContentStore store = storesByContentUrl.get(cacheKey);
|
||||||
// Check if the store is in the cache
|
if (store != null)
|
||||||
ContentStore store = storesByContentUrl.get(cacheKey);
|
{
|
||||||
if (store != null)
|
throw new ContentExistsException(this, contentUrl);
|
||||||
{
|
}
|
||||||
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. */
|
||||||
}
|
}
|
||||||
/*
|
finally
|
||||||
* 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
|
storesCacheReadLock.unlock();
|
||||||
* 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.
|
// Select the store for writing
|
||||||
*/
|
ContentStore store = selectWriteStore(context);
|
||||||
}
|
// Check that we were given a valid store
|
||||||
finally
|
if (store == null)
|
||||||
{
|
{
|
||||||
storesCacheReadLock.unlock();
|
throw new NullPointerException(
|
||||||
}
|
"Unable to find a writer. 'selectWriteStore' may not return null: \n" +
|
||||||
}
|
" Router: " + this + "\n" +
|
||||||
// Select the store for writing
|
" Chose: " + store);
|
||||||
ContentStore store = selectWriteStore(context);
|
}
|
||||||
// Check that we were given a valid store
|
else if (!store.isWriteSupported())
|
||||||
if (store == null)
|
{
|
||||||
{
|
throw new AlfrescoRuntimeException(
|
||||||
throw new NullPointerException(
|
"A write store was chosen that doesn't support writes: \n" +
|
||||||
"Unable to find a writer. 'selectWriteStore' may not return null: \n" +
|
" Router: " + this + "\n" +
|
||||||
" Router: " + this + "\n" +
|
" Chose: " + store);
|
||||||
" Chose: " + store);
|
}
|
||||||
}
|
ContentWriter writer = store.getWriter(context);
|
||||||
else if (!store.isWriteSupported())
|
String newContentUrl = writer.getContentUrl();
|
||||||
{
|
Pair<String, String> newCacheKey = new Pair<String, String>(instanceKey, newContentUrl);
|
||||||
throw new AlfrescoRuntimeException(
|
// Cache the store against the URL
|
||||||
"A write store was chosen that doesn't support writes: \n" +
|
storesCacheWriteLock.lock();
|
||||||
" Router: " + this + "\n" +
|
try
|
||||||
" Chose: " + store);
|
{
|
||||||
}
|
storesByContentUrl.put(newCacheKey, store);
|
||||||
ContentWriter writer = store.getWriter(context);
|
}
|
||||||
String newContentUrl = writer.getContentUrl();
|
finally
|
||||||
Pair<String, String> newCacheKey = new Pair<String, String>(instanceKey, newContentUrl);
|
{
|
||||||
// Cache the store against the URL
|
storesCacheWriteLock.unlock();
|
||||||
storesCacheWriteLock.lock();
|
}
|
||||||
try
|
// Done
|
||||||
{
|
if (logger.isDebugEnabled())
|
||||||
storesByContentUrl.put(newCacheKey, store);
|
{
|
||||||
}
|
logger.debug(
|
||||||
finally
|
"Got writer and cache URL from store: \n" +
|
||||||
{
|
" Context: " + context + "\n" +
|
||||||
storesCacheWriteLock.unlock();
|
" Writer: " + writer + "\n" +
|
||||||
}
|
" Store: " + store);
|
||||||
// Done
|
}
|
||||||
if (logger.isDebugEnabled())
|
return writer;
|
||||||
{
|
}
|
||||||
logger.debug(
|
|
||||||
"Got writer and cache URL from store: \n" +
|
public ContentWriter getWriter(ContentReader existingContentReader, String newContentUrl) throws ContentIOException
|
||||||
" Context: " + context + "\n" +
|
{
|
||||||
" Writer: " + writer + "\n" +
|
return getWriter(new ContentContext(existingContentReader, newContentUrl));
|
||||||
" Store: " + store);
|
}
|
||||||
}
|
|
||||||
return writer;
|
/**
|
||||||
}
|
* This operation has to be performed on all the stores in order to maintain the {@link ContentStore#exists(String)} contract.
|
||||||
|
*/
|
||||||
public ContentWriter getWriter(ContentReader existingContentReader, String newContentUrl) throws ContentIOException
|
public boolean delete(String contentUrl) throws ContentIOException
|
||||||
{
|
{
|
||||||
return getWriter(new ContentContext(existingContentReader, newContentUrl));
|
boolean deleted = true;
|
||||||
}
|
List<ContentStore> stores = getAllStores();
|
||||||
|
for (ContentStore store : stores)
|
||||||
/**
|
{
|
||||||
* This operation has to be performed on all the stores in order to maintain the
|
if (store.isWriteSupported())
|
||||||
* {@link ContentStore#exists(String)} contract.
|
{
|
||||||
*/
|
deleted &= store.delete(contentUrl);
|
||||||
public boolean delete(String contentUrl) throws ContentIOException
|
}
|
||||||
{
|
}
|
||||||
boolean deleted = true;
|
// Done
|
||||||
List<ContentStore> stores = getAllStores();
|
if (logger.isDebugEnabled())
|
||||||
for (ContentStore store : stores)
|
{
|
||||||
{
|
logger.debug("Deleted content URL from stores: \n" +
|
||||||
if (store.isWriteSupported())
|
" Stores: " + stores.size() + "\n" +
|
||||||
{
|
" Deleted: " + deleted);
|
||||||
deleted &= store.delete(contentUrl);
|
}
|
||||||
}
|
return deleted;
|
||||||
}
|
}
|
||||||
// Done
|
|
||||||
if (logger.isDebugEnabled())
|
/**
|
||||||
{
|
* {@inheritDoc}
|
||||||
logger.debug("Deleted content URL from stores: \n" +
|
*/
|
||||||
" Stores: " + stores.size() + "\n" +
|
@Override
|
||||||
" Deleted: " + deleted);
|
public Map<String, String> getStorageProperties(String contentUrl)
|
||||||
}
|
{
|
||||||
return deleted;
|
ContentStore contentStore = selectReadStore(contentUrl);
|
||||||
}
|
|
||||||
|
if (contentStore == null)
|
||||||
/**
|
{
|
||||||
* {@inheritDoc}
|
logNoContentStore(contentUrl);
|
||||||
*/
|
return Collections.emptyMap();
|
||||||
@Override
|
}
|
||||||
public Map<String, String> getStorageProperties(String contentUrl)
|
final String message = "Getting storage properties from store: ";
|
||||||
{
|
logExecution(contentUrl, contentStore, message);
|
||||||
ContentStore contentStore = selectReadStore(contentUrl);
|
|
||||||
|
return contentStore.getStorageProperties(contentUrl);
|
||||||
if (contentStore == null)
|
}
|
||||||
{
|
|
||||||
logNoContentStore(contentUrl);
|
/**
|
||||||
return Collections.emptyMap();
|
* {@inheritDoc}
|
||||||
}
|
*/
|
||||||
final String message = "Getting storage properties from store: ";
|
@Override
|
||||||
logExecution(contentUrl, contentStore, message);
|
public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
|
||||||
|
{
|
||||||
return contentStore.getStorageProperties(contentUrl);
|
final ContentStore contentStore = selectReadStore(contentUrl);
|
||||||
}
|
if (contentStore == null)
|
||||||
|
{
|
||||||
/**
|
logNoContentStore(contentUrl);
|
||||||
* {@inheritDoc}
|
return ContentStore.super.requestSendContentToArchive(contentUrl, archiveParams);
|
||||||
*/
|
}
|
||||||
@Override
|
final String message = "Sending content to archive: ";
|
||||||
public boolean requestSendContentToArchive(String contentUrl, Map<String, Serializable> archiveParams)
|
logExecution(contentUrl, contentStore, message);
|
||||||
{
|
return contentStore.requestSendContentToArchive(contentUrl, archiveParams);
|
||||||
final ContentStore contentStore = selectReadStore(contentUrl);
|
}
|
||||||
if (contentStore == null)
|
|
||||||
{
|
/**
|
||||||
logNoContentStore(contentUrl);
|
* {@inheritDoc}
|
||||||
return ContentStore.super.requestSendContentToArchive(contentUrl, archiveParams);
|
*/
|
||||||
}
|
@Override
|
||||||
final String message = "Sending content to archive: ";
|
public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
|
||||||
logExecution(contentUrl, contentStore, message);
|
{
|
||||||
return contentStore.requestSendContentToArchive(contentUrl, archiveParams);
|
final ContentStore contentStore = selectReadStore(contentUrl);
|
||||||
}
|
if (contentStore == null)
|
||||||
|
{
|
||||||
/**
|
logNoContentStore(contentUrl);
|
||||||
* {@inheritDoc}
|
return ContentStore.super.requestRestoreContentFromArchive(contentUrl, restoreParams);
|
||||||
*/
|
}
|
||||||
@Override
|
final String message = "Restoring content from archive: ";
|
||||||
public boolean requestRestoreContentFromArchive(String contentUrl, Map<String, Serializable> restoreParams)
|
logExecution(contentUrl, contentStore, message);
|
||||||
{
|
return contentStore.requestRestoreContentFromArchive(contentUrl, restoreParams);
|
||||||
final ContentStore contentStore = selectReadStore(contentUrl);
|
}
|
||||||
if (contentStore == null)
|
|
||||||
{
|
private void logExecution(final String contentUrl, final ContentStore contentStore, final String message)
|
||||||
logNoContentStore(contentUrl);
|
{
|
||||||
return ContentStore.super.requestRestoreContentFromArchive(contentUrl, restoreParams);
|
if (logger.isTraceEnabled())
|
||||||
}
|
{
|
||||||
final String message = "Restoring content from archive: ";
|
logger.trace(message + "\n" +
|
||||||
logExecution(contentUrl, contentStore, message);
|
" Content URL: " + contentUrl + "\n" +
|
||||||
return ContentStore.super.requestRestoreContentFromArchive(contentUrl, restoreParams);
|
" Store: " + contentStore);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
private void logExecution(final String contentUrl, final ContentStore contentStore, final String message)
|
|
||||||
{
|
private void logNoContentStore(String contentUrl)
|
||||||
if (logger.isTraceEnabled())
|
{
|
||||||
{
|
if (logger.isTraceEnabled())
|
||||||
logger.trace(message + "\n" +
|
{
|
||||||
" Content URL: " + contentUrl + "\n" +
|
logger.trace("Content Store not found for content URL: " + contentUrl);
|
||||||
" Store: " + contentStore);
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void logNoContentStore(String contentUrl)
|
|
||||||
{
|
|
||||||
if (logger.isTraceEnabled())
|
|
||||||
{
|
|
||||||
logger.trace("Content Store not found for content URL: " + contentUrl);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
* #%L
|
* #%L
|
||||||
* Alfresco Repository
|
* Alfresco Repository
|
||||||
* %%
|
* %%
|
||||||
* Copyright (C) 2005 - 2016 Alfresco Software Limited
|
* Copyright (C) 2005 - 2024 Alfresco Software Limited
|
||||||
* %%
|
* %%
|
||||||
* This file is part of the Alfresco software.
|
* This file is part of the Alfresco software.
|
||||||
* If the software was purchased under a paid Alfresco license, the terms of
|
* If the software was purchased under a paid Alfresco license, the terms of
|
||||||
@@ -25,14 +25,15 @@
|
|||||||
*/
|
*/
|
||||||
package org.alfresco.repo.site;
|
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.api.AlfrescoPublicApi;
|
||||||
import org.alfresco.query.CannedQuerySortDetails;
|
import org.alfresco.query.CannedQuerySortDetails;
|
||||||
import org.alfresco.service.cmr.site.SiteInfo;
|
import org.alfresco.service.cmr.site.SiteInfo;
|
||||||
import org.alfresco.util.Pair;
|
import org.alfresco.util.Pair;
|
||||||
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Conveys information for a member of a site.
|
* Conveys information for a member of a site.
|
||||||
*
|
*
|
||||||
@@ -52,7 +53,7 @@ public class SiteMembership extends AbstractSiteMembership
|
|||||||
public SiteMembership(SiteInfo siteInfo, String id, String firstName, String lastName,
|
public SiteMembership(SiteInfo siteInfo, String id, String firstName, String lastName,
|
||||||
String role)
|
String role)
|
||||||
{
|
{
|
||||||
super(siteInfo,id, role);
|
super(siteInfo, id, role);
|
||||||
if (firstName == null)
|
if (firstName == null)
|
||||||
{
|
{
|
||||||
throw new java.lang.IllegalArgumentException(
|
throw new java.lang.IllegalArgumentException(
|
||||||
@@ -76,13 +77,8 @@ public class SiteMembership extends AbstractSiteMembership
|
|||||||
throw new java.lang.IllegalArgumentException(
|
throw new java.lang.IllegalArgumentException(
|
||||||
"FirstName required building site membership of " + siteInfo.getShortName());
|
"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.firstName = firstName;
|
||||||
this.lastName = lastName;
|
this.lastName = Optional.ofNullable(lastName).orElse("");
|
||||||
this.isMemberOfGroup = isMemberOfGroup;
|
this.isMemberOfGroup = isMemberOfGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -164,7 +160,6 @@ public class SiteMembership extends AbstractSiteMembership
|
|||||||
", isMemberOfGroup = " + isMemberOfGroup + "]";
|
", isMemberOfGroup = " + isMemberOfGroup + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int compareTo(List<Pair<? extends Object, CannedQuerySortDetails.SortOrder>> sortPairs, SiteMembership o1, SiteMembership o2)
|
static int compareTo(List<Pair<? extends Object, CannedQuerySortDetails.SortOrder>> sortPairs, SiteMembership o1, SiteMembership o2)
|
||||||
{
|
{
|
||||||
String personId1 = o1.getPersonId();
|
String personId1 = o1.getPersonId();
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
repository.name=Main Repository
|
repository.name=Main Repository
|
||||||
|
|
||||||
# Schema number
|
# Schema number
|
||||||
version.schema=19300
|
version.schema=20000
|
||||||
|
|
||||||
# Directory configuration
|
# Directory configuration
|
||||||
|
|
||||||
|
@@ -1,136 +1,137 @@
|
|||||||
/*
|
/*
|
||||||
* #%L
|
* #%L
|
||||||
* Alfresco Repository
|
* Alfresco Repository
|
||||||
* %%
|
* %%
|
||||||
* Copyright (C) 2005 - 2016 Alfresco Software Limited
|
* Copyright (C) 2005 - 2024 Alfresco Software Limited
|
||||||
* %%
|
* %%
|
||||||
* This file is part of the Alfresco software.
|
* This file is part of the Alfresco software.
|
||||||
* If the software was purchased under a paid Alfresco license, the terms of
|
* If the software was purchased under a paid Alfresco license, the terms of
|
||||||
* the paid license agreement will prevail. Otherwise, the software is
|
* the paid license agreement will prevail. Otherwise, the software is
|
||||||
* provided under the following open source license terms:
|
* provided under the following open source license terms:
|
||||||
*
|
*
|
||||||
* Alfresco is free software: you can redistribute it and/or modify
|
* Alfresco is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* (at your option) any later version.
|
* (at your option) any later version.
|
||||||
*
|
*
|
||||||
* Alfresco is distributed in the hope that it will be useful,
|
* Alfresco is distributed in the hope that it will be useful,
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
* GNU Lesser General Public License for more details.
|
* GNU Lesser General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||||
* #L%
|
* #L%
|
||||||
*/
|
*/
|
||||||
package org.alfresco.repo.site;
|
package org.alfresco.repo.site;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import org.alfresco.service.cmr.site.SiteInfo;
|
import org.junit.Before;
|
||||||
import org.alfresco.service.cmr.site.SiteVisibility;
|
import org.junit.Test;
|
||||||
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
|
/**
|
||||||
*
|
* Test Membership constructor logs. Based on REPO-2520
|
||||||
* @author Alexandru Epure
|
*
|
||||||
*/
|
* @author Alexandru Epure
|
||||||
public class SiteMembershipTest
|
*/
|
||||||
{
|
public class SiteMembershipTest
|
||||||
SiteInfo siteInfo;
|
{
|
||||||
SiteMembership siteMember;
|
SiteInfo siteInfo;
|
||||||
String personId = UUID.randomUUID().toString();
|
SiteMembership siteMember;
|
||||||
String firstName = UUID.randomUUID().toString();
|
String personId = UUID.randomUUID().toString();
|
||||||
String lastName = UUID.randomUUID().toString();
|
String firstName = UUID.randomUUID().toString();
|
||||||
String role = "Consumer";
|
String lastName = UUID.randomUUID().toString();
|
||||||
|
String role = "Consumer";
|
||||||
String idErrorMessage = "Id required building site membership";
|
|
||||||
String firstNameErrorMessage = "FirstName required building site membership of ";
|
String idErrorMessage = "Id required building site membership";
|
||||||
String lastNameErrorMessage = "LastName required building site membership of ";
|
String firstNameErrorMessage = "FirstName required building site membership of ";
|
||||||
String roleErrorMessage = "Role required building site membership";
|
String lastNameErrorMessage = "LastName required building site membership of ";
|
||||||
|
String roleErrorMessage = "Role required building site membership";
|
||||||
@Before
|
|
||||||
public void createSite()
|
@Before
|
||||||
{
|
public void createSite()
|
||||||
String sitePreset = "testSiteMembershipPreset";
|
{
|
||||||
String shortName = "testSiteMembershipShortName";
|
var sitePreset = "testSiteMembershipPreset";
|
||||||
String title = "testSiteMembershipTile";
|
var shortName = "testSiteMembershipShortName";
|
||||||
String description = "testSiteMembershipDescription";
|
var title = "testSiteMembershipTile";
|
||||||
siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description,
|
var description = "testSiteMembershipDescription";
|
||||||
SiteVisibility.PUBLIC, null);
|
siteInfo = new SiteInfoImpl(sitePreset, shortName, title, description,
|
||||||
}
|
SiteVisibility.PUBLIC, null);
|
||||||
|
}
|
||||||
@Test
|
|
||||||
public void testNullpersonInfo() throws Exception
|
@Test
|
||||||
{
|
public void testNullpersonInfo() throws Exception
|
||||||
try
|
{
|
||||||
{
|
try
|
||||||
siteMember = new SiteMembership(siteInfo, null, firstName, lastName, role);
|
{
|
||||||
}
|
siteMember = new SiteMembership(siteInfo, null, firstName, lastName, role);
|
||||||
catch (IllegalArgumentException e)
|
}
|
||||||
{
|
catch (IllegalArgumentException e)
|
||||||
assertEquals(idErrorMessage, e.getMessage());
|
{
|
||||||
}
|
assertEquals(idErrorMessage, e.getMessage());
|
||||||
|
}
|
||||||
try
|
|
||||||
{
|
try
|
||||||
siteMember = new SiteMembership(siteInfo, null, role);
|
{
|
||||||
}
|
siteMember = new SiteMembership(siteInfo, null, role);
|
||||||
catch (IllegalArgumentException e)
|
}
|
||||||
{
|
catch (IllegalArgumentException e)
|
||||||
assertEquals(idErrorMessage, e.getMessage());
|
{
|
||||||
}
|
assertEquals(idErrorMessage, e.getMessage());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
@Test
|
|
||||||
public void testNullRole() throws Exception
|
@Test
|
||||||
{
|
public void testNullRole() throws Exception
|
||||||
try
|
{
|
||||||
{
|
try
|
||||||
siteMember = new SiteMembership(siteInfo, personId, firstName, lastName, null);
|
{
|
||||||
}
|
siteMember = new SiteMembership(siteInfo, personId, firstName, lastName, null);
|
||||||
catch (IllegalArgumentException e)
|
}
|
||||||
{
|
catch (IllegalArgumentException e)
|
||||||
assertEquals(roleErrorMessage, e.getMessage());
|
{
|
||||||
}
|
assertEquals(roleErrorMessage, e.getMessage());
|
||||||
|
}
|
||||||
try
|
|
||||||
{
|
try
|
||||||
siteMember = new SiteMembership(siteInfo, personId, null);
|
{
|
||||||
}
|
siteMember = new SiteMembership(siteInfo, personId, null);
|
||||||
catch (IllegalArgumentException e)
|
}
|
||||||
{
|
catch (IllegalArgumentException e)
|
||||||
assertEquals(roleErrorMessage, e.getMessage());
|
{
|
||||||
}
|
assertEquals(roleErrorMessage, e.getMessage());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
@Test
|
|
||||||
public void testNullFirstName() throws Exception
|
@Test
|
||||||
{
|
public void testNullFirstName() throws Exception
|
||||||
try
|
{
|
||||||
{
|
try
|
||||||
siteMember = new SiteMembership(siteInfo, personId, null, lastName, role);
|
{
|
||||||
}
|
siteMember = new SiteMembership(siteInfo, personId, null, lastName, role);
|
||||||
catch (IllegalArgumentException e)
|
}
|
||||||
{
|
catch (IllegalArgumentException e)
|
||||||
assertEquals(firstNameErrorMessage + siteInfo.getShortName(), e.getMessage());
|
{
|
||||||
}
|
assertEquals(firstNameErrorMessage + siteInfo.getShortName(), e.getMessage());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
@Test
|
|
||||||
public void testNullLastName() throws Exception
|
@Test
|
||||||
{
|
public void testNullLastName() throws Exception
|
||||||
try
|
{
|
||||||
{
|
try
|
||||||
siteMember = new SiteMembership(siteInfo, personId, firstName, null, role);
|
{
|
||||||
}
|
siteMember = new SiteMembership(siteInfo, personId, firstName, null, role);
|
||||||
catch (IllegalArgumentException e)
|
}
|
||||||
{
|
catch (IllegalArgumentException e)
|
||||||
assertEquals(lastNameErrorMessage + siteInfo.getShortName(), e.getMessage());
|
{
|
||||||
}
|
assertEquals(lastNameErrorMessage + siteInfo.getShortName(), e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user