Merge branch 'master' into feature/bump-spring-to-v-6.1.13

# Conflicts: # pom.xml
Alfresco · Sep 26, 2024 · 706f44d · 706f44d
2 parents ba96da9 + 172d9b2
commit 706f44d
Show file tree

Hide file tree

Showing 35 changed files with 140 additions and 140 deletions.
diff --git a/.github/workflows/arm64.yml b/.github/workflows/arm64.yml
@@ -25,20 +25,20 @@ jobs:
         with:
           persist-credentials: false
           fetch-depth: 0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v5.35.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v5.35.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v5.35.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: linux/amd64,linux/arm64
       - name: "Login to Docker Hub"
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: "Login to Quay.io"
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
@@ -85,7 +85,7 @@ jobs:
           python3 -m pytest --configuration ../tests/pipeline-all-amps/repo/target/dtas/dtas-config.json tests/ -s
       - name: "Dump all Docker containers logs"
         if: failure() && (steps.setup-env.outcome == 'failure' || steps.run-tests.outcome == 'failure')
-        uses: Alfresco/alfresco-build-tools/.github/actions/docker-dump-containers-logs@v5.35.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/docker-dump-containers-logs@v7.0.0
       - name: "Persist test failure flag"
         id: persist_test_failure_flag
         if: failure()

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/master_release.yml b/.github/workflows/master_release.yml
@@ -22,8 +22,8 @@ env:
   GITHUB_ACTIONS_DEPLOY_TIMEOUT: 60
   BASE_BUILD_NUMBER: 10000
     # Release version has to start with real version (23.2.0-....) for the docker image to build successfully.
-  RELEASE_VERSION: 23.4.0-A5
-  DEVELOPMENT_VERSION: 23.4.0-A6-SNAPSHOT
+  RELEASE_VERSION: 23.4.0-A7
+  DEVELOPMENT_VERSION: 23.4.0-A8-SNAPSHOT
 
 jobs:
   run_ci:
@@ -44,14 +44,14 @@ jobs:
         ports:
           - 5000:5000
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - 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/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: linux/amd64,linux/arm64
       - name: "Build"
@@ -82,23 +82,23 @@ jobs:
         ports:
           - 5000:5000
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - 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: actions/setup-python@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
+      - uses: actions/setup-python@v5
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: linux/amd64,linux/arm64
       - name: "Build"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
           bash ./scripts/ci/init.sh
           bash ./scripts/ci/build.sh -m
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}
@@ -115,7 +115,7 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
       - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_S3_STAGING_ACCESS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_S3_STAGING_SECRET_KEY }}
@@ -139,16 +139,16 @@ jobs:
       contains(github.event.head_commit.message, '[publish]') &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
-      - 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/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}
@@ -157,7 +157,7 @@ jobs:
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: bash scripts/ci/maven_publish.sh
       - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_S3_RELEASE_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_S3_RELEASE_SECRET_ACCESS_KEY }}
@@ -183,15 +183,15 @@ jobs:
       !contains(github.event.head_commit.message, '[no downstream]'))) &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - 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/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: "Init"
         run: bash ./scripts/ci/init.sh
-      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.35.2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v7.0.0
         with:
           username: ${{ env.GIT_USERNAME }}
           email: ${{ env.GIT_EMAIL }}

diff --git a/dev/dev-acs-amps-overlay/pom.xml b/dev/dev-acs-amps-overlay/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-tomcat-env</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/dev/dev-repo-amps-overlay/pom.xml b/dev/dev-repo-amps-overlay/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-tomcat-env</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <build>

diff --git a/dev/dev-share-amps-overlay/pom.xml b/dev/dev-share-amps-overlay/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-tomcat-env</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <build>

diff --git a/dev/dev-tomcat/pom.xml b/dev/dev-tomcat/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-tomcat-env</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/dev/pom.xml b/dev/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/distribution-ags/pom.xml b/distribution-ags/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/distribution-share/pom.xml b/distribution-share/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <!-- To replace in share-config-custom.xml -->

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/docker-alfresco/ags/pom.xml b/docker-alfresco/ags/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-services-docker</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
     <properties>
         <image.name>alfresco/alfresco-governance-repository-enterprise</image.name>

diff --git a/docker-alfresco/aws/pom.xml b/docker-alfresco/aws/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-services-docker</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>share-docker</artifactId>
-      <version>23.4.0-A6-SNAPSHOT</version>
+      <version>23.4.0-A8-SNAPSHOT</version>
    </parent>
 
    <properties>

diff --git a/docker-share/aws/pom.xml b/docker-share/aws/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>share-docker</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/docker-share/pom.xml b/docker-share/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/pom.xml b/pom.xml
@@ -4,28 +4,28 @@
     <artifactId>acs-packaging</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Content Services Packaging</name>
-    <version>23.4.0-A6-SNAPSHOT</version>
+    <version>23.4.0-A8-SNAPSHOT</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-enterprise-repo</artifactId>
         <relativePath>../alfresco-enterprise-repo/pom.xml</relativePath>
-        <version>23.4.0.14-SNAPSHOT</version>
+        <version>23.4.0.19-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-enterprise-repo.version>23.4.0.14-SNAPSHOT</dependency.alfresco-enterprise-repo.version>
-        <dependency.alfresco-enterprise-share.version>23.4.0.11-SNAPSHOT</dependency.alfresco-enterprise-share.version>
+        <dependency.alfresco-enterprise-repo.version>23.4.0.19-SNAPSHOT</dependency.alfresco-enterprise-repo.version>
+        <dependency.alfresco-enterprise-share.version>23.4.0.15-SNAPSHOT</dependency.alfresco-enterprise-share.version>
 
         <alfresco.rm-enterprise-rest-api-explorer.version>3.0.2</alfresco.rm-enterprise-rest-api-explorer.version>
 
         <alfresco.s3connector.version>6.1.1</alfresco.s3connector.version>
         <alfresco.azure-connector.version>5.0.2</alfresco.azure-connector.version>
         <alfresco.salesforce-connector.version>3.1.0</alfresco.salesforce-connector.version>
         <alfresco.outlook.version>2.9.0</alfresco.outlook.version>
-        <alfresco.desktop-sync.version>4.0.0</alfresco.desktop-sync.version>
+        <alfresco.desktop-sync.version>5.1.0-A7</alfresco.desktop-sync.version>
         <alfresco.ais.version>3.1.6</alfresco.ais.version>
-        <alfresco.hxinsight-connector.version>1.0.0-A15</alfresco.hxinsight-connector.version>
+        <alfresco.hxinsight-connector.version>1.0.0-A16</alfresco.hxinsight-connector.version>
 
         <acs.version>${acs.version.major}.${acs.version.minor}.${acs.version.revision}${acs.version.label}</acs.version>
         <repo.image.tag>${dependency.alfresco-enterprise-repo.version}</repo.image.tag>

diff --git a/tests/environment/.env b/tests/environment/.env
@@ -3,11 +3,11 @@ SOLR6_TAG=2.0.11
 POSTGRES_TAG=15.4
 MYSQL_TAG=8.0.30
 MARIADB_TAG=10.6
-MSSQL_TAG=2019-CU9-ubuntu-16.04
+MSSQL_TAG=2019-CU28-ubuntu-20.04
 ORACLE_TAG=19.3.0-ee
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
 KEYCLOAK_TAG=24.0.3
-SYNC_SERVICE_TAG=4.0.0
+SYNC_SERVICE_TAG=5.1.0-A7
 TRANSFORM_ROUTER_TAG=4.1.4
 TRANSFORM_CORE_AIO_TAG=5.1.4
 SHARED_FILE_STORE_TAG=4.1.4

diff --git a/tests/environment/docker-compose-pipeline-all-amps.yml b/tests/environment/docker-compose-pipeline-all-amps.yml
@@ -180,7 +180,7 @@ services:
             - share
 
     sync-service:
-        image: quay.io/alfresco/service-sync:4.0.0
+        image: quay.io/alfresco/service-sync:5.1.0-A7
         mem_limit: 1g
         environment:
             JAVA_OPTS : "

diff --git a/tests/pipeline-all-amps/pom.xml b/tests/pipeline-all-amps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-tests</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/tests/pipeline-all-amps/repo/pom.xml b/tests/pipeline-all-amps/repo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>pipeline-all-amps</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <artifactId>alfresco-pipeline-all-amps-repo</artifactId>

diff --git a/tests/pipeline-all-amps/share/pom.xml b/tests/pipeline-all-amps/share/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>pipeline-all-amps</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <artifactId>alfresco-pipeline-all-amps-share</artifactId>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <modules>

diff --git a/tests/tas-all-amps/pom.xml b/tests/tas-all-amps/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-tests</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <developers>

diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-tests</artifactId>
-        <version>23.4.0-A6-SNAPSHOT</version>
+        <version>23.4.0-A8-SNAPSHOT</version>
     </parent>
 
     <developers>