[maven-release-plugin][skip ci] prepare release 7.4.2-A9

[release] 7.4.2-A9
Update upstream versions - alfresco-community-repo: 22.21 - alfresco-enterprise-share: 22.13 - acs-packaging: 7.4.2-A9 - RELEASE_VERSION: 7.4.2-A9 - DEVELOPMENT_VERSION: 7.4.2-A10-SNAPSHOT
2025-09-10 14:12:09 +00:00 · 2024-05-10 11:58:50 +00:00 · 2024-05-10 10:59:36 +00:00 · 2024-04-16 21:39:48 +00:00 · 2024-04-16 21:39:46 +00:00 · 2024-04-16 20:42:43 +00:00
51 changed files with 889 additions and 405 deletions
--- a/.travis.settings.xml
+++ b/.travis.settings.xml
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,220 @@
+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 (7.4.2-....) for the docker image to build successfully.
+  RELEASE_VERSION: 7.4.2-A9
+  DEVELOPMENT_VERSION: 7.4.2-A10-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
+
+  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/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: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v5.20.0
+      - 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/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: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v5.20.0
+      - 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
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,177 +0,0 @@
---
-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:
-    - master
-    - /release\/.*/
-    - /feature\/.*/
-    - /fix\/.*/
-
-env:
-  global:
-    - TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
-    - TAS_ENVIRONMENT=./tests/environment
-    # Release version has to start with real version (7.3.0-....) for the docker image to build successfully.
-    - RELEASE_VERSION=7.3.0
-    - DEVELOPMENT_VERSION=7.4.0-A1-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
--- a/dev/README.md
+++ b/dev/README.md
@@ -81,7 +81,7 @@ cd ..
 Set any alfresco-global.properties or log4j properties you may need in the following files. They will be copied
 to the `dev/dev-acs-amps-overlay/target` directory. Other customisations may also be placed in the `extension` directory. 
 ~~~
-dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j.properties
+dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties
 dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco-global.properties
 ~~~

@@ -139,6 +139,6 @@ If you have not removed the containers, it is possible to restart the tomcat ins
 a `mvn install` (no `clean`), but this may result in failures if there are incompatibilities
 between the code, database and content in `dev/dev-acs-amps-overlay/target/dev-instance/runtime/alf_data`.
 Any changes made to alfresco-global properties or log4j will not be picked up, unless you
-directly edit `dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco/extension/custom-log4j.properties`
+directly edit `dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties`
 and `dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco-global.properties`, but they will be thrown away
 on the next `mvn clean`.
--- a/dev/dev-acs-amps-overlay/pom.xml
+++ b/dev/dev-acs-amps-overlay/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <properties>
--- a/dev/dev-repo-amps-overlay/pom.xml
+++ b/dev/dev-repo-amps-overlay/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <build>
--- a/dev/dev-share-amps-overlay/pom.xml
+++ b/dev/dev-share-amps-overlay/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <build>
--- a/dev/dev-tomcat/pom.xml
+++ b/dev/dev-tomcat/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <properties>
--- a/dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j.properties
+++ b/dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j.properties
@@ -1,20 +0,0 @@
-log4j.logger.org.alfresco.repo.content.transform.TransformerDebug=debug
-
-#log4j.logger.org.alfresco.util.exec.RuntimeExecBootstrapBean=debug
-#log4j.logger.org.alfresco.util.exec.RuntimeExec=debug
-
-#log4j.logger.org.alfresco.repo.rendition2=debug
-#log4j.logger.org.alfresco.repo.content.metadata=debug
-#log4j.logger.org.alfresco.repo.rendition2.LocalTransformClient=debug
-#log4j.logger.org.alfresco.repo.rendition.RenditionServiceImpl=debug
-#log4j.logger.org.alfresco.enterprise.repo.rendition2.RemoteTransformClient=debug
-
-#log4j.logger.org.alfresco.repo.content.transform.LocalTransformServiceRegistry=debug
-#log4j.logger.org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl=debug
-#log4j.logger.org.alfresco.repo.content.MimetypeMap=debug
-#log4j.logger.org.alfresco.repo.content.transform.LocalTransform=debug
-
-#log4j.logger.org.alfresco.repo.rawevents=debug
-
-#log4j.logger.org.alfresco.repo.jscript.RhinoScriptProcessor=debug
-#log4j.logger.RhinoScriptProcessor.calls=debug
--- a/dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties
+++ b/dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties
@@ -0,0 +1,36 @@
+
+logger.alfresco-repo-content-transform-TransformerDebug.name=org.alfresco.repo.content.transform.TransformerDebug
+logger.alfresco-repo-content-transform-TransformerDebug.level=debug
+
+#logger.alfresco-util-exec-RuntimeExecBootstrapBean.name=org.alfresco.util.exec.RuntimeExecBootstrapBean
+#logger.alfresco-util-exec-RuntimeExecBootstrapBean.level=debug
+#logger.alfresco-util-exec-RuntimeExec.name=org.alfresco.util.exec.RuntimeExec
+#logger.alfresco-util-exec-RuntimeExec.level=debug
+
+#logger.alfresco-repo-rendition2.name=org.alfresco.repo.rendition2
+#logger.alfresco-repo-rendition2.level=debug
+#logger.alfresco-repo-content-metadata.name=org.alfresco.repo.content.metadata
+#logger.alfresco-repo-content-metadata.level=debug
+#logger.alfresco-repo-rendition2-LocalTransformClient.name=org.alfresco.repo.rendition2.LocalTransformClient
+#logger.alfresco-repo-rendition2-LocalTransformClient.level=debug
+#logger.alfresco-repo-rendition-RenditionServiceImpl.name=org.alfresco.repo.rendition.RenditionServiceImpl
+#logger.alfresco-repo-rendition-RenditionServiceImpl.level=debug
+#logger.alfresco-enterprise-repo-rendition2-RemoteTransformClient.name=org.alfresco.enterprise.repo.rendition2.RemoteTransformClient
+#logger.alfresco-enterprise-repo-rendition2-RemoteTransformClient.level=debug
+
+#logger.alfresco-repo-content-transform-LocalTransformServiceRegistry.name=org.alfresco.repo.content.transform.LocalTransformServiceRegistry
+#logger.alfresco-repo-content-transform-LocalTransformServiceRegistry.level=debug
+#logger.alfresco-repo-rendition2-RenditionDefinitionRegistry2Impl.name=org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl
+#logger.alfresco-repo-rendition2-RenditionDefinitionRegistry2Impl.level=debug
+#logger.alfresco-repo-content-MimetypeMap.name=org.alfresco.repo.content.MimetypeMap
+#logger.alfresco-repo-content-MimetypeMap.level=debug
+#logger.alfresco-repo-content-transform-LocalTransform.name=org.alfresco.repo.content.transform.LocalTransform
+#logger.alfresco-repo-content-transform-LocalTransform.level=debug
+
+#logger.alfresco-repo-rawevents.name=org.alfresco.repo.rawevents
+#logger.alfresco-repo-rawevents.level=debug
+
+#logger.alfresco-repo-jscript-RhinoScriptProcessor.name=org.alfresco.repo.jscript.RhinoScriptProcessor
+#logger.alfresco-repo-jscript-RhinoScriptProcessor.level=debug
+#logger.calls.name=RhinoScriptProcessor.calls
+#logger.calls.level=debug
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -25,7 +25,7 @@ services:
            - 5432:5432

    solr6:
-        image: alfresco/alfresco-search-services:2.0.3
+        image: alfresco/alfresco-search-services:2.0.10
        mem_limit: 2g
        environment:
            #Solr needs to know how to register itself with Alfresco
--- a/dev/pom.xml
+++ b/dev/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <properties>
--- a/distribution-ags/pom.xml
+++ b/distribution-ags/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <dependencies>
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <dependencies>
--- a/docker-alfresco/Dockerfile
+++ b/docker-alfresco/Dockerfile
@@ -1,4 +1,5 @@
-FROM alfresco/alfresco-community-repo-base:${repo.image.tag}
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}

 # Set default docker_context.
 ARG resource_path=target
--- a/docker-alfresco/ags/Dockerfile
+++ b/docker-alfresco/ags/Dockerfile
@@ -1,3 +1,4 @@
+ARG BASE_IMAGE
 # BUILD STAGE AGS
 FROM debian:11-slim AS AGSBUILDER

@@ -12,7 +13,7 @@ RUN unzip -q /build/gs-api-explorer-*.war -d /build/gs-api-explorer && \
    chmod -R g-w,o= /build

 # ACTUAL IMAGE
-FROM alfresco/alfresco-content-repository-community:${image.tag}
+FROM ${BASE_IMAGE}

 # Alfresco user does not have permissions to modify webapps or configuration. Switch to root.
 # The access will be fixed after all operations are done.
--- a/docker-alfresco/ags/pom.xml
+++ b/docker-alfresco/ags/pom.xml
@@ -8,11 +8,13 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>content-services-community-docker</artifactId>
-      <version>7.3.0</version>
+      <version>7.4.2-A9</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>
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -7,12 +7,14 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</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>
@@ -76,6 +78,12 @@
                            <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>
@@ -93,6 +101,70 @@
            </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>
+                                        </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 -->
@@ -105,8 +177,20 @@
                            <images>
                                <!-- Quay image -->
                                <image>
-                                    <name>${image.name}:${image.tag}</name>
-                                    <registry>${image.registry}</registry>
+                                    <name>${image.registry}/${image.name}:${image.tag}</name>
+                                    <build>
+                                        <buildx>
+                                            <builderName>${builder.name}</builderName>
+                                            <platforms>
+                                                <platform>linux/amd64</platform>
+                                                <platform>linux/arm64</platform>
+                                            </platforms>
+                                        </buildx>
+                                        <dockerFileDir>${project.basedir}</dockerFileDir>
+                                        <args>
+                                            <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
+                                        </args>
+                                    </build>
                                </image>
                            </images>
                        </configuration>
@@ -121,6 +205,28 @@
                            </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>
@@ -142,6 +248,19 @@
                                        <!-- 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>
+                                                </buildx>
+                                                <dockerFileDir>${project.basedir}</dockerFileDir>
+                                                <args>
+                                                    <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
+                                                </args>
+                                            </build>
                                        </image>
                                    </images>
                                </configuration>
@@ -157,8 +276,20 @@
                                    <images>
                                        <!-- Quay image -->
                                        <image>
-                                            <name>${image.name}:${project.version}</name>
-                                            <registry>${image.registry}</registry>
+                                            <name>${image.registry}/${image.name}:${project.version}</name>
+                                            <build>
+                                                <buildx>
+                                                    <builderName>${builder.name}</builderName>
+                                                    <platforms>
+                                                        <platform>linux/amd64</platform>
+                                                        <platform>linux/arm64</platform>
+                                                    </platforms>
+                                                </buildx>
+                                                <dockerFileDir>${project.basedir}</dockerFileDir>
+                                                <args>
+                                                    <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
+                                                </args>
+                                            </build>
                                        </image>
                                    </images>
                                </configuration>
@@ -169,6 +300,28 @@
                            </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>
--- a/docker-share/ags/Dockerfile
+++ b/docker-share/ags/Dockerfile
@@ -1,5 +1,6 @@
 ### Apply AGS community share AMP to Share image
-FROM alfresco/alfresco-share-base:${share.image.tag}
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}

 LABEL quay.expires-after=${docker.quay-expires.value}

--- a/docker-share/ags/pom.xml
+++ b/docker-share/ags/pom.xml
@@ -8,12 +8,14 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>share-community-docker</artifactId>
-      <version>7.3.0</version>
+      <version>7.4.2-A9</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>
@@ -58,6 +60,12 @@
                     <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>
@@ -75,6 +83,70 @@
         </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>
+                              </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 -->
@@ -87,8 +159,20 @@
                     <images>
                        <!-- Quay image -->
                        <image>
-                           <name>${image.name}:${image.tag}</name>
-                           <registry>${image.registry}</registry>
+                           <name>${image.registry}/${image.name}:${image.tag}</name>
+                           <build>
+                              <buildx>
+                                 <builderName>${builder.name}</builderName>
+                                 <platforms>
+                                    <platform>linux/amd64</platform>
+                                    <platform>linux/arm64</platform>
+                                 </platforms>
+                              </buildx>
+                              <dockerFileDir>${project.basedir}</dockerFileDir>
+                              <args>
+                                 <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
+                              </args>
+                           </build>
                        </image>
                     </images>
                  </configuration>
@@ -103,6 +187,28 @@
                     </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>
@@ -124,6 +230,19 @@
                              <!-- 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>
+                                    </buildx>
+                                    <dockerFileDir>${project.basedir}</dockerFileDir>
+                                    <args>
+                                       <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
+                                    </args>
+                                 </build>
                              </image>
                           </images>
                        </configuration>
@@ -139,8 +258,20 @@
                           <images>
                              <!-- Quay image -->
                              <image>
-                                 <name>${image.name}:${project.version}</name>
-                                 <registry>${image.registry}</registry>
+                                 <name>${image.registry}/${image.name}:${project.version}</name>
+                                 <build>
+                                    <buildx>
+                                       <builderName>${builder.name}</builderName>
+                                       <platforms>
+                                          <platform>linux/amd64</platform>
+                                          <platform>linux/arm64</platform>
+                                       </platforms>
+                                    </buildx>
+                                    <dockerFileDir>${project.basedir}</dockerFileDir>
+                                    <args>
+                                       <BASE_IMAGE>${local.registry}/${base.image}</BASE_IMAGE>
+                                    </args>
+                                 </build>
                              </image>
                           </images>
                        </configuration>
@@ -151,6 +282,28 @@
                     </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>
--- a/docker-share/pom.xml
+++ b/docker-share/pom.xml
@@ -7,6 +7,6 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>acs-community-packaging</artifactId>
-      <version>7.3.0</version>
+      <version>7.4.2-A9</version>
   </parent>
 </project>
--- a/pom.xml
+++ b/pom.xml
@@ -3,19 +3,19 @@
    <artifactId>acs-community-packaging</artifactId>
    <packaging>pom</packaging>
    <name>Alfresco Content Services Community Packaging</name>
-    <version>7.3.0</version>
+    <version>7.4.2-A9</version>

    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-community-repo</artifactId>
        <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>17.183</version>
+        <version>22.21</version>
    </parent>

    <properties>
-        <dependency.alfresco-community-repo.version>17.183</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>17.138</dependency.alfresco-community-share.version>
-        <dependency.acs-packaging.version>7.3.0</dependency.acs-packaging.version> <!-- for Share distribution zip -->
+        <dependency.alfresco-community-repo.version>22.21</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>22.13</dependency.alfresco-community-share.version>
+        <dependency.acs-packaging.version>7.4.2-A9</dependency.acs-packaging.version> <!-- for Share distribution zip -->

        <repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
        <share.image.tag>${dependency.alfresco-community-share.version}</share.image.tag>
@@ -25,7 +25,7 @@
        <connection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</connection>
        <developerConnection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</developerConnection>
        <url>https://github.com/Alfresco/acs-community-packaging</url>
-        <tag>7.3.0</tag>
+        <tag>7.4.2-A9</tag>
    </scm>

    <distributionManagement>
@@ -193,7 +193,12 @@
            </dependency>
            <dependency>
                <groupId>org.alfresco.tas</groupId>
-                <artifactId>alfresco-community-repo-restapi-test</artifactId>
+                <artifactId>restapi</artifactId>
+                <version>${dependency.alfresco-community-repo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco.tas</groupId>
+                <artifactId>restapi</artifactId>
                <version>${dependency.alfresco-community-repo.version}</version>
                <classifier>tests</classifier>
                <scope>test</scope>
--- a/public-javadoc/pom.xml
+++ b/public-javadoc/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>
    <packaging>pom</packaging>

--- a/scripts/travis/build.sh
+++ b/scripts/travis/build.sh
@@ -6,6 +6,28 @@ 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)

@@ -16,13 +38,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$ && "${TRAVIS_BRANCH}" =~ ^master$|^release/.+$ ]] ; then
+if [[ $(isPullRequestBuild) && "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ && "${BRANCH_NAME}" =~ ^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$ ]] && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] ; then
+if [[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && [ "${JOB_NAME,,}" = "release" ] ; then
  printf "Cannot release project with SNAPSHOT dependencies!\n"
  exit 1
 fi
@@ -32,44 +54,36 @@ 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}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
+  pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true"
 else
-  pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
+  pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -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$ && "${TRAVIS_BRANCH}" =~ ^master$|^release/.+$ ]] ; then
+if [[ $(isPullRequestBuild) && "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ && "${BRANCH_NAME}" =~ ^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$ ]] && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] ; then
+if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && [ "${JOB_NAME,,}" = "release" ] ; then
  printf "Cannot release project with SNAPSHOT dependencies!\n"
  exit 1
 fi

 SHARE_UPSTREAM_REPO="github.com/Alfresco/alfresco-community-share.git"
-# Temporarily opening reflective access during compilation for community-share
-# This could be removed once community-share will become Java 17 compliant
-# (Maven plugins included e.g.: maven-war-plugin)
-export MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED \
--add-opens=java.base/java.lang=ALL-UNNAMED \
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
--add-opens=java.base/java.text=ALL-UNNAMED \
--add-opens=java.desktop/java.awt.font=ALL-UNNAMED"
 # Checkout the upstream share project (tag or branch; + build if the latter)
 if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
-  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}"
+  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}"
 else
-  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}"
+  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}"
 fi

 # Build the current project
-mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -Pbuild-docker-images -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
+mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -P$BUILD_PROFILE -Pags ${REPO_IMAGE} ${SHARE_IMAGE}


 popd
--- a/scripts/travis/build_functions.sh
+++ b/scripts/travis/build_functions.sh
@@ -2,11 +2,11 @@
 set +vx

 function isPullRequestBuild() {
-  test "${TRAVIS_PULL_REQUEST}" != "false"
+  test "${PULL_REQUEST}" != "false"
 }

 function isBranchBuild() {
-  test "${TRAVIS_PULL_REQUEST}" = "false"
+  test "${PULL_REQUEST}" = "false"
 }

 function cloneRepo() {
@@ -82,15 +82,9 @@ function remoteBranchExists() {
 function identifyUpstreamSourceBranch() {
  local UPSTREAM_REPO="${1}"

-  # 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}"
+  # use the current branch name (or in case of PRs, the source branch name)
+  if remoteBranchExists "${UPSTREAM_REPO}" "${BRANCH_NAME}" ; then
+    echo "${BRANCH_NAME}"
    exit 0
  fi

--- a/scripts/travis/cleanup_cache.sh
+++ b/scripts/travis/cleanup_cache.sh
--- a/scripts/travis/copy_ags_to_release_bucket.sh
+++ b/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 "${SOURCE}" "${DESTINATION}"
+aws s3 cp --acl private --recursive --copy-props none "${SOURCE}" "${DESTINATION}"

 set +vex
 echo "=========================== Finishing Copy to Release Bucket Script =========================="
--- a/scripts/travis/copy_to_release_bucket.sh
+++ b/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/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}"
-DESTINATION="s3://eu.dl.alfresco.com/release/community/${RELEASE_VERSION}-build-${TRAVIS_BUILD_NUMBER}"
+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}"

 printf "\n%s\n%s\n" "${SOURCE}" "${DESTINATION}"

-aws s3 cp --acl private --recursive "${SOURCE}" "${DESTINATION}"
+aws s3 cp --acl private --recursive --copy-props none "${SOURCE}" "${DESTINATION}"

 set +vex
 echo "=========================== Finishing Copy to Release Bucket Script =========================="
--- a/scripts/travis/init.sh
+++ b/scripts/travis/init.sh
@@ -5,7 +5,6 @@ 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
--- a/scripts/travis/maven_release.sh
+++ b/scripts/travis/maven_release.sh
@@ -11,16 +11,17 @@ if [ -z "${RELEASE_VERSION}" ] || [ -z "${DEVELOPMENT_VERSION}" ]; then
 fi

 # Use full history for release
-git checkout -B "${TRAVIS_BRANCH}"
-# Add email to link commits to user
+git checkout -B "${BRANCH_NAME}"
+# Define git identity for commits
 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=${TRAVIS_BUILD_NUMBER}" \
+  "-Darguments=-Prelease,all-tas-tests -Pags -DskipTests -Dbuild-number=${BUILD_NUMBER}" \
  release:clean release:prepare release:perform \
  -DscmCommentPrefix="[maven-release-plugin][skip ci] " \
  -Dusername="${GIT_USERNAME}" \
--- a/scripts/travis/prepare_staging_deploy.sh
+++ b/scripts/travis/prepare_staging_deploy.sh
--- a/scripts/travis/verify_release_tag.sh
+++ b/scripts/travis/verify_release_tag.sh
--- a/scripts/dev/prepare_buildx.sh
+++ b/scripts/dev/prepare_buildx.sh
@@ -0,0 +1,21 @@
+#!/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'
--- a/tests/environment/.env
+++ b/tests/environment/.env
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.3
+SOLR6_TAG=2.0.10
 POSTGRES_TAG=14.4
 ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <modules>
--- a/tests/tas-cmis/pom.xml
+++ b/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <developers>
--- a/tests/tas-cmis/src/test/resources/log4j.properties
+++ b/tests/tas-cmis/src/test/resources/log4j.properties
@@ -1,26 +0,0 @@
-# Root logger option
-log4j.rootLogger=INFO, file, stdout
-
-# Direct log messages to a log file
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=./target/reports/alfresco-tas.log
-log4j.appender.file.MaxBackupIndex=10
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
-log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
-log4j.appender.testrailLog.MaxBackupIndex=10
-log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-log4j.category.testrail=INFO, testrailLog
-log4j.additivity.testrail=false
--- a/tests/tas-cmis/src/test/resources/log4j2.properties
+++ b/tests/tas-cmis/src/test/resources/log4j2.properties
@@ -0,0 +1,42 @@
+# Root logger option
+rootLogger.level=info
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+###### File appender definition #######
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=./target/reports/alfresco-tas.log
+appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size=10MB
+appender.rolling.strategy.type=DefaultRolloverStrategy
+appender.rolling.strategy.max=10
+
+###### Console appender definition #######
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+logger.testrail.name=testrail
+logger.testrail.level=info
+logger.testrail.additivity=false
+logger.testrail.appenderRef.testrail.ref=TestrailAppender
+
+appender.testrail.name=TestrailAppender
+appender.testrail.type=RollingFile
+appender.testrail.fileName=./target/reports/alfresco-testrail.log
+appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
+appender.testrail.layout.type=PatternLayout
+appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+appender.testrail.policies.type=Policies
+appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
+appender.testrail.policies.size.size=10MB
+appender.testrail.strategy.type=DefaultRolloverStrategy
+appender.testrail.strategy.max=10
--- a/tests/tas-distribution-zip/pom.xml
+++ b/tests/tas-distribution-zip/pom.xml
@@ -9,7 +9,7 @@
  <parent>
    <groupId>org.alfresco</groupId>
    <artifactId>content-repository-community-tests</artifactId>
-    <version>7.3.0</version>
+    <version>7.4.2-A9</version>
  </parent>

  <properties>
--- a/tests/tas-email/pom.xml
+++ b/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <developers>
--- a/tests/tas-email/src/test/resources/log4j.properties
+++ b/tests/tas-email/src/test/resources/log4j.properties
@@ -1,26 +0,0 @@
-# Root logger option
-log4j.rootLogger=INFO, file, stdout
-
-# Direct log messages to a log file
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=./target/reports/alfresco-tas.log
-log4j.appender.file.MaxBackupIndex=10
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
-log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
-log4j.appender.testrailLog.MaxBackupIndex=10
-log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-log4j.category.testrail=INFO, testrailLog
-log4j.additivity.testrail=false
--- a/tests/tas-email/src/test/resources/log4j2.properties
+++ b/tests/tas-email/src/test/resources/log4j2.properties
@@ -0,0 +1,42 @@
+# Root logger option
+rootLogger.level=info
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+###### File appender definition #######
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=./target/reports/alfresco-tas.log
+appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size=10MB
+appender.rolling.strategy.type=DefaultRolloverStrategy
+appender.rolling.strategy.max=10
+
+###### Console appender definition #######
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+logger.testrail.name=testrail
+logger.testrail.level=info
+logger.testrail.additivity=false
+logger.testrail.appenderRef.testrail.ref=TestrailAppender
+
+appender.testrail.name=TestrailAppender
+appender.testrail.type=RollingFile
+appender.testrail.fileName=./target/reports/alfresco-testrail.log
+appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
+appender.testrail.layout.type=PatternLayout
+appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+appender.testrail.policies.type=Policies
+appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
+appender.testrail.policies.size.size=10MB
+appender.testrail.strategy.type=DefaultRolloverStrategy
+appender.testrail.strategy.max=10
--- a/tests/tas-integration/pom.xml
+++ b/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <developers>
--- a/tests/tas-integration/src/test/resources/log4j.properties
+++ b/tests/tas-integration/src/test/resources/log4j.properties
@@ -1,26 +0,0 @@
-# Root logger option
-log4j.rootLogger=INFO, file, stdout
-
-# Direct log messages to a log file
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=./target/reports/alfresco-tas.log
-log4j.appender.file.MaxBackupIndex=10
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
-log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
-log4j.appender.testrailLog.MaxBackupIndex=10
-log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-log4j.category.testrail=INFO, testrailLog
-log4j.additivity.testrail=false
--- a/tests/tas-integration/src/test/resources/log4j2.properties
+++ b/tests/tas-integration/src/test/resources/log4j2.properties
@@ -0,0 +1,42 @@
+# Root logger option
+rootLogger.level=info
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+###### File appender definition #######
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=./target/reports/alfresco-tas.log
+appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size=10MB
+appender.rolling.strategy.type=DefaultRolloverStrategy
+appender.rolling.strategy.max=10
+
+###### Console appender definition #######
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+logger.testrail.name=testrail
+logger.testrail.level=info
+logger.testrail.additivity=false
+logger.testrail.appenderRef.testrail.ref=TestrailAppender
+
+appender.testrail.name=TestrailAppender
+appender.testrail.type=RollingFile
+appender.testrail.fileName=./target/reports/alfresco-testrail.log
+appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
+appender.testrail.layout.type=PatternLayout
+appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+appender.testrail.policies.type=Policies
+appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
+appender.testrail.policies.size.size=10MB
+appender.testrail.strategy.type=DefaultRolloverStrategy
+appender.testrail.strategy.max=10
--- a/tests/tas-restapi/pom.xml
+++ b/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <developers>
@@ -49,7 +49,7 @@
    <dependencies>
        <dependency>
            <groupId>org.alfresco.tas</groupId>
-            <artifactId>alfresco-community-repo-restapi-test</artifactId>
+            <artifactId>restapi</artifactId>
            <classifier>tests</classifier>
            <scope>test</scope>
        </dependency>
--- a/tests/tas-restapi/src/test/resources/log4j.properties
+++ b/tests/tas-restapi/src/test/resources/log4j.properties
@@ -1,26 +0,0 @@
-# Root logger option
-log4j.rootLogger=INFO, file, stdout
-
-# Direct log messages to a log file
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=./target/reports/alfresco-tas.log
-log4j.appender.file.MaxBackupIndex=10
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
-log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
-log4j.appender.testrailLog.MaxBackupIndex=10
-log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-log4j.category.testrail=INFO, testrailLog
-log4j.additivity.testrail=false
--- a/tests/tas-restapi/src/test/resources/log4j2.properties
+++ b/tests/tas-restapi/src/test/resources/log4j2.properties
@@ -0,0 +1,42 @@
+# Root logger option
+rootLogger.level=info
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+###### File appender definition #######
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=./target/reports/alfresco-tas.log
+appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size=10MB
+appender.rolling.strategy.type=DefaultRolloverStrategy
+appender.rolling.strategy.max=10
+
+###### Console appender definition #######
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+logger.testrail.name=testrail
+logger.testrail.level=info
+logger.testrail.additivity=false
+logger.testrail.appenderRef.testrail.ref=TestrailAppender
+
+appender.testrail.name=TestrailAppender
+appender.testrail.type=RollingFile
+appender.testrail.fileName=./target/reports/alfresco-testrail.log
+appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
+appender.testrail.layout.type=PatternLayout
+appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+appender.testrail.policies.type=Policies
+appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
+appender.testrail.policies.size.size=10MB
+appender.testrail.strategy.type=DefaultRolloverStrategy
+appender.testrail.strategy.max=10
--- a/tests/tas-webdav/pom.xml
+++ b/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.3.0</version>
+        <version>7.4.2-A9</version>
    </parent>

    <developers>
--- a/tests/tas-webdav/src/test/resources/log4j.properties
+++ b/tests/tas-webdav/src/test/resources/log4j.properties
@@ -1,26 +0,0 @@
-# Root logger option
-log4j.rootLogger=INFO, file, stdout
-
-# Direct log messages to a log file
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=./target/reports/alfresco-tas.log
-log4j.appender.file.MaxBackupIndex=10
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
-log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
-log4j.appender.testrailLog.MaxBackupIndex=10
-log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
-log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
-
-log4j.category.testrail=INFO, testrailLog
-log4j.additivity.testrail=false
--- a/tests/tas-webdav/src/test/resources/log4j2.properties
+++ b/tests/tas-webdav/src/test/resources/log4j2.properties
@@ -0,0 +1,42 @@
+# Root logger option
+rootLogger.level=info
+rootLogger.appenderRef.stdout.ref=ConsoleAppender
+rootLogger.appenderRef.rolling.ref=RollingAppender
+
+###### File appender definition #######
+appender.rolling.type=RollingFile
+appender.rolling.name=RollingAppender
+appender.rolling.fileName=./target/reports/alfresco-tas.log
+appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+appender.rolling.policies.type = Policies
+appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
+appender.rolling.policies.size.size=10MB
+appender.rolling.strategy.type=DefaultRolloverStrategy
+appender.rolling.strategy.max=10
+
+###### Console appender definition #######
+appender.console.type=Console
+appender.console.name=ConsoleAppender
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+logger.testrail.name=testrail
+logger.testrail.level=info
+logger.testrail.additivity=false
+logger.testrail.appenderRef.testrail.ref=TestrailAppender
+
+appender.testrail.name=TestrailAppender
+appender.testrail.type=RollingFile
+appender.testrail.fileName=./target/reports/alfresco-testrail.log
+appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
+appender.testrail.layout.type=PatternLayout
+appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
+appender.testrail.policies.type=Policies
+appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
+appender.testrail.policies.size.size=10MB
+appender.testrail.strategy.type=DefaultRolloverStrategy
+appender.testrail.strategy.max=10