Test 7.4.0-DEV1

Update upstream versions
    - alfresco-community-repo:   20.50
    - alfresco-enterprise-share: 20.35
    - acs-packaging:             7.4.0-DEV1
    - RELEASE_VERSION:
    - DEVELOPMENT_VERSION:

.github/dependabot.yml

@@ -28,6 +28,13 @@ updates:
   - dependency-name: org.alfresco.tas:alfresco-community-repo-integration-test:tests
   - dependency-name: org.alfresco.tas:alfresco-community-repo-email-test:tests
   - dependency-name: org.alfresco.tas:alfresco-community-repo-cmis-test:tests
+# Used in dev env - Currently using 7.0.86 but have tried higher versions
+  - dependency-name: org.apache.tomcat.embed
+    versions:
+    - "> 7.0.109"
+  - dependency-name: org.apache.tomcat
+    versions:
+    - "> 7.0.109"
 # Upstream alfresco-enterprise-share artifacts
   - dependency-name: org.alfresco:share:classes
   - dependency-name: org.alfresco:alfresco-wcmqs-web:classes
@@ -36,6 +43,18 @@ updates:
   - dependency-name: org.alfresco:alfresco-content-services-share-distribution
   - dependency-name: org.alfresco:alfresco-share-services
 # Others
+  - dependency-name: io.fabric8:fabric8-maven-plugin
+    versions:
+    - "> 4.4.1"
+  - dependency-name: org.alfresco:api-explorer
+    versions:
+    - "> 6.1.0, < 6.2"
+  - dependency-name: org.alfresco.integrations:alfresco-googledocs-repo-community
+    versions:
+    - "> 3.1.0"
+  - dependency-name: org.alfresco.integrations:alfresco-googledocs-share-community
+    versions:
+    - "> 3.1.0"
   - dependency-name: org.apache.maven.plugins:maven-war-plugin
     versions:
     - ">= 3.a, < 4"

.github/workflows/ci.yml

@@ -1,251 +1,5 @@
 name: ACS Community Packaging CI
 
-on:
-  pull_request:
-    branches:
-      - master
-      - release/**
-      - feature/**
-      - fix/**
-  push:
-    branches:
-      - master
-      - release/**
-      - feature/**
-      - fix/**
-  workflow_dispatch:
-
 env:
-  GIT_USERNAME: ${{ secrets.BOT_GITHUB_USERNAME }}
-  GIT_EMAIL: ${{ secrets.BOT_GITHUB_EMAIL }}
-  GIT_PASSWORD: ${{ secrets.BOT_GITHUB_TOKEN }}
-  DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-  DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-  GITHUB_ACTIONS_DEPLOY_TIMEOUT: 60
-  MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-  MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
-  QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
-  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 (23.2.0-....) for the docker image to build successfully.
-  RELEASE_VERSION: 23.2.0
-  DEVELOPMENT_VERSION: 23.2.1-SNAPSHOT
-
-jobs:
-  tas_tests:
-    name: ${{ matrix.testSuite }} TAS tests
-    runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, '[skip tas]') && !contains(github.event.head_commit.message, '[skip tests]') }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - testSuite: REST API part1
-            pom: tests/tas-restapi/pom.xml
-            profiles: all-tas-tests,run-restapi-part1
-            compose-file: docker-compose-minimal+transforms.yml
-          - testSuite: REST API part2
-            pom: tests/tas-restapi/pom.xml
-            profiles: all-tas-tests,run-restapi-part2
-            compose-file: docker-compose-minimal+transforms.yml
-          - testSuite: REST API part3
-            pom: tests/tas-restapi/pom.xml
-            profiles: all-tas-tests,run-restapi-part3
-            compose-file: docker-compose-minimal+transforms.yml
-          - testSuite: CMIS (BROWSER binding)
-            pom: tests/tas-cmis/pom.xml
-            profiles: all-tas-tests,run-cmis-browser
-            compose-file: docker-compose-minimal+transforms.yml
-          - testSuite: CMIS (ATOM binding)
-            pom: tests/tas-cmis/pom.xml
-            profiles: all-tas-tests,run-cmis-atom
-            compose-file: docker-compose-minimal+transforms.yml
-          - testSuite: CMIS (WEBSERVICES binding)
-            pom: tests/tas-cmis/pom.xml
-            profiles: all-tas-tests,run-cmis-webservices
-            compose-file: docker-compose-minimal+transforms.yml
-          - testSuite: Email
-            pom: tests/tas-email/pom.xml
-            profiles: all-tas-tests
-            compose-file: docker-compose-minimal.yml
-          - testSuite: WebDAV
-            pom: tests/tas-webdav/pom.xml
-            profiles: all-tas-tests
-            compose-file: docker-compose-minimal.yml
-          - testSuite: Integration
-            pom: tests/tas-integration/pom.xml
-            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
-      - name: "Init"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh
-      - name: "Setup the environment"
-        run: |
-          ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/${{ matrix.compose-file }}
-          ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
-      - name: "Test"
-        run: mvn -B install -ntp -f ${{ matrix.pom }} -P${{ matrix.profiles }} -Denvironment=default -DrunBugs=false
-      - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
-
-  community_zip_tests:
-    name: Community Distribution Zip content tests
-    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
-      - name: "Init"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh
-      - name: "Build"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: mvn -B -ntp -V clean install -Pags -DskipTests -Dmaven.javadoc.skip=true
-      - name: "Test"
-        run: mvn -B install -ntp -f tests/tas-distribution-zip/pom.xml -Prun-distribution-zip-contents-check -DrunBugs=false
-      - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
-
-  community_test_tomcat_deployment:
-    name: "Test Tomcat deployment"
-    runs-on: ubuntu-latest
-    if: >
-      !contains(github.event.head_commit.message, '[skip tests]')
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.35.2
-      - name: "Build"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh
-      - name: "Set up the environment"
-        run: |
-          ${TAS_SCRIPTS}/start-compose.sh ./dev/docker-compose.yml
-          ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8983/solr"
-      - name: "Run tomcat, verify it starts"
-        id: tests
-        run: |
-          (mvn clean install -Prun -rf dev &)
-          ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8080/alfresco/"
-          echo "Test Alfresco Repository availability"
-          curl -Ls -o /dev/null --fail "http://localhost:8080/alfresco"
-          echo "Test Share availability"
-          curl -Ls -o /dev/null --fail "http://localhost:8080/share"
-
-  docker_latest:
-    name: Update latest Docker images
-    runs-on: ubuntu-latest
-    needs: [tas_tests, community_zip_tests]
-    if: >
-      !(failure() || cancelled()) &&
-      !contains(github.event.head_commit.message, '[skip docker_latest]') && 
-      (github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
-      github.event_name != 'pull_request'
-    services:
-      registry:
-        image: registry:2
-        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/free-hosted-runner-disk-space@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: "Init"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh -m
-      - name: "Push Docker images"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: mvn -B -ntp -V clean install -DskipTests -Dmaven.javadoc.skip=true -Pags -Ppush-docker-images
-      - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
-
-  release:
-    name: Release and Copy to S3 Staging Bucket
-    runs-on: ubuntu-latest
-    needs: [docker_latest]
-    if: >
-      !(failure() || cancelled()) &&
-      contains(github.event.head_commit.message, '[release]') &&
-      (github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
-      github.event_name != 'pull_request'
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          persist-credentials: false
-      - 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@v1.35.2
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: "Init"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh -m
-      - name: "Release"
-        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
-        run: |
-          bash scripts/ci/verify_release_tag.sh
-          bash scripts/ci/maven_release.sh
-          source scripts/ci/prepare_staging_deploy.sh
-      - name: "Clean Maven cache"
-        run: bash ./scripts/ci/cleanup_cache.sh
-      - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_S3_STAGING_ACCESS_KEY }}
-          aws-secret-access-key: ${{ secrets.AWS_S3_STAGING_SECRET_KEY }}
-          aws-region: eu-west-1
-      - name: "Deploy to S3 Staging Bucket"
-        run: |
-          aws s3 cp --acl private --recursive ./deploy_dir s3://alfresco-artefacts-staging/alfresco-content-services-community/release/${BRANCH_NAME}/${BUILD_NUMBER}
-          aws s3 cp --acl private --recursive ./deploy_dir_ags s3://alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}
-          echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/alfresco-content-services-community/release/${BRANCH_NAME}/${BUILD_NUMBER}"
-
-  publish:
-    name: Copy to S3 Release Bucket
-    runs-on: ubuntu-latest
-    needs: [release]
-    if: >
-      !(failure() || cancelled()) &&
-      contains(github.event.head_commit.message, '[publish]') &&
-      (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
-      - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_S3_RELEASE_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_S3_RELEASE_SECRET_ACCESS_KEY }}
-          aws-region: eu-west-1
-      - name: "Deploy to S3 Release Bucket"
-        run: |
-          bash scripts/ci/copy_to_release_bucket.sh
-          bash scripts/ci/copy_ags_to_release_bucket.sh
+  RELEASE_VERSION: 7.4.0-A8
+  DEVELOPMENT_VERSION: 7.4.0-A9-SNAPSHOT

.travis.yml

@@ -0,0 +1,174 @@
+---
+dist: xenial
+language: java
+jdk: openjdk17
+
+services:
+  - docker
+
+git:
+  depth: false
+  quiet: true
+
+cache:
+  directories:
+    - ${HOME}/.m2/repository
+
+# the cache can grow constantly
+before_cache: bash scripts/travis/cleanup_cache.sh
+
+branches:
+  only:
+    - none
+
+env:
+  global:
+    - TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
+    - TAS_ENVIRONMENT=./tests/environment
+    # Release version has to start with real version (7.4.0-....) for the docker image to build successfully.
+    - RELEASE_VERSION=7.4.0-A8
+    - DEVELOPMENT_VERSION=7.4.0-A9-SNAPSHOT
+
+stages:
+  - name: test
+    if: commit_message !~ /\[skip tests\]/
+  - name: docker_latest
+    if: commit_message !~ /\[skip docker_latest\]/ AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND fork = false
+  - name: release
+    if: commit_message =~ /\[release\]/ AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND fork = false
+  - name: publish
+    if: commit_message =~ /\[publish\]/ AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND fork = false
+
+before_install: travis_retry bash scripts/travis/init.sh
+install: travis_retry travis_wait 40 bash scripts/travis/build.sh
+
+jobs:
+  include:
+    - name: "REST API TAS tests part1"
+      if: commit_message !~ /\[skip tas\]/
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 60 mvn -B install -ntp -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false
+
+    - name: "REST API TAS tests part2"
+      if: commit_message !~ /\[skip tas\]/
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 60 mvn -B install -ntp -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false
+
+    - name: "REST API TAS tests part3"
+      if: commit_message !~ /\[skip tas\]/
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 60 mvn -B install -ntp -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false
+
+    - name: "CMIS TAS tests - BROWSER binding"
+      if: commit_message !~ /\[skip tas\]/
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 40 mvn -B install -ntp -f tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-browser -Denvironment=default -DrunBugs=false
+
+    - name: "CMIS TAS tests - ATOM binding"
+      if: commit_message !~ /\[skip tas\]/
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 40 mvn -B install -ntp -f tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-atom -Denvironment=default -DrunBugs=false
+
+    - name: "CMIS TAS tests - WEBSERVICES binding"
+      if: commit_message !~ /\[skip tas\]/
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal+transforms.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 40 mvn -B install -ntp -f tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-webservices -Denvironment=default -DrunBugs=false
+
+    - name: "Email TAS tests"
+      if: commit_message !~ /\[skip tas\]/
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 30 mvn -B install -ntp -f tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+
+    - name: "WebDAV TAS tests"
+      if: commit_message !~ /\[skip tas\]/
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 20 mvn -B install -ntp -f tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+
+    - name: "Integration TAS tests"
+      if: commit_message !~ /\[skip tas\]/
+      before_script:
+        - ${TAS_SCRIPTS}/start-compose.sh ${TAS_ENVIRONMENT}/docker-compose-minimal.yml
+        - ${TAS_SCRIPTS}/wait-for-alfresco-start.sh "http://localhost:8082/alfresco"
+      script:
+        - travis_wait 30 mvn -B install -ntp -f tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
+
+    - name: "Community Distribution Zip content tests"
+      before_script:
+        - travis_retry travis_wait 20 mvn -B -ntp -V clean install -Pags -DskipTests -Dmaven.javadoc.skip=true
+      script:
+        - travis_wait 20 mvn -B install -ntp -f tests/tas-distribution-zip/pom.xml -Prun-distribution-zip-contents-check -DrunBugs=false
+
+    - name: "Update latest images"
+      stage: docker_latest
+      script: travis_retry travis_wait 30 mvn -B -ntp -V clean install -DskipTests -Dmaven.javadoc.skip=true -Pags -Ppush-docker-images
+
+    - name: "Release and Copy to S3 Staging Bucket"
+      stage: release
+      before_script: bash scripts/travis/verify_release_tag.sh
+      script: travis_wait 60 bash scripts/travis/maven_release.sh
+      before_deploy: source scripts/travis/prepare_staging_deploy.sh
+      deploy:
+        - provider: s3
+          access_key_id: "${AWS_STAGING_ACCESS_KEY}"
+          secret_access_key: "${AWS_STAGING_SECRET_KEY}"
+          bucket: "alfresco-artefacts-staging"
+          region: "eu-west-1"
+          skip_cleanup: true
+          acl: private
+          local_dir: "deploy_dir"
+          upload_dir: "alfresco-content-services-community/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}"
+          on:
+            all_branches: true
+        - provider: s3
+          access_key_id: "${AWS_STAGING_ACCESS_KEY}"
+          secret_access_key: "${AWS_STAGING_SECRET_KEY}"
+          bucket: "alfresco-artefacts-staging"
+          region: "eu-west-1"
+          skip_cleanup: true
+          acl: private
+          local_dir: "deploy_dir_ags"
+          upload_dir: "community/RM/${RELEASE_VERSION}"
+          on:
+            all_branches: true
+      after_deploy:
+        - echo "Finished release and deployed to https://s3.console.aws.amazon.com/s3/buckets/alfresco-artefacts-staging/alfresco-content-services/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}"
+
+    - name: "Copy to S3 Release Bucket"
+      stage: publish
+      # Nothing to build/install as we are just copying from S3 buckets
+      install: skip
+      script: skip
+      before_deploy: pip install awscli
+      deploy:
+        - provider: script
+          script: bash scripts/travis/copy_to_release_bucket.sh
+          on:
+            all_branches: true
+        - provider: script
+          script: bash scripts/travis/copy_ags_to_release_bucket.sh
+          on:
+            all_branches: true

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

@@ -7,12 +7,13 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>23.2.0</version>
+        <version>7.4.0-A9-SNAPSHOT</version>
     </parent>
 
     <properties>
-        <dependency.sis.version>1.3</dependency.sis.version>
+        <dependency.sis.version>1.2</dependency.sis.version>
 
+        <tomcat.version>7.0.86</tomcat.version>
         <tomcat.default.solr6.port>8983</tomcat.default.solr6.port>
     </properties>
 
@@ -31,116 +32,180 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
-        <!-- Provided dependencies to satisfy Cargo requirement, but not include in built WAR -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-server-root</artifactId>
-            <version>${dependency.alfresco-server-root.version}</version>
-            <type>war</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>api-explorer</artifactId>
-            <version>${alfresco.api-explorer.version}</version>
-            <type>war</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>dev-community-share-amps-overlay</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>
         <finalName>alfresco</finalName>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven3-plugin</artifactId>
+                <artifactId>maven-war-plugin</artifactId>
                 <configuration>
-                    <container>
-                        <containerId>tomcat10x</containerId>
-                        <type>embedded</type>
-                        <log>target/cargo.log</log>
-                        <systemProperties>
-                            <cargo.tomcat.ajp.port>-1</cargo.tomcat.ajp.port>
-
-                            <index.subsystem.name>solr6</index.subsystem.name>
-                            <solr.port>${tomcat.default.solr6.port}</solr.port>
-                            <dir.root>${runtime.data.folder}/alf_data</dir.root>
-                            <solr.host>localhost</solr.host>
-                            <solr.base.url>/solr</solr.base.url>
-                            <solr.secureComms>secret</solr.secureComms>
-                            <solr.sharedSecret>secret</solr.sharedSecret>
-                            <encryption.keystore.type>pkcs12</encryption.keystore.type>
-                            <encryption.cipherAlgorithm>AES/CBC/PKCS5Padding</encryption.cipherAlgorithm>
-                            <encryption.keyAlgorithm>AES</encryption.keyAlgorithm>
-                            <metadata-keystore.password>mp6yc0UD9e</metadata-keystore.password>
-                            <metadata-keystore.aliases>metadata</metadata-keystore.aliases>
-                            <metadata-keystore.metadata.password>mp6yc0UD9e</metadata-keystore.metadata.password>
-                            <metadata-keystore.metadata.algorithm>AES</metadata-keystore.metadata.algorithm>
-                        </systemProperties>
-                    </container>
-                    <configuration>
-                        <configfiles>
-                            <configfile>
-                                <file>${runtime.tomcat.conf.folder}/alfresco-context.xml</file>
-                                <todir>conf</todir>
-                                <tofile>context.xml</tofile>
-                            </configfile>
-                            <configfile>
-                                <file>${runtime.tomcat.conf.folder}/tomcat-users.xml</file>
-                                <todir>conf</todir>
-                                <tofile>tomcat-users.xml</tofile>
-                            </configfile>
-                        </configfiles>
-                        <files>
-                            <file>
-                                <file>${runtime.tomcat.conf.folder}/shared</file>
-                                <todir>shared</todir>
-                            </file>
-                        </files>
-                    </configuration>
-                    <deployables>
-                        <deployable>
+                    <overlays>
+                        <overlay>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>dev-community-repo-amps-overlay</artifactId>
+                            <type>war</type>
+                        </overlay>
+                    </overlays>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>prepare-exploded-war</id>
+                        <goals>
+                            <goal>exploded</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <systemProperties>
+                        <index.subsystem.name>solr6</index.subsystem.name>
+                        <solr.port>${tomcat.default.solr6.port}</solr.port>
+                        <dir.root>${runtime.data.folder}/alf_data</dir.root>
+                        <solr.host>localhost</solr.host>
+                        <solr.base.url>/solr</solr.base.url>
+                        <solr.secureComms>secret</solr.secureComms>
+                        <solr.sharedSecret>secret</solr.sharedSecret>
+                        <encryption.keystore.type>pkcs12</encryption.keystore.type>
+                        <encryption.cipherAlgorithm>AES/CBC/PKCS5Padding</encryption.cipherAlgorithm>
+                        <encryption.keyAlgorithm>AES</encryption.keyAlgorithm>
+                        <metadata-keystore.password>mp6yc0UD9e</metadata-keystore.password>
+                        <metadata-keystore.aliases>metadata</metadata-keystore.aliases>
+                        <metadata-keystore.metadata.password>mp6yc0UD9e</metadata-keystore.metadata.password>
+                        <metadata-keystore.metadata.algorithm>AES</metadata-keystore.metadata.algorithm>
+                    </systemProperties>
+                    <delegate>false</delegate>
+                    <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
+                    <contextFile>${runtime.tomcat.conf.folder}/alfresco-context.xml</contextFile>
+                    <tomcatUsers>${runtime.tomcat.conf.folder}/tomcat-users.xml</tomcatUsers>
+                    <webapps>
+                        <webapp>
                             <groupId>org.alfresco</groupId>
                             <artifactId>alfresco-server-root</artifactId>
+                            <version>${dependency.alfresco-server-root.version}</version>
+                            <contextPath>/</contextPath>
                             <type>war</type>
-                            <properties>
-                                <context>/</context>
-                            </properties>
-                        </deployable>
-                        <deployable>
+                            <asWebapp>true</asWebapp>
+                            <!-- Workaround for https://issues.apache.org/jira/browse/MTOMCAT-269 -->
+                            <!-- tomcat7-maven-plugin does not pick up the context.xml file from META-INF -->
+                            <contextFile>
+                                ${project.build.directory}/tomcat/webapps/alfresco-server-root/META-INF/context.xml
+                            </contextFile>
+                        </webapp>
+                        <webapp>
                             <groupId>org.alfresco</groupId>
                             <artifactId>api-explorer</artifactId>
+                            <version>${alfresco.api-explorer.version}</version>
+                            <contextPath>/api-explorer</contextPath>
                             <type>war</type>
-                            <properties>
-                                <context>/api-explorer</context>
-                            </properties>
-                        </deployable>
-                        <deployable>
+                            <asWebapp>true</asWebapp>
+                        </webapp>
+                        <webapp>
                             <groupId>org.alfresco</groupId>
                             <artifactId>dev-community-share-amps-overlay</artifactId>
+                            <contextPath>/share</contextPath>
+                            <version>${project.version}</version>
                             <type>war</type>
-                            <properties>
-                                <context>/share</context>
-                            </properties>
-                        </deployable>
-                        <deployable>
-                            <groupId>org.alfresco</groupId>
-                            <artifactId>dev-acs-community-amps-overlay</artifactId>
-                            <type>war</type>
-                            <properties>
-                                <context>/alfresco</context>
-                            </properties>
-                        </deployable>
-                    </deployables>
+                            <asWebapp>true</asWebapp>
+                        </webapp>
+                    </webapps>
                 </configuration>
                 <dependencies>
+                    <dependency>
+                        <groupId>org.apache.tomcat.embed</groupId>
+                        <artifactId>tomcat-embed-core</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-util</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-coyote</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-api</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-jdbc</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-dbcp</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-servlet-api</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-jsp-api</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-jasper</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-jasper-el</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-el-api</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-catalina</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-tribes</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-catalina-ha</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-annotations-api</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat</groupId>
+                        <artifactId>tomcat-juli</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat.embed</groupId>
+                        <artifactId>tomcat-embed-logging-juli</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.tomcat.embed</groupId>
+                        <artifactId>tomcat-embed-logging-log4j</artifactId>
+                        <version>${tomcat.version}</version>
+                    </dependency>
                     <!-- Workaround required to make Share work after Tika upgrade -->
                     <dependency>
                         <groupId>org.apache.sis.core</groupId>
@@ -253,8 +318,8 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.codehaus.cargo</groupId>
-                        <artifactId>cargo-maven3-plugin</artifactId>
+                        <groupId>org.apache.tomcat.maven</groupId>
+                        <artifactId>tomcat7-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>run-exploded-webapp</id>

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

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

dev/dev-tomcat/src/main/tomcat/alfresco-context.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context>
-  <Resources cachingAllowed="true" cacheMaxSize="102400">
-    <PostResources className="org.apache.catalina.webresources.DirResourceSet"
-                   base="${catalina.home}/shared/classes"
-                   webAppMount="/WEB-INF/classes"/>
-  </Resources>
+<Context docBase="${project.build.directory}/${project.build.finalName}" path="/alfresco">
+  <Resources className="org.apache.naming.resources.VirtualDirContext"
+    extraResourcePaths="/=${project.build.directory}/${project.build.finalName}" />
+  <Loader searchVirtualFirst="true"
+    className="org.apache.catalina.loader.VirtualWebappLoader"
+    virtualClasspath="${project.build.outputDirectory};${runtime.tomcat.conf.folder}/shared/classes" />
 </Context>

dev/dev-tomcat/src/main/tomcat/solr-context.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context crossContext="true">
+   <Environment name="solr/home"        type="java.lang.String" value="${solr.solr.home}" override="true"/>
+   <Environment name="solr/model/dir"   type="java.lang.String" value="${solr.solr.model.dir}" override="true"/>
+   <Environment name="solr/content/dir" type="java.lang.String" value="${solr.solr.content.dir}" override="true"/>
+  
+   <Resources className="org.apache.naming.resources.VirtualDirContext"
+    extraResourcePaths="/=${project.build.directory}/tomcat/webapps/alfresco-solr4" />
+   <Loader searchVirtualFirst="true"
+    className="org.apache.catalina.loader.VirtualWebappLoader"
+    virtualClasspath="${project.build.directory}/tomcat/webapps/alfresco-solr4/WEB-INF/classes" />
+   
+</Context>

dev/docker-compose.yml

@@ -14,7 +14,7 @@ services:
             - 8090:8090
 
     postgres:
-        image: postgres:15.4
+        image: postgres:14.4
         mem_limit: 512m
         environment:
             - POSTGRES_PASSWORD=alfresco
@@ -29,10 +29,10 @@ services:
         mem_limit: 2g
         environment:
             #Solr needs to know how to register itself with Alfresco
-            SOLR_ALFRESCO_HOST: "host.docker.internal"
+            SOLR_ALFRESCO_HOST: "alfresco"
             SOLR_ALFRESCO_PORT: "8080"
             #Alfresco needs to know how to call solr
-            SOLR_SOLR_HOST: "localhost"
+            SOLR_SOLR_HOST: "solr6"
             SOLR_SOLR_PORT: "8983"
             #Create the default alfresco and archive cores
             SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
@@ -44,10 +44,10 @@ services:
               "
             SOLR_JAVA_MEM: "-Xms2g -Xmx2g"
         ports:
-            - 8983:8983 #Browser port
+            - 8083:8983 #Browser port
 
     activemq:
-        image: alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8
+        image: alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
         mem_limit: 1g
         ports:
             - 8161:8161 # Web Console

dev/pom.xml

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

distribution-ags/pom.xml

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

distribution/pom.xml

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

docker-alfresco/Dockerfile

@@ -1,5 +1,4 @@
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
+FROM alfresco/alfresco-community-repo-base:${repo.image.tag}
 
 # Set default docker_context.
 ARG resource_path=target

docker-alfresco/ags/Dockerfile

@@ -1,4 +1,3 @@
-ARG BASE_IMAGE
 # BUILD STAGE AGS
 FROM debian:11-slim AS AGSBUILDER
 
@@ -13,7 +12,7 @@ RUN unzip -q /build/gs-api-explorer-*.war -d /build/gs-api-explorer && \
     chmod -R g-w,o= /build
 
 # ACTUAL IMAGE
-FROM ${BASE_IMAGE}
+FROM alfresco/alfresco-content-repository-community:${image.tag}
 
 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
 # The access will be fixed after all operations are done.

docker-alfresco/ags/pom.xml

@@ -8,13 +8,11 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>content-services-community-docker</artifactId>
-      <version>23.2.0</version>
+      <version>7.4.0-A9-SNAPSHOT</version>
    </parent>
 
    <properties>
       <image.name>alfresco/alfresco-governance-repository-community</image.name>
-      <base.image>alfresco/alfresco-content-repository-community:${image.tag}</base.image>
-      <scripts.directory>${project.parent.parent.basedir}/scripts/dev</scripts.directory>
    </properties>
 
    <build>

docker-alfresco/pom.xml

@@ -7,14 +7,12 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>23.2.0</version>
+        <version>7.4.0-A9-SNAPSHOT</version>
     </parent>
 
     <properties>
         <image.name>alfresco/alfresco-content-repository-community</image.name>
         <docker.quay-expires.value>NEVER</docker.quay-expires.value>
-        <base.image>alfresco/alfresco-community-repo-base:${repo.image.tag}</base.image>
-        <scripts.directory>${project.parent.basedir}/scripts/dev</scripts.directory>
     </properties>
 
     <build>
@@ -78,12 +76,6 @@
                             <images>
                                 <image>
                                     <name>${image.name}:${image.tag}</name>
-                                    <build>
-                                        <args>
-                                            <BASE_IMAGE>${base.image}</BASE_IMAGE>
-                                        </args>
-                                        <contextDir>${project.basedir}</contextDir>
-                                    </build>
                                 </image>
                             </images>
                         </configuration>
@@ -101,73 +93,6 @@
             </build>
         </profile>
 
-        <profile>
-            <id>build-multiarch-docker-images</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <name>${local.registry}/${image.name}:${image.tag}</name>
-                                    <build>
-                                        <buildx>
-                                            <builderName>${builder.name}</builderName>
-                                            <platforms>
-                                                <platform>linux/amd64</platform>
-                                                <platform>linux/arm64</platform>
-                                            </platforms>
-                                            <attestations>
-                                                <provenance>false</provenance>
-                                            </attestations>
-                                        </buildx>
-                                        <dockerFileDir>${project.basedir}</dockerFileDir>
-                                        <args>
-                                            <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
-                                        </args>
-                                    </build>
-                                </image>
-                            </images>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>build-push-image</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>build</goal>
-                                    <goal>push</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <executions>
-                            <execution>
-                                <id>prepare-buildx</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                                    <arguments>
-                                        <argument>${builder.name}</argument>
-                                        <argument>${image.registry}</argument>
-                                        <argument>${image.name}</argument>
-                                        <argument>${image.tag}</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>push-docker-images</id>
             <!-- publishes "image:latest" to Quay -->
@@ -180,23 +105,8 @@
                             <images>
                                 <!-- Quay image -->
                                 <image>
-                                    <name>${image.registry}/${image.name}:${image.tag}</name>
-                                    <build>
-                                        <buildx>
-                                            <builderName>${builder.name}</builderName>
-                                            <platforms>
-                                                <platform>linux/amd64</platform>
-                                                <platform>linux/arm64</platform>
-                                            </platforms>
-                                            <attestations>
-                                                <provenance>false</provenance>
-                                            </attestations>
-                                        </buildx>
-                                        <dockerFileDir>${project.basedir}</dockerFileDir>
-                                        <args>
-                                            <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
-                                        </args>
-                                    </build>
+                                    <name>${image.name}:${image.tag}</name>
+                                    <registry>${image.registry}</registry>
                                 </image>
                             </images>
                         </configuration>
@@ -211,28 +121,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <executions>
-                            <execution>
-                                <id>prepare-buildx</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                                    <arguments>
-                                        <argument>${builder.name}</argument>
-                                        <argument>${image.registry}</argument>
-                                        <argument>${image.name}</argument>
-                                        <argument>${image.tag}</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -254,22 +142,6 @@
                                         <!-- DockerHub image -->
                                         <image>
                                             <name>${image.name}:${project.version}</name>
-                                            <build>
-                                                <buildx>
-                                                    <builderName>${builder.name}</builderName>
-                                                    <platforms>
-                                                        <platform>linux/amd64</platform>
-                                                        <platform>linux/arm64</platform>
-                                                    </platforms>
-                                                    <attestations>
-                                                        <provenance>false</provenance>
-                                                    </attestations>
-                                                </buildx>
-                                                <dockerFileDir>${project.basedir}</dockerFileDir>
-                                                <args>
-                                                    <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
-                                                </args>
-                                            </build>
                                         </image>
                                     </images>
                                 </configuration>
@@ -285,23 +157,8 @@
                                     <images>
                                         <!-- Quay image -->
                                         <image>
-                                            <name>${image.registry}/${image.name}:${project.version}</name>
-                                            <build>
-                                                <buildx>
-                                                    <builderName>${builder.name}</builderName>
-                                                    <platforms>
-                                                        <platform>linux/amd64</platform>
-                                                        <platform>linux/arm64</platform>
-                                                    </platforms>
-                                                    <attestations>
-                                                        <provenance>false</provenance>
-                                                    </attestations>
-                                                </buildx>
-                                                <dockerFileDir>${project.basedir}</dockerFileDir>
-                                                <args>
-                                                    <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
-                                                </args>
-                                            </build>
+                                            <name>${image.name}:${project.version}</name>
+                                            <registry>${image.registry}</registry>
                                         </image>
                                     </images>
                                 </configuration>
@@ -312,28 +169,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <executions>
-                            <execution>
-                                <id>prepare-buildx</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                                    <arguments>
-                                        <argument>${builder.name}</argument>
-                                        <argument>${image.registry}</argument>
-                                        <argument>${image.name}</argument>
-                                        <argument>${image.tag}</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>

docker-share/ags/Dockerfile

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

docker-share/ags/pom.xml

@@ -8,14 +8,12 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>share-community-docker</artifactId>
-      <version>23.2.0</version>
+      <version>7.4.0-A9-SNAPSHOT</version>
    </parent>
 
    <properties>
       <image.name>alfresco/alfresco-governance-share-community</image.name>
       <docker.quay-expires.value>NEVER</docker.quay-expires.value>
-      <base.image>alfresco/alfresco-share-base:${share.image.tag}</base.image>
-      <scripts.directory>${project.parent.parent.basedir}/scripts/dev</scripts.directory>
    </properties>
 
    <build>
@@ -60,12 +58,6 @@
                      <images>
                         <image>
                            <name>${image.name}:${image.tag}</name>
-                           <build>
-                              <args>
-                                 <BASE_IMAGE>${base.image}</BASE_IMAGE>
-                              </args>
-                              <contextDir>${project.basedir}</contextDir>
-                           </build>
                         </image>
                      </images>
                   </configuration>
@@ -83,73 +75,6 @@
          </build>
       </profile>
 
-      <profile>
-         <id>build-multiarch-docker-images</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>io.fabric8</groupId>
-                  <artifactId>docker-maven-plugin</artifactId>
-                  <configuration>
-                     <images>
-                        <image>
-                           <name>${local.registry}/${image.name}:${image.tag}</name>
-                           <build>
-                              <buildx>
-                                 <builderName>${builder.name}</builderName>
-                                 <platforms>
-                                    <platform>linux/amd64</platform>
-                                    <platform>linux/arm64</platform>
-                                 </platforms>
-                                 <attestations>
-                                    <provenance>false</provenance>
-                                 </attestations>
-                              </buildx>
-                              <dockerFileDir>${project.basedir}</dockerFileDir>
-                              <args>
-                                 <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
-                              </args>
-                           </build>
-                        </image>
-                     </images>
-                  </configuration>
-                  <executions>
-                     <execution>
-                        <id>build-push-image</id>
-                        <phase>install</phase>
-                        <goals>
-                           <goal>build</goal>
-                           <goal>push</goal>
-                        </goals>
-                     </execution>
-                  </executions>
-               </plugin>
-               <plugin>
-                  <artifactId>exec-maven-plugin</artifactId>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <executions>
-                     <execution>
-                        <id>prepare-buildx</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                           <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                           <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                           <arguments>
-                              <argument>${builder.name}</argument>
-                              <argument>${image.registry}</argument>
-                              <argument>${image.name}</argument>
-                              <argument>${image.tag}</argument>
-                           </arguments>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-
       <profile>
          <id>push-docker-images</id>
          <!-- publishes "image:latest" to Quay -->
@@ -162,23 +87,8 @@
                      <images>
                         <!-- Quay image -->
                         <image>
-                           <name>${image.registry}/${image.name}:${image.tag}</name>
-                           <build>
-                              <buildx>
-                                 <builderName>${builder.name}</builderName>
-                                 <platforms>
-                                    <platform>linux/amd64</platform>
-                                    <platform>linux/arm64</platform>
-                                 </platforms>
-                                 <attestations>
-                                    <provenance>false</provenance>
-                                 </attestations>
-                              </buildx>
-                              <dockerFileDir>${project.basedir}</dockerFileDir>
-                              <args>
-                                 <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
-                              </args>
-                           </build>
+                           <name>${image.name}:${image.tag}</name>
+                           <registry>${image.registry}</registry>
                         </image>
                      </images>
                   </configuration>
@@ -193,28 +103,6 @@
                      </execution>
                   </executions>
                </plugin>
-               <plugin>
-                  <artifactId>exec-maven-plugin</artifactId>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <executions>
-                     <execution>
-                        <id>prepare-buildx</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                           <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                           <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                           <arguments>
-                              <argument>${builder.name}</argument>
-                              <argument>${image.registry}</argument>
-                              <argument>${image.name}</argument>
-                              <argument>${image.tag}</argument>
-                           </arguments>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
             </plugins>
          </build>
       </profile>
@@ -236,22 +124,6 @@
                               <!-- DockerHub image -->
                               <image>
                                  <name>${image.name}:${project.version}</name>
-                                 <build>
-                                    <buildx>
-                                       <builderName>${builder.name}</builderName>
-                                       <platforms>
-                                          <platform>linux/amd64</platform>
-                                          <platform>linux/arm64</platform>
-                                       </platforms>
-                                       <attestations>
-                                          <provenance>false</provenance>
-                                       </attestations>
-                                    </buildx>
-                                    <dockerFileDir>${project.basedir}</dockerFileDir>
-                                    <args>
-                                       <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
-                                    </args>
-                                 </build>
                               </image>
                            </images>
                         </configuration>
@@ -267,23 +139,8 @@
                            <images>
                               <!-- Quay image -->
                               <image>
-                                 <name>${image.registry}/${image.name}:${project.version}</name>
-                                 <build>
-                                    <buildx>
-                                       <builderName>${builder.name}</builderName>
-                                       <platforms>
-                                          <platform>linux/amd64</platform>
-                                          <platform>linux/arm64</platform>
-                                       </platforms>
-                                       <attestations>
-                                          <provenance>false</provenance>
-                                       </attestations>
-                                    </buildx>
-                                    <dockerFileDir>${project.basedir}</dockerFileDir>
-                                    <args>
-                                       <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
-                                    </args>
-                                 </build>
+                                 <name>${image.name}:${project.version}</name>
+                                 <registry>${image.registry}</registry>
                               </image>
                            </images>
                         </configuration>
@@ -294,28 +151,6 @@
                      </execution>
                   </executions>
                </plugin>
-               <plugin>
-                  <artifactId>exec-maven-plugin</artifactId>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <executions>
-                     <execution>
-                        <id>prepare-buildx</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                           <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                           <executable>${scripts.directory}/prepare_buildx.sh</executable>
-                           <arguments>
-                              <argument>${builder.name}</argument>
-                              <argument>${image.registry}</argument>
-                              <argument>${image.name}</argument>
-                              <argument>${image.tag}</argument>
-                           </arguments>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
             </plugins>
          </build>
       </profile>

docker-share/pom.xml

@@ -7,6 +7,6 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>acs-community-packaging</artifactId>
-      <version>23.2.0</version>
+      <version>7.4.0-A9-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>23.2.0</version>
+    <version>7.4.0-A9-SNAPSHOT</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>23.2.0.60</version>
+        <version>20.50</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-community-repo.version>23.2.0.60</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>23.2.0.72</dependency.alfresco-community-share.version>
-        <dependency.acs-packaging.version>23.2.0</dependency.acs-packaging.version> <!-- for Share distribution zip -->
+        <dependency.alfresco-community-repo.version>20.50</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>20.35</dependency.alfresco-community-share.version>
+        <dependency.acs-packaging.version>7.4.0-DEV1</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>23.2.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>23.2.0</version>
+        <version>7.4.0-A9-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

scripts/dev/prepare_buildx.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-BUILDER_NAME="${1}"
-TARGET_REGISTRY="${2}"
-TARGET_IMAGE="${3}"
-IMAGE_TAG="${4}"
-
-#Create a `docker-container` builder with host networking and required flags (quay.io)
-docker --config target/docker/"${TARGET_REGISTRY}"/"${TARGET_IMAGE}"/"${IMAGE_TAG}"/docker \
-buildx create --use --name "${BUILDER_NAME}" --driver-opt network=host \
---buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'
-
-#Create a `docker-container` builder with host networking and required flags (docker.io)
-docker --config target/docker/"${TARGET_IMAGE}"/"${IMAGE_TAG}"/docker \
-buildx create --use --name "${BUILDER_NAME}" --driver-opt network=host \
---buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'
-
-#Create a `docker-container` builder with host networking and required flags (local registry)
-docker --config target/docker/127.0.0.1/5000/"${TARGET_IMAGE}"/"${IMAGE_TAG}"/docker \
-buildx create --use --name "${BUILDER_NAME}" --driver-opt network=host \
---buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host'

scripts/travis/build.sh

@@ -6,28 +6,6 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
 
 source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh"
 
-usage() {
-    echo "Builds the upstream projects first, then the current one." 1>&2;
-    echo 1>&2;
-    echo "Usage: $0 [-m]" 1>&2;
-    echo "  -m: Flag to build Docker images with multi-architecture" 1>&2;
-    echo "  -h: Display the usage information" 1>&2;
-    exit 1;
-}
-
-while getopts "mh" option; do
-   case $option in
-      m)
-        DOCKER_BUILD_PROFILE=build-multiarch-docker-images
-        ;;
-      h)
-        usage
-        ;;
-   esac
-done
-
-BUILD_PROFILE=${DOCKER_BUILD_PROFILE:-build-docker-images}
-
 COM_DEPENDENCY_VERSION="$(retrievePomProperty "dependency.alfresco-community-repo.version")"
 REPO_IMAGE=$([[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && echo "-Drepo.image.tag=latest" || echo)
 
@@ -38,13 +16,13 @@ if [ "${COM_DEPENDENCY_VERSION}" != "$(retrievePomParentVersion)" ]; then
 fi
 
 # Prevent merging of any SNAPSHOT dependencies into the master or the release/* branches
-if [[ $(isPullRequestBuild) && "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ && "${BRANCH_NAME}" =~ ^master$|^release/.+$ ]] ; then
+if [[ $(isPullRequestBuild) && "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ && "${TRAVIS_BRANCH}" =~ ^master$|^release/.+$ ]] ; then
   printf "PRs with SNAPSHOT dependencies are not allowed into master or release branches\n"
   exit 1
 fi
 
 # Prevent release jobs from starting when there are SNAPSHOT upstream dependencies
-if [[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && [ "${JOB_NAME,,}" = "release" ] ; then
+if [[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] ; then
   printf "Cannot release project with SNAPSHOT dependencies!\n"
   exit 1
 fi
@@ -54,22 +32,22 @@ UPSTREAM_REPO="github.com/Alfresco/alfresco-community-repo.git"
 # Search, checkout and build the same branch on the upstream project in case of SNAPSHOT dependencies
 # Otherwise, checkout the upstream tag and build its Docker image (use just "mvn package", without "mvn install")
 if [[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
-  pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true"
+  pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
 else
-  pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true"
+  pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
 fi
 
 SHARE_DEPENDENCY_VERSION="$(retrievePomProperty "dependency.alfresco-community-share.version")"
 SHARE_IMAGE=$([[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && echo "-Dshare.image.tag=latest" || echo)
 
 # Prevent merging of any SNAPSHOT dependencies into the master or the release/* branches
-if [[ $(isPullRequestBuild) && "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ && "${BRANCH_NAME}" =~ ^master$|^release/.+$ ]] ; then
+if [[ $(isPullRequestBuild) && "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ && "${TRAVIS_BRANCH}" =~ ^master$|^release/.+$ ]] ; then
   printf "PRs with SNAPSHOT dependencies are not allowed into master or release branches\n"
   exit 1
 fi
 
 # Prevent release jobs from starting when there are SNAPSHOT upstream dependencies
-if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && [ "${JOB_NAME,,}" = "release" ] ; then
+if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] ; then
   printf "Cannot release project with SNAPSHOT dependencies!\n"
   exit 1
 fi
@@ -77,13 +55,13 @@ fi
 SHARE_UPSTREAM_REPO="github.com/Alfresco/alfresco-community-share.git"
 # Checkout the upstream share project (tag or branch; + build if the latter)
 if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
-  pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
+  pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
 else
-  pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
+  pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
 fi
 
 # Build the current project
-mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -P$BUILD_PROFILE -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
+mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -Pbuild-docker-images -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
 
 
 popd

scripts/travis/build_functions.sh

@@ -2,11 +2,11 @@
 set +vx
 
 function isPullRequestBuild() {
-  test "${PULL_REQUEST}" != "false"
+  test "${TRAVIS_PULL_REQUEST}" != "false"
 }
 
 function isBranchBuild() {
-  test "${PULL_REQUEST}" = "false"
+  test "${TRAVIS_PULL_REQUEST}" = "false"
 }
 
 function cloneRepo() {
@@ -82,9 +82,15 @@ function remoteBranchExists() {
 function identifyUpstreamSourceBranch() {
   local UPSTREAM_REPO="${1}"
 
-  # use the current branch name (or in case of PRs, the source branch name)
-  if remoteBranchExists "${UPSTREAM_REPO}" "${BRANCH_NAME}" ; then
-    echo "${BRANCH_NAME}"
+  # if it's a pull request, use the source branch name (if it exists)
+  if isPullRequestBuild && remoteBranchExists "${UPSTREAM_REPO}" "${TRAVIS_PULL_REQUEST_BRANCH}" ; then
+    echo "${TRAVIS_PULL_REQUEST_BRANCH}"
+    exit 0
+  fi
+
+  # otherwise use the current branch name (or in case of PRs, the target branch name)
+  if remoteBranchExists "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}" ; then
+    echo "${TRAVIS_BRANCH}"
     exit 0
   fi
 

scripts/travis/copy_ags_to_release_bucket.sh

@@ -17,7 +17,7 @@ DESTINATION="s3://eu.dl.alfresco.com/release/community/RM/${RELEASE_VERSION}"
 
 printf "\n%s\n%s\n" "${SOURCE}" "${DESTINATION}"
 
-aws s3 cp --acl private --recursive --copy-props none "${SOURCE}" "${DESTINATION}"
+aws s3 cp --acl private --recursive "${SOURCE}" "${DESTINATION}"
 
 set +vex
 echo "=========================== Finishing Copy to Release Bucket Script =========================="

scripts/travis/copy_to_release_bucket.sh

@@ -12,12 +12,12 @@ if [ -z "${RELEASE_VERSION}" ]; then
   exit 1
 fi
 
-SOURCE="s3://alfresco-artefacts-staging/alfresco-content-services-community/release/${BRANCH_NAME}/${BUILD_NUMBER}"
-DESTINATION="s3://eu.dl.alfresco.com/release/community/${RELEASE_VERSION}-build-${BUILD_NUMBER}"
+SOURCE="s3://alfresco-artefacts-staging/alfresco-content-services-community/release/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}"
+DESTINATION="s3://eu.dl.alfresco.com/release/community/${RELEASE_VERSION}-build-${TRAVIS_BUILD_NUMBER}"
 
 printf "\n%s\n%s\n" "${SOURCE}" "${DESTINATION}"
 
-aws s3 cp --acl private --recursive --copy-props none "${SOURCE}" "${DESTINATION}"
+aws s3 cp --acl private --recursive "${SOURCE}" "${DESTINATION}"
 
 set +vex
 echo "=========================== Finishing Copy to Release Bucket Script =========================="

scripts/travis/init.sh

@@ -5,6 +5,7 @@ set -vex
 pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
 
 # Maven Setup
+mkdir -p "${HOME}/.m2" && cp -f .travis.settings.xml "${HOME}/.m2/settings.xml"
 find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
 
 # Docker Logins

scripts/travis/maven_release.sh

@@ -11,17 +11,16 @@ if [ -z "${RELEASE_VERSION}" ] || [ -z "${DEVELOPMENT_VERSION}" ]; then
 fi
 
 # Use full history for release
-git checkout -B "${BRANCH_NAME}"
-# Define git identity for commits
+git checkout -B "${TRAVIS_BRANCH}"
+# Add email to link commits to user
 git config user.email "${GIT_EMAIL}"
-git config user.name "${GIT_USERNAME}"
 
 mvn -B \
   -ntp \
   -Prelease,all-tas-tests -Pags \
   -DreleaseVersion="${RELEASE_VERSION}" \
   -DdevelopmentVersion="${DEVELOPMENT_VERSION}" \
-  "-Darguments=-Prelease,all-tas-tests -Pags -DskipTests -Dbuild-number=${BUILD_NUMBER}" \
+  "-Darguments=-Prelease,all-tas-tests -Pags -DskipTests -Dbuild-number=${TRAVIS_BUILD_NUMBER}" \
   release:clean release:prepare release:perform \
   -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
   -Dusername="${GIT_USERNAME}" \

tests/environment/.env

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.8.1
-POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
+SOLR6_TAG=2.0.3
+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>23.2.0</version>
+        <version>7.4.0-A9-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>23.2.0</version>
+        <version>7.4.0-A9-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>23.2.0</version>
+    <version>7.4.0-A9-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.24.2</version>
+      <version>3.23.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>3.9.4</version>
+      <version>3.8.6</version>
     </dependency>
   </dependencies>
 

tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>23.2.0</version>
+        <version>7.4.0-A9-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>23.2.0</version>
+        <version>7.4.0-A9-SNAPSHOT</version>
     </parent>
 
     <developers>
@@ -23,7 +23,7 @@
 
     <properties>
         <suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
-        <dependency.groovy.version>3.0.19</dependency.groovy.version>
+        <dependency.groovy.version>3.0.12</dependency.groovy.version>
     </properties>
 
     <dependencies>

tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>23.2.0</version>
+        <version>7.4.0-A9-SNAPSHOT</version>
     </parent>
 
     <developers>
@@ -64,8 +64,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.parsson</groupId>
-            <artifactId>parsson</artifactId>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -73,12 +73,6 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <version>${dependency.awaitility.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

tests/tas-webdav/pom.xml

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