ACS-10095 Upgrade core ACS repositories to Java 21

version update
2025-09-10 14:12:09 +00:00 · 2025-09-05 14:37:51 +05:30 · 2025-09-05 14:02:26 +05:30 · 2025-09-05 12:27:55 +05:30 · 2025-09-05 11:35:13 +05:30 · 2025-09-04 16:47:26 +05:30
23 changed files with 43 additions and 30 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,7 @@ on:
  workflow_dispatch:

 env:
+  JAVA_VERSION: "21"
  GIT_USERNAME: ${{ secrets.BOT_GITHUB_USERNAME }}
  GIT_EMAIL: ${{ secrets.BOT_GITHUB_EMAIL }}
  GIT_PASSWORD: ${{ secrets.BOT_GITHUB_TOKEN }}
@@ -29,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: 25.2.0-A.17
-  DEVELOPMENT_VERSION: 25.2.0-A.18-SNAPSHOT
+  RELEASE_VERSION: 25.3.0-A.5
+  DEVELOPMENT_VERSION: 25.3.0-A.6-SNAPSHOT

 jobs:
  precommit:
@@ -43,6 +44,8 @@ jobs:
      - 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@v8.16.0

  tas_tests:
@@ -93,6 +96,8 @@ jobs:
      - 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"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -115,6 +120,8 @@ jobs:
      - 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"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -140,6 +147,8 @@ jobs:
      - 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"
        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
        run: |
@@ -178,6 +187,8 @@ jobs:
      - 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@v3
      - name: "Init"
@@ -212,6 +223,8 @@ jobs:
      - 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@v3
      - name: "Init"
--- a/dev/dev-acs-amps-overlay/pom.xml
+++ b/dev/dev-acs-amps-overlay/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <properties>
--- 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-community-tomcat-env</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <build>
--- 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-community-tomcat-env</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <build>
--- a/dev/dev-tomcat/pom.xml
+++ b/dev/dev-tomcat/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <properties>
--- a/dev/pom.xml
+++ b/dev/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <properties>
--- a/distribution-ags/pom.xml
+++ b/distribution-ags/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <dependencies>
--- a/docker-alfresco/Dockerfile
+++ b/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}
--- a/docker-alfresco/ags/pom.xml
+++ b/docker-alfresco/ags/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>content-services-community-docker</artifactId>
-      <version>25.2.0-A.17</version>
+      <version>25.3.0-A.6-SNAPSHOT</version>
   </parent>

   <properties>
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <properties>
--- a/docker-share/ags/Dockerfile
+++ b/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}

--- a/docker-share/ags/pom.xml
+++ b/docker-share/ags/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>share-community-docker</artifactId>
-      <version>25.2.0-A.17</version>
+      <version>25.3.0-A.6-SNAPSHOT</version>
   </parent>

   <properties>
--- a/docker-share/pom.xml
+++ b/docker-share/pom.xml
@@ -7,6 +7,6 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>acs-community-packaging</artifactId>
-      <version>25.2.0-A.17</version>
+      <version>25.3.0-A.6-SNAPSHOT</version>
   </parent>
 </project>
--- a/pom.xml
+++ b/pom.xml
@@ -3,19 +3,19 @@
    <artifactId>acs-community-packaging</artifactId>
    <packaging>pom</packaging>
    <name>Alfresco Content Services Community Packaging</name>
-    <version>25.2.0-A.17</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>25.2.0.60</version>
+        <version>25.3.0.33-SNAPSHOT</version>
    </parent>

    <properties>
-        <dependency.alfresco-community-repo.version>25.2.0.60</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>25.2.0.43</dependency.alfresco-community-share.version>
-        <dependency.acs-packaging.version>25.2.0-A.17</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>
@@ -25,7 +25,7 @@
        <connection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</connection>
        <developerConnection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</developerConnection>
        <url>https://github.com/Alfresco/acs-community-packaging</url>
-        <tag>25.2.0-A.17</tag>
+        <tag>HEAD</tag>
    </scm>

    <distributionManagement>
--- a/public-javadoc/pom.xml
+++ b/public-javadoc/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>
    <packaging>pom</packaging>

--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <modules>
--- a/tests/tas-cmis/pom.xml
+++ b/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <developers>
--- a/tests/tas-distribution-zip/pom.xml
+++ b/tests/tas-distribution-zip/pom.xml
@@ -9,7 +9,7 @@
  <parent>
    <groupId>org.alfresco</groupId>
    <artifactId>content-repository-community-tests</artifactId>
-    <version>25.2.0-A.17</version>
+    <version>25.3.0-A.6-SNAPSHOT</version>
  </parent>

  <properties>
--- a/tests/tas-email/pom.xml
+++ b/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <developers>
--- a/tests/tas-integration/pom.xml
+++ b/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <developers>
--- a/tests/tas-restapi/pom.xml
+++ b/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <developers>
--- a/tests/tas-webdav/pom.xml
+++ b/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>25.2.0-A.17</version>
+        <version>25.3.0-A.6-SNAPSHOT</version>
    </parent>

    <developers>
Author	SHA1	Message	Date
Belal Ansari	8a770792fa	ACS-10095 Upgrade core ACS repositories to Java 21	2025-09-05 14:37:51 +05:30
Belal Ansari	3796c68813	ACS-10095 Upgrade core ACS repositories to Java 21	2025-09-05 14:02:26 +05:30
Belal Ansari	e531c02ea1	version update	2025-09-05 12:27:55 +05:30
Belal Ansari	3d073bf9c9	version update	2025-09-05 11:35:13 +05:30
Belal Ansari	0d1b17890b	version update	2025-09-04 16:47:26 +05:30
Belal Ansari	76f1b372fa	version update	2025-09-04 15:55:19 +05:30
Belal Ansari	8b544be784	version update	2025-09-02 18:35:00 +05:30
Belal Ansari	0163527209	ACS-10095 Base branch for Java 21 upgrade	2025-09-02 18:03:21 +05:30
alfresco-build	8872f9634a	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-24 02:24:44 +00:00
alfresco-build	7db6d945d6	[maven-release-plugin][skip ci] prepare release 25.3.0-A.5	2025-08-24 02:24:43 +00:00
alfresco-build	630b48ffdf	[release] 25.3.0-A.5 Update upstream versions - alfresco-community-repo: 25.3.0.26 - alfresco-enterprise-share: 25.3.0.14 - acs-packaging: 25.3.0-A.5 - RELEASE_VERSION: 25.3.0-A.5 - DEVELOPMENT_VERSION: 25.3.0-A.6-SNAPSHOT	2025-08-24 01:24:07 +00:00
alfresco-build	36a99c4587	[release] 25.3.0-A.4 Update upstream versions - alfresco-community-repo: 25.3.0.24 - alfresco-enterprise-share: 25.3.0.13 - acs-packaging: 25.3.0-A.4 - RELEASE_VERSION: 25.3.0-A.4 - DEVELOPMENT_VERSION: 25.3.0-A.5-SNAPSHOT	2025-08-18 10:32:49 +00:00
alfresco-build	485270a3b2	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-17 02:33:31 +00:00
alfresco-build	962e79f052	[maven-release-plugin][skip ci] prepare release 25.3.0-A.3	2025-08-17 02:33:29 +00:00
alfresco-build	af7ef7286b	[release] 25.3.0-A.3 Update upstream versions - alfresco-community-repo: 25.3.0.24 - alfresco-enterprise-share: 25.3.0.13 - acs-packaging: 25.3.0-A.3 - RELEASE_VERSION: 25.3.0-A.3 - DEVELOPMENT_VERSION: 25.3.0-A.4-SNAPSHOT	2025-08-17 01:26:14 +00:00
alfresco-build	e54a70ff32	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-10 02:25:21 +00:00
alfresco-build	7f949924c3	[maven-release-plugin][skip ci] prepare release 25.3.0-A.2	2025-08-10 02:25:19 +00:00
alfresco-build	0045df452f	[release] 25.3.0-A.2 Update upstream versions - alfresco-community-repo: 25.3.0.21 - alfresco-enterprise-share: 25.3.0.7 - acs-packaging: 25.3.0-A.2 - RELEASE_VERSION: 25.3.0-A.2 - DEVELOPMENT_VERSION: 25.3.0-A.3-SNAPSHOT	2025-08-10 01:22:48 +00:00
alfresco-build	89fdb0acaf	[maven-release-plugin][skip ci] prepare for next development iteration	2025-08-07 13:21:26 +00:00
alfresco-build	50e3f88d97	[maven-release-plugin][skip ci] prepare release 25.3.0-A.1	2025-08-07 13:21:24 +00:00
alfresco-build	68d49a81f8	[release] 25.3.0-A.1 Update upstream versions - alfresco-community-repo: 25.3.0.17 - alfresco-enterprise-share: 25.3.0.5 - acs-packaging: 25.3.0-A.1 - RELEASE_VERSION: 25.3.0-A.1 - DEVELOPMENT_VERSION: 25.3.0-A.2-SNAPSHOT	2025-08-07 12:17:48 +00:00
alfresco-build	8ec63574a3	[maven-release-plugin][skip ci] prepare for next development iteration	2025-07-16 08:41:14 +00:00
alfresco-build	1031230f1f	[maven-release-plugin][skip ci] prepare release 25.2.0	2025-07-16 08:41:12 +00:00
alfresco-build	6b3b16a9a4	[release][publish] 25.2.0 Update upstream versions - alfresco-community-repo: 25.2.0.64 - alfresco-enterprise-share: 25.2.0.46 - acs-packaging: 25.2.0 - RELEASE_VERSION: 25.2.0 - DEVELOPMENT_VERSION: 25.3.0-A.1-SNAPSHOT	2025-07-16 07:23:27 +00:00
alfresco-build	9892d3705a	[release] 25.2.0-A.18 Update upstream versions - alfresco-community-repo: 25.2.0.61 - alfresco-enterprise-share: 25.2.0.44 - acs-packaging: 25.2.0-A.18 - RELEASE_VERSION: 25.2.0-A.18 - DEVELOPMENT_VERSION: 25.2.0-A.19-SNAPSHOT	2025-07-13 01:50:48 +00:00
alfresco-build	06ead549e3	[maven-release-plugin][skip ci] prepare for next development iteration	2025-07-06 02:53:27 +00:00