ACS-10095 Upgrade core ACS repositories to Java 21

.github/dependabot.yml

@@ -12,9 +12,8 @@ updates:
   schedule:
     interval: daily
     time: "22:00"
-    timezone: "Europe/London"
-  # disabling versions updates, when set to 0 only security updates will open
-  open-pull-requests-limit: 0
+    timezone: Africa/Abidjan
+  open-pull-requests-limit: 99
   ignore:
 # Upstream alfresco-community-repo artifacts
   - dependency-name: org.alfresco:alfresco-community-repo
@@ -42,11 +41,3 @@ updates:
     - ">= 3.a, < 4"
   registries:
   - maven-repository-artifacts-alfresco-com-nexus-content-groups-int
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "weekly"
-  groups:
-    github-actions:
-      patterns:
-        - "*"

.github/workflows/ci.yml

@@ -30,8 +30,8 @@ env:
   TAS_ENVIRONMENT: ./tests/environment
   TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts
     # Release version has to start with real version (23.2.0-....) for the docker image to build successfully.
-  RELEASE_VERSION: 26.2.0-A.19
-  DEVELOPMENT_VERSION: 26.2.0-A.20-SNAPSHOT
+  RELEASE_VERSION: 25.3.0-A.5
+  DEVELOPMENT_VERSION: 25.3.0-A.6-SNAPSHOT
 
 jobs:
   precommit:
@@ -40,13 +40,13 @@ jobs:
     if: >
       !contains(github.event.head_commit.message, '[skip tests]')
     steps:
-      - uses: actions/checkout@v6
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v18.7.1
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
         with:
           java-version: ${{ env.JAVA_VERSION }}
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v18.7.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.16.0
 
   tas_tests:
     name: ${{ matrix.testSuite }} TAS tests
@@ -93,9 +93,9 @@ jobs:
             profiles: all-tas-tests
             compose-file: docker-compose-minimal.yml
     steps:
-      - uses: actions/checkout@v6
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v18.7.1
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
         with:
           java-version: ${{ env.JAVA_VERSION }}
       - name: "Init"
@@ -117,9 +117,9 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip tests]')"
     steps:
-      - uses: actions/checkout@v6
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v18.7.1
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
         with:
           java-version: ${{ env.JAVA_VERSION }}
       - name: "Init"
@@ -141,12 +141,12 @@ jobs:
     if: >
       !contains(github.event.head_commit.message, '[skip tests]')
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v18.7.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
         with:
           java-version: ${{ env.JAVA_VERSION }}
       - name: "Build"
@@ -183,14 +183,14 @@ jobs:
         ports:
           - 5000:5000
     steps:
-      - uses: actions/checkout@v6
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v18.7.1
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
         with:
           java-version: ${{ env.JAVA_VERSION }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -217,16 +217,16 @@ jobs:
         ports:
           - 5000:5000
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v18.7.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
         with:
           java-version: ${{ env.JAVA_VERSION }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -241,7 +241,7 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
       - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@v6
+        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 }}
@@ -262,10 +262,10 @@ jobs:
       (github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v6
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v18.7.1
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
       - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@v6
+        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 }}

.github/workflows/precommit_formatter.yml

@@ -6,7 +6,6 @@ on:
       - precommit/**
 
 env:
-  JAVA_VERSION: "21"
   MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
   MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
 
@@ -16,14 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     if: contains(github.event.head_commit.message, '[reformat code]')
     steps:
-      - uses: actions/checkout@v6
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v18.7.1
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v18.7.1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
       - name: Set up Python ${{ inputs.python-version }}
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
         with:
           python-version: "3.9"
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
@@ -32,7 +29,7 @@ jobs:
           extra_args: --all-files
       - name: Update secrets baseline
         run: pip install detect-secrets && detect-secrets scan --baseline .secrets.baseline
-      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v18.7.1
+      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.16.0
         with:
           username: ${{ secrets.BOT_GITHUB_USERNAME }}
           add-options: -u

dev/dev-acs-amps-overlay/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <properties>

dev/dev-repo-amps-overlay/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <build>

dev/dev-share-amps-overlay/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <build>

dev/dev-tomcat/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <properties>

dev/docker-compose.yml

@@ -25,7 +25,7 @@ services:
             - 5432:5432
 
     solr6:
-        image: alfresco/alfresco-search-services:2.0.20
+        image: alfresco/alfresco-search-services:2.0.16-A.2
         mem_limit: 2g
         environment:
             #Solr needs to know how to register itself with Alfresco

dev/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <properties>

distribution-ags/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <dependencies>

distribution/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <dependencies>

docker-alfresco/Dockerfile

@@ -1,5 +1,5 @@
 ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
+FROM alfresco/alfresco-base-tomcat:tomcat10-jre21-rockylinux9@sha256:ed568167f4c28efc9db4c5bc44a882ee117c475463b526b21ada99e1b6d568dd
 
 # Set default docker_context.
 ARG resource_path=target
@@ -32,4 +32,4 @@ RUN chgrp -R ${GROUPNAME} ${TOMCAT_DIR}/webapps ${TOMCAT_DIR}/amps ${TOMCAT_DIR}
     chmod -R g+r ${TOMCAT_DIR}/webapps && \
     chmod 664 ${TOMCAT_DIR}/amps/*
 
-USER ${IMAGEUSERNAME}
+USER ${IMAGEUSERNAME}

docker-alfresco/ags/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>content-services-community-docker</artifactId>
-      <version>26.2.0-A.20-SNAPSHOT</version>
+      <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>
 
    <properties>

docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <properties>

docker-share/ags/Dockerfile

@@ -1,6 +1,6 @@
 ### Apply AGS community share AMP to Share image
 ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
+FROM alfresco/alfresco-base-tomcat:tomcat10-jre21-rockylinux9@sha256:ed568167f4c28efc9db4c5bc44a882ee117c475463b526b21ada99e1b6d568dd
 
 LABEL quay.expires-after=${docker.quay-expires.value}
 

docker-share/ags/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>share-community-docker</artifactId>
-      <version>26.2.0-A.20-SNAPSHOT</version>
+      <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>
 
    <properties>

docker-share/pom.xml

@@ -7,6 +7,6 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>acs-community-packaging</artifactId>
-      <version>26.2.0-A.20-SNAPSHOT</version>
+      <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>
 </project>

pom.xml

@@ -3,19 +3,19 @@
     <artifactId>acs-community-packaging</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>26.2.0-A.20-SNAPSHOT</version>
+    <version>25.3.0-A.6-SNAPSHOT</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>26.2.0.62</version>
+        <version>25.3.0.33-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-community-repo.version>26.2.0.62</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>26.2.0.38</dependency.alfresco-community-share.version>
-        <dependency.acs-packaging.version>26.2.0-A.19</dependency.acs-packaging.version> <!-- for Share distribution zip -->
+        <dependency.alfresco-community-repo.version>25.3.0.33-SNAPSHOT</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>25.3.0.21-SNAPSHOT</dependency.alfresco-community-share.version>
+        <dependency.acs-packaging.version>25.3.0-A.5</dependency.acs-packaging.version> <!-- for Share distribution zip -->
 
         <repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
         <share.image.tag>${dependency.alfresco-community-share.version}</share.image.tag>

public-javadoc/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

tests/environment/.env

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.20
+SOLR6_TAG=2.0.16-A.2
 POSTGRES_TAG=15.4
 ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8

tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <modules>

tests/tas-cmis/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <developers>

tests/tas-distribution-zip/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.alfresco</groupId>
     <artifactId>content-repository-community-tests</artifactId>
-    <version>26.2.0-A.20-SNAPSHOT</version>
+    <version>25.3.0-A.6-SNAPSHOT</version>
   </parent>
 
   <properties>

tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <developers>

tests/tas-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <developers>
@@ -114,7 +114,7 @@
                     <suiteXmlFiles>
                         <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
                     </suiteXmlFiles>
-                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 21 -->
+                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 17 -->
                     <argLine>
                         --illegal-access=warn
                         --add-opens=java.base/java.lang=ALL-UNNAMED

tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <developers>
@@ -90,7 +90,7 @@
                     <suiteXmlFiles>
                         <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
                     </suiteXmlFiles>
-                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 21 -->
+                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 17 -->
                     <argLine>
                         --illegal-access=warn
                         --add-opens=java.base/java.lang=ALL-UNNAMED

tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>26.2.0-A.20-SNAPSHOT</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
     </parent>
 
     <developers>