Compare commits

..

12 Commits

Author SHA1 Message Date
Giovanni Toraldo
a99e5cdde9 split failing job in two separate jobs 2023-10-31 12:20:15 +01:00
Giovanni Toraldo
7bc6dd142b test core without build-cache but latest maven 2023-10-31 12:20:15 +01:00
Giovanni Toraldo
6cbd2d7d50 [skip ci] remove push branch 2023-10-31 12:20:15 +01:00
Giovanni Toraldo
1786cbec99 add the new input [db] 2023-10-31 12:20:15 +01:00
Giovanni Toraldo
e16a53a23e rebuild 2023-10-31 12:20:15 +01:00
Giovanni Toraldo
21fb85f2a9 drop debug 2023-10-31 12:20:15 +01:00
Giovanni Toraldo
7dfd41997a ssh debug 2023-10-31 12:20:15 +01:00
Giovanni Toraldo
6374aa30d6 Revert "build with maven daemon"
This reverts commit 7f70aa3d61f72a5538346329736805e4eabc4782.
2023-10-31 12:20:15 +01:00
Giovanni Toraldo
ed8bdc87da build with maven daemon 2023-10-31 12:20:15 +01:00
Giovanni Toraldo
5b8d758947 build 2023-10-31 12:20:14 +01:00
Giovanni Toraldo
ed3f170d05 use custom setup-java-build 2023-10-31 12:20:14 +01:00
alfresco-build
8d51e9885a [maven-release-plugin][skip ci] prepare for next development iteration 2023-10-30 18:33:51 +00:00
35 changed files with 138 additions and 448 deletions

View File

@@ -37,8 +37,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Prepare maven cache and check compilation"
@@ -57,8 +59,8 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
- name: "Init"
run: bash ./scripts/ci/init.sh
- uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v1.35.2
@@ -80,8 +82,8 @@ jobs:
steps:
- uses: Alfresco/ya-pmd-scan@v2.0.5
all_unit_tests_suite:
name: "Core, Data-Model, Repository - AllUnitTestsSuite - Build and test"
core_datamodel_tests:
name: "Core, Data-Model - Build and test"
runs-on: ubuntu-latest
needs: [prepare]
if: >
@@ -91,14 +93,36 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Run tests"
run: |
mvn -B test -pl core,data-model -am -DfailIfNoTests=false
mvn -B test -pl "repository,mmt" -am "-Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite" -DfailIfNoTests=false
run: mvn -B test -pl core,data-model -am -DfailIfNoTests=false
- name: "Clean Maven cache"
run: bash ./scripts/ci/cleanup_cache.sh
all_unit_tests_suite:
name: "Repository - AllUnitTestsSuite - Build and test"
runs-on: ubuntu-latest
needs: [prepare]
if: >
!contains(github.event.head_commit.message, '[skip repo]') &&
!contains(github.event.head_commit.message, '[skip tests]') &&
!contains(github.event.head_commit.message, '[force')
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Run tests"
run: mvn -B test -pl repository,mmt -am -Dtest=AllUnitTestsSuite,AllMmtUnitTestSuite -DfailIfNoTests=false
- name: "Clean Maven cache"
run: bash ./scripts/ci/cleanup_cache.sh
@@ -129,8 +153,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Build"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -159,12 +185,14 @@ jobs:
strategy:
fail-fast: false
matrix:
version: ['10.2.18', '10.4', '10.5']
version: ["10.2.18", "10.4", "10.5"]
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: Run MariaDB ${{ matrix.version }} database
@@ -190,8 +218,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Run MariaDB 10.6 database"
@@ -217,8 +247,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Run MySQL 8 database"
@@ -243,8 +275,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Run PostgreSQL 13.12 database"
@@ -269,8 +303,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Run PostgreSQL 14.9 database"
@@ -295,8 +331,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Run PostgreSQL 15.4 database"
@@ -319,8 +357,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Run ActiveMQ"
@@ -361,17 +401,19 @@ jobs:
compose-profile: with-transform-core-aio
- testSuite: SearchTestSuite
compose-profile: default
mvn-options: '-Dindex.subsystem.name=solr6'
mvn-options: "-Dindex.subsystem.name=solr6"
- testSuite: MTLSTestSuite
compose-profile: with-mtls-transform-core-aio
mtls: true
disabledHostnameVerification: false
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:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Set transformers tag"
@@ -441,8 +483,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Build"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -479,8 +523,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Init"
run: bash ./scripts/ci/init.sh
- name: "Run Postgres 15.4 database"
@@ -509,8 +555,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Build"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -541,8 +589,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Build"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -569,8 +619,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Build"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |
@@ -605,7 +657,7 @@ jobs:
ags_start_api_explorer:
name: "Test Tomcat deployment of api explorer"
runs-on: ubuntu-latest
needs: [ prepare ]
needs: [prepare]
if: >
(((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
!contains(github.event.head_commit.message, '[skip ags]')) ||
@@ -615,8 +667,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
- uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@hack-build-cache
with:
build-cache: "true"
- name: "Build"
timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
run: |

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-automation-community-repo</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<build>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-parent</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -1,3 +1,3 @@
SOLR6_TAG=2.0.8.1
POSTGRES_TAG=15.4
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -5,7 +5,7 @@
# Version label
version.major=23
version.minor=1
version.revision=1
version.revision=0
version.label=
# Edition label

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community-repo-parent</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<build>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-amps</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -9,6 +9,6 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
</project>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -1,3 +1,3 @@
SOLR6_TAG=2.0.8.1
POSTGRES_TAG=15.4
ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<modules>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<organization>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-tests</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<developers>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo-packaging</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<properties>

View File

@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-community-repo</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Alfresco Community Repo Parent</name>
@@ -25,7 +25,7 @@
<properties>
<acs.version.major>23</acs.version.major>
<acs.version.minor>1</acs.version.minor>
<acs.version.revision>1</acs.version.revision>
<acs.version.revision>0</acs.version.revision>
<acs.version.label />
<amp.min.version>${acs.version.major}.0.0</amp.min.version>
@@ -88,7 +88,7 @@
<dependency.jboss.logging.version>3.5.0.Final</dependency.jboss.logging.version>
<dependency.camel.version>4.0.0</dependency.camel.version> <!-- when bumping this version, please keep track/sync with included netty.io dependencies -->
<dependency.netty.version>4.1.96.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.2</dependency.activemq.version>
<dependency.apache-compress.version>1.24.0</dependency.apache-compress.version>
<dependency.awaitility.version>4.2.0</dependency.awaitility.version>
<dependency.swagger-ui.version>3.38.0</dependency.swagger-ui.version>
@@ -152,7 +152,7 @@
<connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
<url>https://github.com/Alfresco/alfresco-community-repo</url>
<tag>23.1.1.4</tag>
<tag>HEAD</tag>
</scm>
<distributionManagement>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-community-repo</artifactId>
<version>23.1.1.4</version>
<version>23.1.0.256-SNAPSHOT</version>
</parent>
<dependencies>

View File

@@ -31,7 +31,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.action.executer.ContentMetadataExtracter;
import org.alfresco.repo.content.transform.TransformerDebug;
import org.alfresco.repo.rendition2.RenditionDefinition2;
import org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl;
import org.alfresco.repo.rendition2.RenditionService2;
import org.alfresco.repo.rendition2.TransformDefinition;
@@ -412,21 +411,12 @@ public class AsynchronousExtractor extends AbstractMappingMetadataExtracter
// is used to cache the transform name that will be used.
String transformName = targetMimetype + '/' + sourceMimetype;
String renditionName = TransformDefinition.convertToRenditionName(transformName);
Map<String, String> transformOptions = new HashMap<>();
RenditionDefinition2 renditionDefinition2 = renditionDefinitionRegistry2.getRenditionDefinition(renditionName);
if (renditionDefinition2 != null)
TransformDefinition transformDefinition = (TransformDefinition) renditionDefinitionRegistry2.getRenditionDefinition(renditionName);
if (transformDefinition == null)
{
transformOptions.putAll(renditionDefinition2.getTransformOptions());
transformDefinition = new TransformDefinition(transformName, targetMimetype,
options, null, null, null, renditionDefinitionRegistry2);
}
else
{
transformOptions.putAll(options);
}
TransformDefinition transformDefinition = new TransformDefinition(transformName, targetMimetype, transformOptions, null,
null, null, renditionDefinitionRegistry2);
if (logger.isTraceEnabled())
{

View File

@@ -2,7 +2,7 @@
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2023 Alfresco Software Limited
* Copyright (C) 2005 - 2021 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
@@ -485,7 +485,7 @@ public class SolrJSONResultSet implements SearchEngineResultSet {
Set<Metric> metrics = new HashSet<>(1);
List<GenericFacetResponse> nested = new ArrayList<>();
String field = piv.getString("field");
String value = piv.get("value") != null ? piv.get("value").toString() : null;
String value = piv.getString("value");
if (piv.has("stats"))
{
JSONObject stats = piv.getJSONObject("stats");

View File

@@ -3,7 +3,7 @@
repository.name=Main Repository
# Schema number
version.schema=19100
version.schema=19000
# Directory configuration

View File

@@ -134,7 +134,6 @@ import org.junit.runners.Suite;
org.alfresco.repo.search.impl.solr.SolrQueryHTTPClientTest.class,
org.alfresco.repo.search.impl.solr.SolrSQLHttpClientTest.class,
org.alfresco.repo.search.impl.solr.SolrStatsResultTest.class,
org.alfresco.repo.search.impl.solr.SolrJSONResultTest.class,
org.alfresco.repo.search.impl.solr.SolrSQLJSONResultMetadataSetTest.class,
org.alfresco.repo.search.impl.solr.facet.SolrFacetComparatorTest.class,
org.alfresco.repo.search.impl.solr.facet.FacetQNameUtilsTest.class,

View File

@@ -1,353 +0,0 @@
/*
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2023 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.repo.search.impl.solr;
import static org.junit.Assert.assertTrue;
import java.util.List;
import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericFacetResponse;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.search.LimitBy;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.util.testing.category.LuceneTests;
import org.json.JSONException;
import org.json.JSONObject;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
/**
* The results of executing a Solr JSON query
*
* @author Tiago Salvado
*/
@RunWith(MockitoJUnitRunner.class)
@Category(LuceneTests.class)
public class SolrJSONResultTest
{
private @Mock NodeService nodeService;
private @Mock NodeDAO nodeDao;
private static final String JSON = "{\r\n"
+ " \"responseHeader\":{\r\n"
+ " \"QTime\":7,\r\n"
+ " \"status\":0\r\n"
+ " },\r\n"
+ " \"_facet_function_mappings_\":{\r\n"
+ " \r\n"
+ " },\r\n"
+ " \"txRemaining\":0,\r\n"
+ " \"_interval_mappings_\":{\r\n"
+ " \r\n"
+ " },\r\n"
+ " \"lastIndexedTx\":26,\r\n"
+ " \"_date_mappings_\":{\r\n"
+ " \r\n"
+ " },\r\n"
+ " \"_pivot_mappings_\":{\r\n"
+ " \"exif:pixelXDimension,exif:manufacturer\":\"int@s_@{http://www.alfresco.org/model/exif/1.0}pixelXDimension,text@s__lt@{http://www.alfresco.org/model/exif/1.0}manufacturer\"\r\n"
+ " },\r\n"
+ " \"_range_mappings_\":{\r\n"
+ " \r\n"
+ " },\r\n"
+ " \"_original_parameters_\":{\r\n"
+ " \"carrot.url\":\"id\",\r\n"
+ " \"spellcheck.collateExtendedResults\":\"true\",\r\n"
+ " \"df\":\"TEXT\",\r\n"
+ " \"fl\":\"DBID,score\",\r\n"
+ " \"spellcheck.maxCollations\":\"3\",\r\n"
+ " \"fq\":[\r\n"
+ " \"{!afts}AUTHORITY_FILTER_FROM_JSON\",\r\n"
+ " \"{!afts}TENANT_FILTER_FROM_JSON\"\r\n"
+ " ],\r\n"
+ " \"spellcheck.maxCollationTries\":\"5\",\r\n"
+ " \"locale\":\"en_US\",\r\n"
+ " \"hl.qparser\":\"afts\",\r\n"
+ " \"defType\":\"afts\",\r\n"
+ " \"spellcheck.maxResultsForSuggest\":\"5\",\r\n"
+ " \"rqq\":\"{!rrafts}RERANK_QUERY_FROM_CONTEXT\",\r\n"
+ " \"stats\":\"true\",\r\n"
+ " \"carrot.outputSubClusters\":\"false\",\r\n"
+ " \"wt\":\"json\",\r\n"
+ " \"stats.field\":\"{! tag=piv1 key=piv1 countDistinct=false distinctValues=false min=true max=true sum=true count=true missing=true sumOfSquares=true mean=true stddev=true}cm:content.size\",\r\n"
+ " \"facet.pivot\":\"exif:pixelXDimension,exif:manufacturer\",\r\n"
+ " \"carrot.produceSummary\":\"true\",\r\n"
+ " \"start\":\"0\",\r\n"
+ " \"rows\":\"0\",\r\n"
+ " \"spellcheck.alternativeTermCount\":\"2\",\r\n"
+ " \"spellcheck.extendedResults\":\"false\",\r\n"
+ " \"alternativeDic\":\"DEFAULT_DICTIONARY\",\r\n"
+ " \"spellcheck\":\"false\",\r\n"
+ " \"spellcheck.count\":\"5\",\r\n"
+ " \"facet\":\"true\",\r\n"
+ " \"carrot.title\":\"mltext@m___t@{http://www.alfresco.org/model/content/1.0}title\",\r\n"
+ " \"carrot.snippet\":\"content@s___t@{http://www.alfresco.org/model/content/1.0}content\",\r\n"
+ " \"spellcheck.collate\":\"true\",\r\n"
+ " \"rq\":\"{!alfrescoReRank reRankQuery=$rqq reRankDocs=500 scale=true reRankWeight=3}\"\r\n"
+ " },\r\n"
+ " \"_stats_facet_mappings_\":{\r\n"
+ " \r\n"
+ " },\r\n"
+ " \"stats\":{\r\n"
+ " \"stats_fields\":{\r\n"
+ " \"piv1\":{\r\n"
+ " \"sumOfSquares\":29214041999911,\r\n"
+ " \"min\":25,\r\n"
+ " \"max\":3737049,\r\n"
+ " \"mean\":81749.67403314917,\r\n"
+ " \"count\":181,\r\n"
+ " \"missing\":9,\r\n"
+ " \"sum\":14796691,\r\n"
+ " \"stddev\":394436.42871747876\r\n"
+ " }\r\n"
+ " }\r\n"
+ " },\r\n"
+ " \"processedDenies\":true,\r\n"
+ " \"response\":{\r\n"
+ " \"docs\":[\r\n"
+ " \r\n"
+ " ],\r\n"
+ " \"numFound\":190,\r\n"
+ " \"start\":0,\r\n"
+ " \"maxScore\":1\r\n"
+ " },\r\n"
+ " \"_stats_field_mappings_\":{\r\n"
+ " \"cm:content.size\":\"content@s__size@{http://www.alfresco.org/model/content/1.0}content\"\r\n"
+ " },\r\n"
+ " \"facet_counts\":{\r\n"
+ " \"facet_intervals\":{\r\n"
+ " \r\n"
+ " },\r\n"
+ " \"facet_pivot\":{\r\n"
+ " \"exif:pixelXDimension,exif:manufacturer\":[\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":2,\r\n"
+ " \"pivot\":[\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}corpor\"\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}hewlett\"\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}packard\"\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}pentax\"\r\n"
+ " }\r\n"
+ " ],\r\n"
+ " \"value\":1000\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"pivot\":[\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}canon\"\r\n"
+ " }\r\n"
+ " ],\r\n"
+ " \"value\":100\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":400\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":414\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":591\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":625\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":749\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":751\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":778\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":782\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":793\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":1067\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"pivot\":[\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}co\"\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}ltd\"\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}olympu\"\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}optic\"\r\n"
+ " }\r\n"
+ " ],\r\n"
+ " \"value\":1120\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":1216\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":2000\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"pivot\":[\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}compani\"\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}eastman\"\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}kodak\"\r\n"
+ " }\r\n"
+ " ],\r\n"
+ " \"value\":2580\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"pivot\":[\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}canon\"\r\n"
+ " }\r\n"
+ " ],\r\n"
+ " \"value\":3072\r\n"
+ " },\r\n"
+ " {\r\n"
+ " \"field\":\"exif:pixelXDimension\",\r\n"
+ " \"count\":1,\r\n"
+ " \"pivot\":[\r\n"
+ " {\r\n"
+ " \"field\":\"exif:manufacturer\",\r\n"
+ " \"count\":1,\r\n"
+ " \"value\":\"{en}canon\"\r\n"
+ " }\r\n"
+ " ],\r\n"
+ " \"value\":3264\r\n"
+ " }\r\n"
+ " ]\r\n"
+ " },\r\n"
+ " \"facet_queries\":{\r\n"
+ " \r\n"
+ " },\r\n"
+ " \"facet_fields\":{\r\n"
+ " \r\n"
+ " },\r\n"
+ " \"facet_heatmaps\":{\r\n"
+ " \r\n"
+ " },\r\n"
+ " \"facet_ranges\":{\r\n"
+ " \r\n"
+ " }\r\n"
+ " },\r\n"
+ " \"_field_mappings_\":{\r\n"
+ " \r\n"
+ " },\r\n"
+ " \"lastIndexedTxTime\":1698923805438\r\n"
+ " }";
@Test
public void testMNT23152() throws JSONException
{
JSONObject json = new JSONObject(JSON);
SearchParameters parameters = new SearchParameters();
SolrJSONResultSet s = new SolrJSONResultSet(json, parameters, nodeService, nodeDao, LimitBy.UNLIMITED, 10);
List<GenericFacetResponse> pivotsFacet = s.getPivotFacets();
assertTrue("The pivots facets shouldn't be empty", pivotsFacet != null && !pivotsFacet.isEmpty());
}
}

View File

@@ -34,7 +34,7 @@ services:
ports:
- "3307:3306"
activemq:
image: alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8
image: alfresco/alfresco-activemq:5.18.2-jre17-rockylinux8
ports:
- "5672:5672" # AMQP
- "61616:61616" # OpenWire

View File

@@ -20,7 +20,7 @@ services:
- "5433:5432"
activemq:
profiles: ["default", "with-transform-core-aio", "activemq", "with-mtls-transform-core-aio"]
image: alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8
image: alfresco/alfresco-activemq:5.18.2-jre17-rockylinux8
ports:
- "5672:5672" # AMQP
- "61616:61616" # OpenWire