[APPS-3094] remove 70 tests

* [APPS-3043] Upgrade to spring 6.1

* [APPS-3043] Upgrade to spring 6.1

.github/workflows/ci.yml

@@ -20,13 +20,12 @@ env:
   MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
   MAVEN_CENTRAL_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
   MAVEN_CENTRAL_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
-  MAVEN_CLI_OPTS: "-B -q -e -fae -V -DinstallAtEnd=true -U"
 
 jobs:
   pre_commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v1.35.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v7.0.0
 
   veracode_sca:
     name: "Veracode - Source Clear Scan (SCA)"
@@ -35,12 +34,12 @@ jobs:
       github.ref_name == 'master' ||
       github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.34.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.34.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: "Clean-up SNAPSHOT artifacts"
         run: find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
-      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v1.34.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/veracode@v7.0.0
         continue-on-error: true
         with:
           srcclr-api-token: ${{ secrets.SRCCLR_API_TOKEN }}
@@ -50,9 +49,12 @@ jobs:
     runs-on: ubuntu-latest
     needs: [pre_commit]
     if: "!contains(github.event.head_commit.message, '[skip tests]')"
+    env:
+      MAVEN_CLI_OPTS: >
+        -B -q -e -fae -V -DinstallAtEnd=true -U
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: "Build"
         run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
       - name: "Verify"
@@ -71,6 +73,12 @@ jobs:
         include:
           - name: "current version Java 17"
             java-version: 17
+          - name: "23.3 Enterprise Java 17"
+            java-version: 17
+            suite: -Penterprise-233-tests
+          - name: "23.3 Community Java 17"
+            java-version: 17
+            suite: -Pcommunity-233-tests
           - name: "23.2 Enterprise Java 17"
             java-version: 17
             suite: -Penterprise-232-tests
@@ -119,25 +127,19 @@ jobs:
           - name: "7.1 Community"
             java-version: 11
             suite: -Pcommunity-71-tests
-          - name: "7.0 Enterprise"
-            java-version: 11
-            suite: -Penterprise-70-tests
-          - name: "7.0 Community"
-            java-version: 11
-            suite: -Pcommunity-70-tests
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
         with:
           java-version: ${{ matrix.java-version }}
       - name: "Login to Docker Hub"
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: "Login to Quay.io"
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
@@ -150,12 +152,13 @@ jobs:
     runs-on: ubuntu-latest
     needs: [tests]
     if: >
-      !(failure() || cancelled()) &&
+      contains(github.event.head_commit.message, '[publish]')
-      github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.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: "Build"
         run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
       - name: "Publish"
-        run: mvn $MAVEN_CLI_OPTS deploy -DskipTests
+        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
+        run: mvn deploy $MAVEN_CLI_OPTS -DskipTests

README.md

@@ -14,7 +14,7 @@ This project is released under the [Apache License, Version 2.0](http://www.apac
 If you are an Enterprise customer check the [Support](#alfresco-enterprise-customers-and-partners-support) section.
 
 ## News
-
+- 2024-08: Alfresco SDK 4.9.0 released
 - 2024-03: Alfresco SDK 4.8.0 released
 - 2023-11: Alfresco SDK 4.7.0 released
 - 2023-06: Alfresco SDK 4.6.0 released
@@ -79,7 +79,7 @@ the `alfresco.log` file has also been moved to a more appropriate location (Tomc
 
 In Q4 2020, Alfresco Platform has undergone a major structural refactoring.
 
-Depending on the Platform version desired, you might need to use SDK 4.1, 4.3, 4.4, 4.5, 4.6 or SDK 4.7 instead of SDK 4.8.
+Depending on the Platform version desired, you might need to use SDK 4.1, 4.3, 4.4, 4.5, 4.6, 4.7 or SDK 4.8 instead of SDK 4.9.
 
 - For Enterprise and Community versions of 7.x, SDK 4.4 or higher must be used
 - For Enterprise versions of 6.0.x, 6.1.x, 6.2.x newer than November 2020, SDK 4.3 must be used
@@ -93,26 +93,27 @@ It's also important to remember that:
 - Enterprise Docker images are published on *Quay.io*
 
 ### Latest Documentation
-To get started with **Alfresco SDK 4.7.x** (latest) visit the [Alfresco Documentation](docs/README.md).
+To get started with **Alfresco SDK 4.9.x** (latest) visit the [Alfresco Documentation](docs/README.md).
 
 #### Documentation about Previous Versions
-| SDK Version |                   Alfresco Enterprise Version                   |               Alfresco Community Version                | Documentation                                                                                                                                |
+| SDK Version |                       Alfresco Enterprise Version                        |                    Alfresco Community Version                    | Documentation                                                                                                                                |
-|-------------|:---------------------------------------------------------------:|:-------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------|
+|-------------|:------------------------------------------------------------------------:|:----------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------------------------|
-| SDK 4.8     | Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x/ 23.2.x | Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.2.x | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
+| SDK 4.9     | Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x/ 23.2.x / 23.3.x | Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.2.x / 23.3.x | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 4.7     |     Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x     | Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
+| SDK 4.8     |     Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x/ 23.2.x      |     Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.2.x      | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 4.6     |         Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x          |     Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x      | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
+| SDK 4.7     |         Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x          |     Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x / 23.1.x      | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 4.5     |             Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x              |         Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x          | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
+| SDK 4.6     |              Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x              |          Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x / 7.4.x          | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 4.4     |                 Alfresco 7.0.x / 7.1.x / 7.2.x                  |             Alfresco 7.0.x / 7.1.x / 7.2.x              | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
+| SDK 4.5     |                  Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x                  |              Alfresco 7.0.x / 7.1.x / 7.2.x / 7.3.x              | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 4.3     |         Alfresco 6.0.x / 6.1.x / 6.2.x / 7.0.x / 7.1.x          |                 Alfresco 7.0.x / 7.1.x                  | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
+| SDK 4.4     |                      Alfresco 7.0.x / 7.1.x / 7.2.x                      |                  Alfresco 7.0.x / 7.1.x / 7.2.x                  | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 4.2     |             Alfresco 6.0.x / 6.1.x / 6.2.x / 7.0.x              |                     Alfresco 7.0.x                      | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
+| SDK 4.3     |              Alfresco 6.0.x / 6.1.x / 6.2.x / 7.0.x / 7.1.x              |                      Alfresco 7.0.x / 7.1.x                      | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 4.1     |                 Alfresco 6.0.x / 6.1.x / 6.2.x                  |             Alfresco 6.0.x / 6.1.x / 6.2.x              | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.1/docs/README.md                                                                         |
+| SDK 4.2     |                  Alfresco 6.0.x / 6.1.x / 6.2.x / 7.0.x                  |                          Alfresco 7.0.x                          | https://github.com/Alfresco/alfresco-sdk/tree/master/docs/README.md                                                                          |
-| SDK 4.0     |                     Alfresco 6.0.x / 6.1.x                      |                 Alfresco 6.0.x / 6.1.x                  | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.0/docs/README.md                                                                         |
+| SDK 4.1     |                      Alfresco 6.0.x / 6.1.x / 6.2.x                      |                  Alfresco 6.0.x / 6.1.x / 6.2.x                  | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.1/docs/README.md                                                                         |
-| SDK 3.1     |                         Alfresco 5.2.x                          |                     Alfresco 5.2.x                      | http://docs.alfresco.com/5.2/concepts/sdk-intro.html                                                                                         |
+| SDK 4.0     |                          Alfresco 6.0.x / 6.1.x                          |                      Alfresco 6.0.x / 6.1.x                      | https://github.com/Alfresco/alfresco-sdk/blob/sdk-4.0/docs/README.md                                                                         |
-| SDK 3.0     |                         Alfresco 5.2.x                          |                     Alfresco 5.2.x                      | http://docs.alfresco.com/5.2/concepts/sdk-intro.html                                                                                         |
+| SDK 3.1     |                              Alfresco 5.2.x                              |                          Alfresco 5.2.x                          | http://docs.alfresco.com/5.2/concepts/sdk-intro.html                                                                                         |
-| SDK 2.2     |                         Alfresco 5.1.x                          |                     Alfresco 5.1.x                      | https://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html                                                                               |
+| SDK 3.0     |                              Alfresco 5.2.x                              |                          Alfresco 5.2.x                          | http://docs.alfresco.com/5.2/concepts/sdk-intro.html                                                                                         |
-| SDK 2.1     |                         Alfresco 5.0.1                          |                     Alfresco 5.0.d                      | https://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html                                                                            |
+| SDK 2.2     |                              Alfresco 5.1.x                              |                          Alfresco 5.1.x                          | https://docs.alfresco.com/5.1/concepts/alfresco-sdk-intro.html                                                                               |
-| SDK 2.0     |                         Alfresco 5.0.0                          |                     Alfresco 5.0.c                      | https://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html                                                                            |
+| SDK 2.1     |                              Alfresco 5.0.1                              |                          Alfresco 5.0.d                          | https://docs.alfresco.com/sdk2.1/concepts/alfresco-sdk-intro.html                                                                            |
-| SDK 1.1.1   |                         Alfresco 4.2.x                          |                     Alfresco 4.2.x                      | https://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html                                                                   |
+| SDK 2.0     |                              Alfresco 5.0.0                              |                          Alfresco 5.0.c                          | https://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html                                                                            |
+| SDK 1.1.1   |                              Alfresco 4.2.x                              |                          Alfresco 4.2.x                          | https://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html                                                                   |
 
 ## Reporting Issues and Community Support
 Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/issues?milestone=1&state=open) or join us on the [IRC Channel](http://chat.alfresco.com/).

archetypes/alfresco-allinone-archetype/pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/README.md

@@ -1,6 +1,6 @@
-# Alfresco AIO Project - SDK 4.8
+# Alfresco AIO Project - SDK 4.9
 
-This is an All-In-One (AIO) project for Alfresco SDK 4.8.
+This is an All-In-One (AIO) project for Alfresco SDK 4.9.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-integration-tests/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
     <name>Integration Tests Module</name>
-    <description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.8</description>
+    <description>Integration Tests module for in-container integration testing - part of AIO - SDK 4.9</description>
     <packaging>jar</packaging> <!-- Note. this just runs Integration Tests, but it needs to be a JAR otherwise
                                             nothing is compiled (i.e. you cannot set it to pom) -->
 

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
     <name>Alfresco Platform/Repository JAR Module</name>
-    <description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.8</description>
+    <description>Platform/Repo JAR Module (to be included in the alfresco.war) - part of AIO - SDK 4.9</description>
     <packaging>jar</packaging>
 
     <parent>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-share/pom.xml

@@ -5,7 +5,7 @@
     <artifactId>${artifactId}</artifactId>
     <name>Alfresco Share JAR Module</name>
     <packaging>jar</packaging>
-    <description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.8</description>
+    <description>Sample Share JAR Module (to be included in the share.war) - part of AIO - SDK 4.9</description>
 
     <parent>
         <groupId>${groupId}</groupId>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml

@@ -5,8 +5,8 @@
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
-    <name>AIO - SDK 4.8</name>
+    <name>AIO - SDK 4.9</name>
-    <description>All-In-One (AIO) project for SDK 4.8</description>
+    <description>All-In-One (AIO) project for SDK 4.9</description>
     <packaging>pom</packaging>
 
     <prerequisites>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat

@@ -83,37 +83,37 @@ EXIT /B %ERRORLEVEL%
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
 EXIT /B 0
 :start_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
 EXIT /B 0
 :start_acs
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs
 EXIT /B 0
 :down
     if exist "%COMPOSE_FILE_PATH%" (
-        docker-compose -f "%COMPOSE_FILE_PATH%" down
+        docker compose -f "%COMPOSE_FILE_PATH%" down
     )
 EXIT /B 0
 :build
 	call %MVN_EXEC% clean package
 EXIT /B 0
 :build_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
-    docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
 	call %MVN_EXEC% clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker
 EXIT /B 0
 :build_acs
-    docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs
+    docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs
-    docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs
+    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs
 	call %MVN_EXEC% clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker
 EXIT /B 0
 :tail
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
+    docker compose -f "%COMPOSE_FILE_PATH%" logs -f
 EXIT /B 0
 :tail_all
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
 EXIT /B 0
 :prepare-test
     call %MVN_EXEC% verify -DskipTests=true -pl ${rootArtifactId}-platform,${rootArtifactId}-integration-tests,${rootArtifactId}-platform-docker

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh

@@ -13,20 +13,20 @@ start() {
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
 }
 
 start_share() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
 }
 
 start_acs() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-acs
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-acs
 }
 
 down() {
     if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
-        docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
+        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
     fi
 }
 
@@ -41,23 +41,23 @@ build() {
 }
 
 build_share() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
-    yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
+    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
     ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-share,${rootArtifactId}-share-docker
 }
 
 build_acs() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-acs
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-acs
-    yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-acs
+    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-acs
     ${symbol_dollar}MVN_EXEC clean package -pl ${rootArtifactId}-integration-tests,${rootArtifactId}-platform,${rootArtifactId}-platform-docker
 }
 
 tail() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
 }
 
 tail_all() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
 }
 
 prepare_test() {

archetypes/alfresco-platform-jar-archetype/pom.xml

@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/README.md

@@ -1,6 +1,6 @@
-# Alfresco ACS JAR Module - SDK 4.8
+# Alfresco ACS JAR Module - SDK 4.9
 
-This is an ACS project for Alfresco SDK 4.8.
+This is an ACS project for Alfresco SDK 4.9.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat

@@ -71,21 +71,21 @@ EXIT /B %ERRORLEVEL%
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
 EXIT /B 0
 :down
     if exist "%COMPOSE_FILE_PATH%" (
-        docker-compose -f "%COMPOSE_FILE_PATH%" down
+        docker compose -f "%COMPOSE_FILE_PATH%" down
     )
 EXIT /B 0
 :build
 	call %MVN_EXEC% clean package
 EXIT /B 0
 :tail
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
+    docker compose -f "%COMPOSE_FILE_PATH%" logs -f
 EXIT /B 0
 :tail_all
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
 EXIT /B 0
 :prepare_test
     call %MVN_EXEC% verify -DskipTests=true

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.sh

@@ -13,12 +13,12 @@ start() {
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
 }
 
 down() {
     if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
-        docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
+        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
     fi
 }
 
@@ -33,11 +33,11 @@ build() {
 }
 
 tail() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
 }
 
 tail_all() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
 }
 
 prepare_test() {

archetypes/alfresco-share-jar-archetype/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.9.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/README.md

@@ -1,6 +1,6 @@
-# Alfresco Share JAR Module - SDK 4.8
+# Alfresco Share JAR Module - SDK 4.9
 
-This is a Share project for Alfresco SDK 4.8.
+This is a Share project for Alfresco SDK 4.9.
 
 Run with `./run.sh build_start` or `./run.bat build_start` and verify that it
 

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.bat

@@ -55,29 +55,29 @@ EXIT /B %ERRORLEVEL%
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d
 EXIT /B 0
 :start_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-share
 EXIT /B 0
 :down
     if exist "%COMPOSE_FILE_PATH%" (
-        docker-compose -f "%COMPOSE_FILE_PATH%" down
+        docker compose -f "%COMPOSE_FILE_PATH%" down
     )
 EXIT /B 0
 :build
 	call %MVN_EXEC% clean package
 EXIT /B 0
 :build_share
-    docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
-    docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
+    docker compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
 	call %MVN_EXEC% clean package
 EXIT /B 0
 :tail
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs -f
+    docker compose -f "%COMPOSE_FILE_PATH%" logs -f
 EXIT /B 0
 :tail_all
-    docker-compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
+    docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all"
 EXIT /B 0
 :purge
     docker volume rm -f ${rootArtifactId}-acs-volume

archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/run.sh

@@ -13,16 +13,16 @@ start() {
     docker volume create ${rootArtifactId}-acs-volume
     docker volume create ${rootArtifactId}-db-volume
     docker volume create ${rootArtifactId}-ass-volume
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d
 }
 
 start_share() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" up --build -d ${rootArtifactId}-share
 }
 
 down() {
     if [ -f "${symbol_dollar}COMPOSE_FILE_PATH" ]; then
-        docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
+        docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" down
     fi
 }
 
@@ -37,17 +37,17 @@ build() {
 }
 
 build_share() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" kill ${rootArtifactId}-share
-    yes | docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
+    yes | docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" rm -f ${rootArtifactId}-share
     ${symbol_dollar}MVN_EXEC clean package
 }
 
 tail() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs -f
 }
 
 tail_all() {
-    docker-compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
+    docker compose -f "${symbol_dollar}COMPOSE_FILE_PATH" logs --tail="all"
 }
 
 case "${symbol_dollar}1" in

archetypes/archetypes-it/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.9.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

docs/README.md

@@ -1,7 +1,7 @@
 ---
-Title: Alfresco SDK 4.8
+Title: Alfresco SDK 4.9
 Added: v3.0.0
-Last reviewed: 2024-03-05
+Last reviewed: 2024-08-30
 ---
 # Alfresco SDK 4
 
@@ -18,7 +18,7 @@ Alfresco SDK 4.x is released under [Apache License version 2.0](http://www.apach
 in Community Edition and Enterprise Edition. If you're an Enterprise customer, please check the [Alfresco SDK Support status](https://www.alfresco.com/alfresco-product-support-status) 
 for the version you're using. If your version is in Limited or Full Support and you need help, contact our Support team [http://support.alfresco.com](http://support.alfresco.com/).
 
-Alfresco SDK 4.8 is a minor update to the SDK and provides support for Alfresco 23.2.x.
+Alfresco SDK 4.9 is a minor update to the SDK and provides support for Alfresco 23.3.x.
 
 The 4.0 release takes advantage of Semantic Versioning ([SEMVER](http://semver.org/)), which means that this new release is not directly compatible with the 
 previous releases of the SDK.

docs/getting-started.md

@@ -82,8 +82,8 @@ install it separately after you've installed Docker.
 4. Verify the installation of Docker Compose.
 
 ```
-$ docker-compose -v
+$ docker compose version
-docker-compose version 1.22.0, build f46880f
+Docker Compose version v2.28.1-desktop.1
 ```
 
 ## Generate your project from the archetypes
@@ -118,7 +118,7 @@ Choose archetype:
 * `org.alfresco.maven.archetype:alfresco-platform-jar-archetype`
 * `org.alfresco.maven.archetype:alfresco-share-jar-archetype`
 
-3. Choose the latest version, such as 4.8.0.
+3. Choose the latest version, such as 4.9.0.
 
 ```
 Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version:
@@ -143,6 +143,7 @@ Choose org.alfresco.maven.archetype:alfresco-allinone-archetype version:
 19: 4.6.0
 20: 4.7.0
 21: 4.8.0
+22: 4.9.0
 ```
 
 4. Next you will be prompted for additional values, like groupId, artifactId, and package, as shown below:
@@ -171,7 +172,7 @@ If everything has been configured correctly, you should see something similar to
 
 ```
 [INFO] ----------------------------------------------------------------------------
-[INFO] Using following parameters for creating project from Archetype: alfresco-allinone-archetype:4.8.0
+[INFO] Using following parameters for creating project from Archetype: alfresco-allinone-archetype:4.9.0
 [INFO] ----------------------------------------------------------------------------
 [INFO] Parameter: groupId, Value: com.acme
 [INFO] Parameter: artifactId, Value: my-all-in-one

docs/whats-new.md

@@ -10,7 +10,7 @@ Alfresco Share 6.
 
 This was a mayor release oriented to support Alfresco 6, so it is not compatible with previous versions of the SDK.
 
-Alfresco SDK 4.8 extends the support to Alfresco 23.2. 
+Alfresco SDK 4.9 extends the support to Alfresco 23.3. 
 Use an older SDK version for Alfresco 6. 
 
 ## Embracing containers and Docker
@@ -64,13 +64,13 @@ environment can be more similar to a real one, including whatever other service
 
 Alfresco SDK 4.1 provides support for Alfresco 6.2.x.
 
-## Support for Alfresco 7.0.x, 7.1.x, 7.2.x, 7.3.x, 7.4.x. 23.1.x and 23.2.x
+## Support for Alfresco 7.0.x, 7.1.x, 7.2.x, 7.3.x, 7.4.x. 23.1.x, 23.2.x and 23.3.x
 
-Alfresco SDK 4.8 provides support for Alfresco 7.0.x, 7.1.x, 7.2.x, 7.3.x, 7.4.x, 23.1.x and 23.2.x.
+Alfresco SDK 4.9 provides support for Alfresco 7.0.x, 7.1.x, 7.2.x, 7.3.x, 7.4.x, 23.1.x, 23.2.x and 23.3.x.
 
 ## Support for Java 17
 [Java 17](https://openjdk.java.net/projects/jdk/17/) is the latest stable long term (8 year support) version after Java 11. Alfresco 7.3.x already offers
 support for this version of the Java platform.
 
-Alfresco SDK 4.5 has been modified to add support for Java 17 as well. This way, if you're working as a developer in customisations for Alfresco 7.3.x or 7.4.x , 23.1.x or 23.2.x you can
+Alfresco SDK 4.9 has been modified to add support for Java 17 as well. This way, if you're working as a developer in customisations for Alfresco 7.3.x or 7.4.x , 23.1.x, 23.2.x or 23.3.x you can
-now use SDK 4.5 (or greater) + JDK 17 to work on them. The Apache Maven plugins included in the archetypes has been updated to avoid any issue with Java 17.
+now use SDK 4.9 (or greater) + JDK 17 to work on them. The Apache Maven plugins included in the archetypes has been updated to avoid any issue with Java 17.

docs/working-with-generated-projects/working-with-aio.md

@@ -78,7 +78,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start
 [INFO] ------------------------------------------------------------------------
 [INFO] Reactor Build Order:
 [INFO]
-[INFO] AIO - SDK 4.8
+[INFO] AIO - SDK 4.9
 [INFO] Alfresco Platform/Repository JAR Module
 [INFO] Alfresco Share JAR Module
 [INFO] Integration Tests Module
@@ -88,7 +88,7 @@ my-all-in-one-project mbergljung$ ./run.sh build_start
 [INFO] ------------------------------------------------------------------------
 [INFO] Reactor Summary:
 [INFO]
-[INFO] AIO - SDK 4.8 ...................................... SUCCESS [  0.680 s]
+[INFO] AIO - SDK 4.9 ...................................... SUCCESS [  0.680 s]
 [INFO] Alfresco Platform/Repository JAR Module ............ SUCCESS [  5.461 s]
 [INFO] Alfresco Share JAR Module .......................... SUCCESS [  0.557 s]
 [INFO] Integration Tests Module ........................... SUCCESS [  0.900 s]

modules/alfresco-rad/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.9.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>3.2.17.RELEASE</version>
         </dependency>
 
         <!-- Access to JUnit runner classes -->

plugins/alfresco-maven-plugin/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco.maven</groupId>
         <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>4.9.0-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-archiver</artifactId>
-            <version>3.1.1</version>
+            <version>3.6.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>maven-core</artifactId>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-archiver</artifactId>
-            <version>4.9.2</version>
+            <version>4.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -112,7 +112,12 @@
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
-            <version>3.6</version>
+            <version>3.10.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.17.1</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alfresco.maven</groupId>
     <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>4.9.0-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <name>Alfresco SDK</name>
     <description>This aggregator Project builds all modules required for the Alfresco SDK</description>
     <packaging>pom</packaging>
@@ -30,7 +30,7 @@
         <connection>scm:git:${scm.url.base}.git</connection>
         <developerConnection>scm:git:${scm.url.base}</developerConnection>
         <url>${scm.url.base}</url>
-        <tag>alfresco-sdk-aggregator-4.8.0</tag>
+        <tag>alfresco-sdk-aggregator-4.9.0</tag>
     </scm>
 
     <!-- All the modules of the Alfresco SDK -->
@@ -56,9 +56,9 @@
         <alfresco.sdk.tests.exclude>*/*-enterprise*/*</alfresco.sdk.tests.exclude>
 
         <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
-        <alfresco.platform.version>23.2.1</alfresco.platform.version>
+        <alfresco.platform.version>23.4.0-A12</alfresco.platform.version>
         <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
-        <alfresco.share.docker.version>23.2.1</alfresco.share.docker.version>
+        <alfresco.share.docker.version>23.4.0-A12</alfresco.share.docker.version>
         <!--
              The following value is now obtained by looking at the
              - alfresco-community-share.version (eg. https://github.com/Alfresco/acs-community-packaging/blob/23.2.1/pom.xml#L17)
@@ -66,7 +66,7 @@
              - alfresco-enterprise-share.version (eg. https://github.com/Alfresco/acs-packaging/blob/23.2.1/pom.xml#L18)
              for the GitHub Tag related to the above Docker version.
          -->
-        <alfresco.share.version>23.2.0.72</alfresco.share.version>
+        <alfresco.share.version>23.3.0.85</alfresco.share.version>
         <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
         <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
         <keystore.settings>
@@ -94,32 +94,6 @@
             </distributionManagement>
         </profile>
 
-        <!-- 7.0 -->
-        <profile>
-            <id>community-70-tests</id>
-            <properties>
-                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>7.0.1-A7</alfresco.platform.version>
-                <alfresco.share.docker.version>7.0.1.3</alfresco.share.docker.version>
-                <alfresco.share.version>7.0.1.3</alfresco.share.version>
-                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
-                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
-                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
-            </properties>
-        </profile>
-        <profile>
-            <id>enterprise-70-tests</id>
-            <properties>
-                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>7.0.1.7</alfresco.platform.version>
-                <alfresco.share.docker.version>7.0.1.3</alfresco.share.docker.version>
-                <alfresco.share.version>7.0.1.3</alfresco.share.version>
-                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
-                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
-                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
-            </properties>
-        </profile>
-
         <!-- 7.1 -->
         <profile>
             <id>community-71-tests</id>
@@ -276,6 +250,32 @@
             </properties>
         </profile>
 
+        <!-- 23.3 -->
+        <profile>
+            <id>community-233-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.3.0</alfresco.platform.version>
+                <alfresco.share.docker.version>23.3.0</alfresco.share.docker.version>
+                <alfresco.share.version>23.3.0.85</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-233-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>23.3.0</alfresco.platform.version>
+                <alfresco.share.docker.version>23.3.0</alfresco.share.docker.version>
+                <alfresco.share.version>23.3.0.85</alfresco.share.version>
+                <alfresco.platform.docker.image>quay.io/alfresco/alfresco-content-repository</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>quay.io/alfresco/alfresco-share</alfresco.share.docker.image>
+                <alfresco.platform.docker.user>alfresco</alfresco.platform.docker.user>
+            </properties>
+        </profile>
+
         <profile>
             <id>sdk-release</id>
             <properties>
@@ -496,8 +496,8 @@
 
     <distributionManagement>
         <repository>
-            <id>central-releases-staging</id>
+            <id>alfresco-public</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
         </repository>
         <snapshotRepository>
             <id>alfresco-public-snapshots</id>