[release][publish] 7.4.2.5

Update upstream versions
    - alfresco-community-repo:   22.36
    - alfresco-enterprise-share: 22.26
    - acs-packaging:             7.4.2.5
    - RELEASE_VERSION:           7.4.2.5
    - DEVELOPMENT_VERSION:       7.4.2.6-A1-SNAPSHOT

.github/workflows/ci.yml

@@ -28,9 +28,9 @@ env:
   QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
   TAS_ENVIRONMENT: ./tests/environment
   TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts
-  # Release version has to start with real version (7.4.0-....) for the docker image to build successfully.
-  RELEASE_VERSION: 7.4.0
-  DEVELOPMENT_VERSION: 7.4.1-A1-SNAPSHOT
+  # Release version has to start with real version (7.4.2-....) for the docker image to build successfully.
+  RELEASE_VERSION: 7.4.2.5
+  DEVELOPMENT_VERSION: 7.4.2.6-A1-SNAPSHOT
 
 jobs:
   tas_tests:
@@ -78,9 +78,9 @@ jobs:
             profiles: all-tas-tests
             compose-file: docker-compose-minimal.yml
     steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -100,9 +100,9 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip tests]')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -131,11 +131,11 @@ jobs:
         ports:
           - 5000:5000
     steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -162,13 +162,14 @@ jobs:
         ports:
           - 5000:5000
     steps:
-      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@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
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -183,7 +184,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 }}
@@ -204,10 +205,11 @@ jobs:
       (github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
       - 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 }}

dev/README.md

@@ -66,9 +66,9 @@ The repository code will need to talk to other ACS components, such as a databas
 The simplest way to create these, is to use the `docker-compose.yml` file in the `dev` directory.
 ~~~
 # The `envUp` alias is the same as the following commands. Run these in a new terminal session, or add a `-d` flag to
-the `docker-compose` command.
+the `docker compose` command.
 cd acs-community-packaging
-docker-compose -f dev/docker-compose.yml up
+docker compose -f dev/docker-compose.yml up
 Creating dev_activemq_1           ... done
 Creating dev_solr6_1              ... done
 Creating dev_postgres_1           ... done
@@ -120,13 +120,13 @@ mvn install -Prun,withShare -rf dev-acs-amps-overlay
 ## Clean up
 When finished, kill the tomcat instance and stop the Docker instances. You will normally also
 remove the Docker containers, as you will need a clean database if you are going to issue
-another `mvn clean install` command. If you started `docker-compose` in a separate terminal session,
-simply use `^C` or if you used a `-d` flag, use `docker-compose -f dev/docker-compose.yml stop`.
+another `mvn clean install` command. If you started `docker compose` in a separate terminal session,
+simply use `^C` or if you used a `-d` flag, use `docker compose -f dev/docker-compose.yml stop`.
 ~~~
 ^C
 ... Stopped 'sysAdmin' subsystem, ID: [sysAdmin, default]
 
-docker-compose -f dev/docker-compose.yml rm
+docker compose -f dev/docker-compose.yml rm
 Going to remove dev_transform-core-aio_1, dev_transform-router_1, dev_solr6_1, dev_postgres_1, dev_activemq_1, dev_shared-file-store_1
 Are you sure? [yN] y
 Removing dev_transform-core-aio_1 ... done

dev/aliases

@@ -65,6 +65,6 @@ alias comXS='comS  && comP'
 alias     drm='docker rm -f $(docker ps -q)'
 alias     arm='rm -rf `find . -name alf_data`'
 alias   envUp='./acs-community-packaging/scripts/dev/start-compose.sh'
-alias envStop='docker-compose -f acs-community-packaging/dev/docker-compose.yml stop'
-alias envKill='docker-compose -f acs-community-packaging/dev/docker-compose.yml kill'
-alias   envRm='docker-compose -f acs-community-packaging/dev/docker-compose.yml rm'
+alias envStop='docker compose -f acs-community-packaging/dev/docker-compose.yml stop'
+alias envKill='docker compose -f acs-community-packaging/dev/docker-compose.yml kill'
+alias   envRm='docker compose -f acs-community-packaging/dev/docker-compose.yml rm'

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

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.2.5-A2-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>7.4.0</version>
+        <version>7.4.2.5-A2-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>7.4.0</version>
+        <version>7.4.2.5-A2-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>7.4.0</version>
+        <version>7.4.2.5-A2-SNAPSHOT</version>
     </parent>
 
     <properties>

dev/docker-compose.yml

@@ -25,7 +25,7 @@ services:
             - 5432:5432
 
     solr6:
-        image: alfresco/alfresco-search-services:2.0.3
+        image: alfresco/alfresco-search-services:2.0.11
         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>7.4.0</version>
+        <version>7.4.2.5-A2-SNAPSHOT</version>
     </parent>
 
     <properties>

distribution-ags/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.2.5-A2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

distribution/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.2.5-A2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

docker-alfresco/ags/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>content-services-community-docker</artifactId>
-      <version>7.4.0</version>
+      <version>7.4.2.5-A2-SNAPSHOT</version>
    </parent>
 
    <properties>

docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.2.5-A2-SNAPSHOT</version>
     </parent>
 
     <properties>

docker-share/ags/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>share-community-docker</artifactId>
-      <version>7.4.0</version>
+      <version>7.4.2.5-A2-SNAPSHOT</version>
    </parent>
 
    <properties>

docker-share/pom.xml

@@ -7,6 +7,6 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>acs-community-packaging</artifactId>
-      <version>7.4.0</version>
+      <version>7.4.2.5-A2-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>7.4.0</version>
+    <version>7.4.2.5-A2-SNAPSHOT</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>20.161</version>
+        <version>22.36</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-community-repo.version>20.161</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>20.163</dependency.alfresco-community-share.version>
-        <dependency.acs-packaging.version>7.4.0</dependency.acs-packaging.version> <!-- for Share distribution zip -->
+        <dependency.alfresco-community-repo.version>22.36</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>22.26</dependency.alfresco-community-share.version>
+        <dependency.acs-packaging.version>7.4.2.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>7.4.0</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>

public-javadoc/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.2.5-A2-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

scripts/dev/start-compose.sh

@@ -2,4 +2,4 @@ set -x
 export TRANSFORMERS_TAG=$(mvn -f acs-community-packaging/pom.xml help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
 
 # .env files are picked up from project directory correctly on docker-compose 1.23.0+
-docker-compose -f acs-community-packaging/dev/docker-compose.yml up
+docker compose -f acs-community-packaging/dev/docker-compose.yml up

tests/environment/.env

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.7-A5
+SOLR6_TAG=2.0.11
 POSTGRES_TAG=14.4
 ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8

tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.2.5-A2-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>7.4.0</version>
+        <version>7.4.2.5-A2-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>7.4.0</version>
+    <version>7.4.2.5-A2-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>7.4.0</version>
+        <version>7.4.2.5-A2-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>7.4.0</version>
+        <version>7.4.2.5-A2-SNAPSHOT</version>
     </parent>
 
     <developers>

tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.2.5-A2-SNAPSHOT</version>
     </parent>
 
     <developers>

tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>7.4.0</version>
+        <version>7.4.2.5-A2-SNAPSHOT</version>
     </parent>
 
     <developers>