[maven-release-plugin][skip ci] prepare release 23.1.0-A43

Update upstream versions
    - alfresco-community-repo:   23.1.0.225
    - alfresco-enterprise-share: 23.1.0.230
    - acs-packaging:             23.1.0-A43
    - RELEASE_VERSION:           23.1.0-A43
    - DEVELOPMENT_VERSION:       23.1.0-A44-SNAPSHOT

.ci.settings.xml

@@ -25,10 +25,6 @@
                     <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
                 </pluginRepository>
             </pluginRepositories>
-            <properties>
-                <!-- WhiteSource token -->
-                <org.whitesource.orgToken>${env.WHITESOURCE_API_KEY}</org.whitesource.orgToken>
-            </properties>
         </profile>
     </profiles>
 

.gitattributes

@@ -1,8 +1,11 @@
-# .* eol=crlf
-# *.html eol=crlf
-# *.java eol=crlf
-# *.txt eol=crlf
-# *.css eol=crlf
-# *.xml eol=crlf
-# *.js eol=crlf
-# *.properties eol=crlf
+# .* eol=crlf
+# *.html eol=crlf
+# *.java eol=crlf
+# *.txt eol=crlf
+# *.css eol=crlf
+# *.xml eol=crlf
+# *.js eol=crlf
+# *.properties eol=crlf
+# Shell scripts require LF
+*.sh text eol=lf
+Dockerfile text eol=lf

.gitbugtraq

@@ -1,4 +1,4 @@
 # For SmartGit
 [bugtraq "jira"]
- url = https://issues.alfresco.com/jira/browse/%BUGID%
+ url = https://alfresco.atlassian.net/browse/%BUGID%
  logRegex = ([A-Z]+-\\d+)

.github/dependabot.yml

@@ -0,0 +1,43 @@
+version: 2
+registries:
+  maven-repository-artifacts-alfresco-com-nexus-content-groups-int:
+    type: maven-repository
+    url: https://artifacts.alfresco.com/nexus/content/groups/internal
+    username: ${{secrets.NEXUS_USERNAME}}
+    password: ${{secrets.NEXUS_PASSWORD}}
+
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "22:00"
+    timezone: Africa/Abidjan
+  open-pull-requests-limit: 99
+  ignore:
+# Upstream alfresco-community-repo artifacts
+  - dependency-name: org.alfresco:alfresco-community-repo
+  - dependency-name: org.alfresco:alfresco-core
+  - dependency-name: org.alfresco:alfresco-data-model
+  - dependency-name: org.alfresco:alfresco-repository
+  - dependency-name: org.alfresco:alfresco-remote-api
+  - dependency-name: org.alfresco:content-services-community
+  - dependency-name: org.alfresco:alfresco-community-repo-distribution
+  - dependency-name: org.alfresco.tas:alfresco-community-repo-webdav-test:tests
+  - dependency-name: org.alfresco.tas:alfresco-community-repo-restapi-test:tests
+  - 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
+# Upstream alfresco-enterprise-share artifacts
+  - dependency-name: org.alfresco:share:classes
+  - dependency-name: org.alfresco:alfresco-wcmqs-web:classes
+  - dependency-name: org.alfresco:alfresco-wcmqs-distribution
+  - dependency-name: org.alfresco:share
+  - dependency-name: org.alfresco:alfresco-content-services-share-distribution
+  - dependency-name: org.alfresco:alfresco-share-services
+# Others
+  - dependency-name: org.apache.maven.plugins:maven-war-plugin
+    versions:
+    - ">= 3.a, < 4"
+  registries:
+  - maven-repository-artifacts-alfresco-com-nexus-content-groups-int

.github/workflows/ci.yml

@@ -0,0 +1,251 @@
+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.0-....) for the docker image to build successfully.
+  RELEASE_VERSION: 23.1.0-A43
+  DEVELOPMENT_VERSION: 23.1.0-A44-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

.gitignore

@@ -1,5 +1,8 @@
 *.class
 
+war/overlays
+alfresco/*
+
 # Eclipse
 .classpath
 .settings
@@ -10,7 +13,7 @@
 *.iml
 *.iws
 
-#VSCode
+#VScode
 /.vscode
 
 # Mac
@@ -21,7 +24,6 @@ target
 *.log
 *.log.*
 
-
 # Package Files #
 *.jar
 *.war
@@ -30,12 +32,10 @@ target
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
-# Alfresco
-alf_data/
-
 helm/alfresco-content-services-community/charts/*
 helm/alfresco-content-services-community/requirements.lock
 helm/alfresco-content-services-community*.tgz
 
-# Travis deployment folder 
-deploy_dir
+# Travis deployment folders
+deploy_dir
+deploy_dir_ags

.travis.yml

@@ -1,154 +0,0 @@
----
-dist: xenial
-sudo: required
-language: java
-jdk: openjdk11
-
-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.0.0-....) for the docker image to build successfully.
-    - RELEASE_VERSION=7.0.0-A11
-    - DEVELOPMENT_VERSION=7.0.0-SNAPSHOT
-
-stages:
-  - name: test
-    if: commit_message !~ /\[skip tests\]/
-  - name: docker_latest
-    if: fork = false AND type != pull_request AND branch = master
-  - name: release
-    if: commit_message =~ /\[release\]/ AND fork = false AND type != pull_request AND (branch = master OR branch =~ /release\/.*/)
-  - name: publish
-    if: commit_message =~ /\[publish\]/ AND fork = false AND type != pull_request AND (branch = master OR branch =~ /release\/.*/)
-
-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"
-      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 -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part1 -Denvironment=default -DrunBugs=false
-
-    - name: "REST API TAS tests part2"
-      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 -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part2 -Denvironment=default -DrunBugs=false
-
-    - name: "REST API TAS tests part3"
-      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 -f tests/tas-restapi/pom.xml -Pall-tas-tests,run-restapi-part3 -Denvironment=default -DrunBugs=false
-
-    - name: "CMIS TAS tests - BROWSER binding"
-      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 -f tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-browser -Denvironment=default -DrunBugs=false
-
-    - name: "CMIS TAS tests - ATOM binding"
-      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 -f tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-atom -Denvironment=default -DrunBugs=false
-
-    - name: "CMIS TAS tests - WEBSERVICES binding"
-      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 -f tests/tas-cmis/pom.xml -Pall-tas-tests,run-cmis-webservices -Denvironment=default -DrunBugs=false
-
-    - name: "Email TAS tests"
-      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 -f tests/tas-email/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
-
-    - name: "WebDAV TAS tests"
-      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 -f tests/tas-webdav/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
-
-    - name: "Integration TAS tests"
-      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 -f tests/tas-integration/pom.xml -Pall-tas-tests -Denvironment=default -DrunBugs=false
-
-    - name: "Update Docker latest images"
-      stage: docker_latest
-      script: travis_retry travis_wait 30 mvn -B -V clean install -DskipTests -Dmaven.javadoc.skip=true -Pinternal
-
-    - 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:
-        # Move the final artifacts to a single folder (deploy_dir) to be copied to S3
-        - mkdir -p deploy_dir
-        - cp distribution/target/alfresco.war deploy_dir
-        - cp distribution/target/*-distribution*.zip deploy_dir
-      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
-      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:
-            branch: master
-
-

.whitesource

@@ -1,8 +0,0 @@
-{
-  "generalSettings": {
-    "shouldScanRepo": true
-  },
-  "checkRunSettings": {
-    "vulnerableCheckRunConclusionLevel": "failure"
-  }
-}

.wss-unified-agent.config

@@ -1,228 +0,0 @@
-####################################################################
-# WhiteSource Unified-Agent configuration file
-####################################################################
-##########################################
-# GENERAL SCAN MODE: Files and Package Managers
-##########################################
-  
-checkPolicies=true
-forceCheckAllDependencies=true
-forceUpdate=true
-forceUpdate.failBuildOnPolicyViolation=true
-offline=false
-#ignoreSourceFiles=true
-#scanComment=
-#updateInventory=false
-#resolveAllDependencies=false
-#failErrorLevel=ALL
-#requireKnownSha1=false
-#generateScanReport=true
-#scanReportTimeoutMinutes=10
-#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model
-   
-#projectPerFolder=true
-#projectPerFolderIncludes=
-#projectPerFolderExcludes=
-   
-#wss.connectionTimeoutMinutes=60
-# Change the below URL to your WhiteSource server.
-# Use the 'WhiteSource Server URL' which can be retrieved
-# from your 'Profile' page on the 'Server URLs' panel.
-# Then, add the '/agent' path to it.
-wss.url=https://saas.whitesourcesoftware.com/agent
-  
-#npm.resolveDependencies=false
-#npm.ignoreSourceFiles=false
-#npm.includeDevDependencies=true
-#npm.runPreStep=true
-#npm.ignoreNpmLsErrors=true
-#npm.ignoreScripts=true
-#npm.yarnProject=true
-#npm.accessToken=
-#npm.identifyByNameAndVersion=true
- 
-#bower.resolveDependencies=false
-#bower.ignoreSourceFiles=true
-#bower.runPreStep=true
-   
-#nuget.resolvePackagesConfigFiles=false
-#nuget.resolveCsProjFiles=false
-#nuget.resolveDependencies=false
-#nuget.restoreDependencies=true
-#nuget.ignoreSourceFiles=true
-#nuget.runPreStep=true
-#nuget.resolveNuspecFiles=false
-   
-#python.resolveDependencies=false
-#python.ignoreSourceFiles=false
-#python.ignorePipInstallErrors=true
-#python.installVirtualenv=true
-#python.resolveHierarchyTree=false
-#python.requirementsFileIncludes=requirements.txt
-#python.resolveSetupPyFiles=true
-#python.runPipenvPreStep=true
-#python.pipenvDevDependencies=true
-#python.IgnorePipenvInstallErrors=true
-   
-#maven.ignoredScopes=test provided
-maven.resolveDependencies=true
-#maven.ignoreSourceFiles=true
-#maven.aggregateModules=true
-maven.ignorePomModules=false
-#maven.runPreStep=true
-#maven.ignoreMvnTreeErrors=true
-#maven.environmentPath=
-#maven.m2RepositoryPath=
-  
-#gradle.ignoredScopes=
-#gradle.resolveDependencies=false
-#gradle.runAssembleCommand=false
-#gradle.runPreStep=true
-#gradle.ignoreSourceFiles=true
-#gradle.aggregateModules=true
-#gradle.preferredEnvironment=wrapper
-#gradle.localRepositoryPath=
- 
-#paket.resolveDependencies=false
-#paket.ignoredGroups=
-#paket.ignoreSourceFiles=false
-#paket.runPreStep=true
-#paket.exePath=
- 
-#go.resolveDependencies=false
-#go.collectDependenciesAtRuntime=true
-#go.dependencyManager=
-#go.ignoreSourceFiles=true
-#go.glide.ignoreTestPackages=false
-#go.gogradle.enableTaskAlias=true
- 
-#ruby.resolveDependencies = false
-#ruby.ignoreSourceFiles = false
-#ruby.installMissingGems = true
-#ruby.runBundleInstall = true
-#ruby.overwriteGemFile = true
- 
-#sbt.resolveDependencies=false
-#sbt.ignoreSourceFiles=true
-#sbt.aggregateModules=true
-#sbt.runPreStep=true
-#sbt.targetFolder=
- 
-#php.resolveDependencies=false
-#php.runPreStep=true
-#php.includeDevDependencies=true
- 
-#html.resolveDependencies=false
- 
-#cocoapods.resolveDependencies=false
-#cocoapods.runPreStep=true
-#cocoapods.ignoreSourceFiles=false
- 
-#hex.resolveDependencies=false
-#hex.runPreStep=true
-#hex.ignoreSourceFiles=false
-#hex.aggregateModules=true
- 
-##################################
-# Organization tokens:
-##################################
-apiKey=
- 
-#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option
-#userKey=
-   
-projectName=content-services-community
-projectVersion=
-projectToken=
-   
-productName=ACS Community
-productVersion=
-productToken=
-#updateType=APPEND
-#requesterEmail=user@provider.com
-    
-#########################################################################################
-# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE
-#########################################################################################
-#includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx
-   
-#includes=**/*.m **/*.mm  **/*.js **/*.php
-includes=**/*.jar
-#includes=**/*.gem **/*.rb
-#includes=**/*.dll **/*.cs **/*.nupkg
-#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2
-#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py
-   
-## Exclude file extensions or specific directories by adding **/*.<extension> or **<excluded_dir>/**
-excludes=**/*sources.jar **/*javadoc.jar
-   
-case.sensitive.glob=false
-followSymbolicLinks=true
-    
-##################################
-# Archive properties
-##################################
-#archiveExtractionDepth=2
-#archiveIncludes=**/*.war **/*.ear
-#archiveExcludes=**/*sources.jar
-    
-##################################
-# Proxy settings
-##################################
-#proxy.host=
-#proxy.port=
-#proxy.user=
-#proxy.pass=
-    
-##################################
-# SCM settings
-##################################
-#scm.type=
-#scm.user=
-#scm.pass=
-#scm.ppk=
-#scm.url=
-#scm.branch=
-#scm.tag=
-#scm.npmInstall=
-#scm.npmInstallTimeoutMinutes=
-#scm.repositoriesFile=
-   
-##############################################
-# SCAN MODE: Linux package manager settings
-##############################################
-#scanPackageManager=true
-  
-##################################
-# SCAN MODE: Docker images
-##################################
-#docker.scanImages=true
-#docker.includes=.*.*
-#docker.excludes=
-#docker.pull.enable=true
-#docker.pull.images=.*.*
-#docker.pull.maxImages=10
-#docker.pull.tags=.*.*
-#docker.pull.digest=
-#docker.delete.force=true
-#docker.login.sudo=false
- 
-#docker.aws.enable=true
-#docker.aws.registryIds=
- 
-##################################
-# SCAN MODE: Docker containers
-##################################
-#docker.scanContainers=true
-#docker.containerIncludes=.*.*
-#docker.containerExcludes=
- 
-################################
-# Serverless settings
-################################
-#serverless.provider=
-#serverless.scanFunctions=true
-#serverless.includes=
-#serverless.excludes=
-#serverless.region=
-#serverless.maxFunctions=10

CHANGELOG.md

@@ -1,218 +0,0 @@
-<h1>        Release Notes - Alfresco - Version Community Edition 201911 GA
-</h1>
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.alfresco.com/jira/browse/MNT-20436'>MNT-20436</a>] -         “POST /nodes/{nodeId}/children” RestAPI does not create a node without having a mandatory value object, but it outputs the 201 successful response.
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/MNT-20714'>MNT-20714</a>] -         [HotFix] /nodes/{nodeId}/content REST API fails for content created by a deleted user
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/MNT-20770'>MNT-20770</a>] -         Share non responsive during direct download from S3 if content store selector is also configured
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/MNT-20863'>MNT-20863</a>] -         Changing cm:name with REST API /nodes/{nodeId} does not update Primary Path
-</li>
-</ul>
-
-<h1>        Release Notes - Alfresco - Version Community Edition 201910 EA
-</h1>
-<h2>
-  New Features
-</h2>
-<ul>
-  <li>
-    <h4>Custom Transforms and Renditions</h4>
-    <p>Alfresco Content Services (ACS) provides a number of content
-     transforms, but also allows custom transforms to be added.
-    <p>It is now possible to create custom transforms that run in 
-    separate processes known as T-Engines (short for Transformer
-    Engines). The same engines may be used in Community and 
-    Enterprise Editions. They may be directly connected to the ACS 
-    repository as Local Transforms, but in the Enterprise edition there 
-    is the option to include them as part of the Transform Service 
-    which provides more balanced throughput and better administration 
-    capabilities.
-    <p>For more information see <a href='https://github.com/Alfresco/acs-packaging/blob/master/docs/custom-transforms-and-renditions.md'>Custom Transforms and Renditions</a>
-  </li>
-      <li>
-      <h4>Open-source Transformation Engines</h4>
-      <p>The core T-Engine images can now be used in Community
-       Edition.</p>
-       <p>T-Engines code has been Open-Sourced and is available on Github:</p>
-       <ul><a href='https://github.com/Alfresco/alfresco-transform-core'>alfresco/alfresco-transform-core</a></ul>
-       <p>Images are available on Docker Hub:</p>
-       <ul><a href='https://hub.docker.com/r/alfresco/alfresco-imagemagick'>alfresco/alfresco-imagemagick</a></ul>
-       <ul><a href='https://hub.docker.com/r/alfresco/alfresco-pdf-renderer'>alfresco/alfresco-pdf-renderer</a></ul>
-       <ul><a href='https://hub.docker.com/r/alfresco/alfresco-libreoffice'>alfresco/alfresco-libreoffice</a></ul>
-       <ul><a href='https://hub.docker.com/r/alfresco/alfresco-tika'>alfresco/alfresco-tika</a></ul>
-       <ul><a href='https://hub.docker.com/r/alfresco/alfresco-transform-misc'>alfresco/alfresco-transform-misc</a></ul>
-       </p>
-    </li>
-    <li>
-    <h4>Removal of external executables from docker image</h4>
-    <p>With the introduction of the new Local Transform Service
-    in Alfresco Community Edition, the capability of executing
-    remote transformations on T-Engines was enabled. Because of
-    this, the external executables (Alfresco-Pdf-renderer, Libreoffice
-    and Imagemagick) have been removed from the docker container to
-    facilitate the usage of out-of-process transformations.
-     </p>
-  </li>
-</ul>
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22013'>ALF-22013</a>] -         Docker Image for Base Tomcat locale is POSIX
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22060'>ALF-22060</a>] -         Reader on the backing store is obtained twice in CachingContentStore
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22056'>ALF-22056</a>] -         onCopyCompleteBehaviour not called in order of copy-action
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22073'>ALF-22073</a>] -         MailActionExecutor doesn't consider email bodies with a HTML doctype as HTML
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21988'>ALF-21988</a>] -         Tab order for number ranges not ok
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22097'>ALF-22097</a>] -         T Engine - add source nodeId parameter
-</li>
-</ul>
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-4318'>REPO-4318</a>] -         [COMPLETE] Extraction of transformers and metadata extractors
-</li>
-</ul>
-<h2>
-
-<h1>        Release Notes - Alfresco - Version Community Edition 201901 GA
-</h1>
-<h2>
-  New Features
-</h2>
-<ul>
-  <li>
-    <h4>ActiveMQ:</h4>
-    Alfresco ActiveMQ Docker images: <a href='https://github.com/Alfresco/alfresco-docker-activemq'>GitHub Repo</a> <a href='https://hub.docker.com/r/alfresco/alfresco-activemq/'>DockerHub Repo</a><p>
-  </li>
-    <li>
-    <h4>Alfresco Benchmark Framework:</h4>
-    <p>The benchmark framework project provides a way to run highly scalable, easy-to-run Java-based load and benchmark tests on an Alfresco instance.</p>
-    <p>It comprises the following: <a href='https://github.com/Alfresco/alfresco-bm-manager'>Alfresco BM Manager</a> and Alfresco BM Drivers.</p> 
-    <p>The currently provided drivers are:</p>
-      <ul>
-        <li><a href='https://github.com/Alfresco/alfresco-bm-load-data'>Alfresco Benchmark Load Data</a></li>
-        <li><a href='https://github.com/Alfresco/alfresco-bm-rest-api'>Alfresco Benchmark Rest Api</a></li>
-        <li><a href='https://github.com/Alfresco/alfresco-bm-load-users'>Alfresco Benchmark Load Users</a></li>
-      </ul>	 
-  </li>
-    <li>
-    <h4>Java 11 support</h4>
-    <p>ACS is now runnable with OpenJDK 11.0.1. It still remains compatible with JDK 1.8.</p>
-  </li>
-</ul>
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22049'>ALF-22049</a>] -         Alfresco does not start
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22041'>ALF-22041</a>] -         EKS deployment - SOLR_ALFRESCO_HOST set to wrong host name
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22031'>ALF-22031</a>] -         REST API calls silently rollback after the returning a success status
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21963'>ALF-21963</a>] -         Workflow - backslash in nodeRef properties url.
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21803'>ALF-21803</a>] -         Unable to add users to sites whose 'short name' is a substring of 'site'
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21664'>ALF-21664</a>] -         Exception on workflow image by REST API
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-20854'>ALF-20854</a>] -         webdav error opening Spanish Accent files
-</li>
-</ul>
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3668'>REPO-3668</a>] -         Renditions: Transform event consumer
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-7'>REPO-7</a>] -         Embed ActiveMQ in the Platform
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-1957'>REPO-1957</a>] -         Transformations Improvement Plan
-</li>
-</ul>
-<h2>
-  Deprecations
-</h2>
-<ul>
-  <li>
-    TransformService and RenditionService: All Java APIs related to TransformService and RenditionService have been deprecated; the ability to perform arbitrary transformations will be phased out as the new DBP Transform Service takes effect.  Renditions can be triggered using the existing repository REST API but will be processed asynchronously using the new services.<br/>
-  </li>
-</ul>
-<h2>
-  Known issues
-</h2>
-<ul>
-  <li>
-    Due to the changes to the RenditionService the Media Management AMP is not supported yet.<br/>
-  </li>
-</ul>
-<h2>
-
-<h1>        Release Notes - Alfresco - Version Community Edition 201810 EA
-</h1>  
-
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21783'>ALF-21783</a>] -         ScriptAuthorityService: No way to get more than 100 results with some methods
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21917'>ALF-21917</a>] -         Document list edit metadata incorrect url escaping
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22001'>ALF-22001</a>] -         Faceted search does not work in Japanese
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22030'>ALF-22030</a>] -         ADF UI freezes noticeably on a periodic basis during KeyCloak auth requests
-</li>
-</ul>                                                                                
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-2491'>REPO-2491</a>] -         Renditions: Rendition Testing
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3651'>REPO-3651</a>] -         AWS Load Tests: Infrastructure and Revamp
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3663'>REPO-3663</a>] -         AWS Load Tests: Initial AWS Cost Estimation with BMF
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3667'>REPO-3667</a>] -         Renditions: Transform event producer
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3677'>REPO-3677</a>] -         AWS Services: Basic Deployment
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3703'>REPO-3703</a>] -         AWS Services: Native Services of ACS
-</li>
-</ul>
-<h2>
-
-<h1>        Release Notes - Alfresco - Version Community Edition 201808 EA
-</h1>                                                                                                                                                                                                                                                            
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21992'>ALF-21992</a>] -         BehaviourFilterImpl.isEnabled(NodeRef, QName) is checking wrong QName in case of subClass
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22006'>ALF-22006</a>] -         VersionServicePolicies cannot be disabled on a specific node
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22007'>ALF-22007</a>] -         TransactionListeners are executed in unpredictable order
-</li>
-</ul>
-<h2>        Improvement
-</h2>
-<ul>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22011'>ALF-22011</a>] -         Upgrade to XMLBeans 3.0.0
-</li>
-</ul>
-
-<h1>        Release Notes - Alfresco - Version Community Edition 201806 GA
-</h1>                                                                                                                                                                                                                                                            
-<h2>        Bug
-</h2>
-<ul>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22000'>ALF-22000</a>] -         Docker: HTML link 693ce565f4c4:8080/share but name 
-</li>
-<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22008'>ALF-22008</a>] -         It is not possible to upload a document without versions using CMIS
-</li>
-</ul>

README.md

@@ -1,36 +1,56 @@
 
 # Alfresco Content Services Community Packaging
-This project is producing packaging for [Alfresco Content Services Repository](https://community.alfresco.com/docs/DOC-6385-project-overview-repository).
+This project is producing packaging for Alfresco Content Services Community.
 
-The SNAPSHOT version of the artifacts is **never** published.
+The SNAPSHOT version of artifacts are **never** published.
 
 ### Contributing guide
 Please use [this guide](CONTRIBUTING.md) to make a contribution to the project.
 
-This produces the docker images for alfresco-content-repository-community and the distribution zip for the entire Alfresco Content Services Community product
-
 # General
 
-### Build:
-* ```mvn clean install``` in the root of the project will build everything.
+This project is the Community equivalent of the [Enterprise Packaging Project](https://github.com/Alfresco/acs-packaging).
 
+This project creates the `alfresco/alfresco-content-repository-community` docker image and the distribution zip
+for the Alfresco Content Services Community product.
+
+The `alfresco/alfresco-content-repository-community` image extends the `alfresco-community-repo-base` created by the
+`alfresco-community-repo` project to add additional ACS components.
+
+# Build:
+For more detailed build instructions, see the [Development Tomcat Environment](https://github.com/Alfresco/acs-community-packaging/tree/master/dev/README.md)
+page.
+
+To build the project, including the distribution zip, but not the Docker images, issue the following commands:
+```
+$ # The comP alias includes the following:
+$ cd acs-community-packaging
+$ mvn clean install
+$ cd ..
+```
 ## Docker Alfresco
-On official releases, the image is published: https://hub.docker.com/r/alfresco/alfresco-content-repository-community/tags/
+Releases are published to https://hub.docker.com/r/alfresco/alfresco-content-repository-community/tags/
 
-For testing locally:
-1. Go to docker-alfresco folder
-2. Run *mvn clean install* if you have not done so
-3. Build the docker image: ```docker build . --tag acr-community:6.0.tag```
-4. Check that the image has been created locally with your desired name/tag: ```docker images```
+To build the Docker images, you will need to build the `alfresco-community-repo`, `alfresco-community-share` and
+`acs-community-packaging` projects. The simplest way is to use the `comRD`, `comSD` and `comPD` aliases.
+For more information, see [build aliases](dev/aliases). `latest` images are created locally.
+```
+comRD && comSD && comPD
+```
+
+## Docker-compose & Kubernetes
+Use the https://github.com/Alfresco/acs-deployment project as the basis for your own docker-compose or helm chart deployments.
 
-### Docker-compose & Kubernetes
-Use the deployment project if you want the sample docker-compose or helm: https://github.com/Alfresco/acs-deployment
 
 ## Distribution zip
-In this folder the distribution zip is build. It contains all the war files, libraries, certificates and settings files you need to deploy Alfresco Content Services Community on the supported application servers.
+The distribution zip contains the war files, libraries, certificates and settings files you need, to deploy
+Alfresco Content Services on the supported application servers.
 
-## How to
 
+# How to
+
+* [Development Tomcat Environment](dev/README.md)
+* [aliases](dev/aliases)
 * [Create a custom Docker image](https://github.com/Alfresco/acs-packaging/blob/master/docs/create-custom-image.md)
 * [Creating customized Docker images using an existing Docker image](https://github.com/Alfresco/acs-packaging/blob/master/docs/create-custom-image-using-existing-docker-image.md)
 * [Verifying that AMPs have been applied](https://github.com/Alfresco/acs-packaging/blob/master/docs/verify-the-amp-has-been-applied.md)

dev/README.md

@@ -2,33 +2,86 @@
 
 
 It is possible to use Docker containers to test your code, but it is normally more convenient to simply run the
-repository webapp (`alfresco.war`) in a tomcat instance.
+repository webapp (`alfresco.war`) and Share webapp (`share.war`) in a tomcat instance. Options are also available to
+apply selected AMPs
+
+## Setting up your development environment
+Although it is possible to work on individual github projects, we recommend working on
+the `alfresco-community-repo`, `alfresco-community-share` and `acs-community-packaging`
+in a single Intellij IDEA project. They depend on each other and typically you 
+will want to make changes to all of them if you are changing the repository code.
 
-## Build -repo projects
-Build the `alfresco-community-repo` (if you have not done so already), so that your changes are in the enterprise alfresco.war file.
 ~~~
-cd alfresco-community-repo
-mvn clean install -PcommunityDocker  -DskipTests=true -Dversion.edition=Community
-cd ..
+mkdir work
+cd work
+git clone git@github.com:Alfresco/alfresco-community-repo.git
+git clone git@github.com:Alfresco/alfresco-community-share.git
+git clone git@github.com:Alfresco/acs-community-packaging.git
+~~~
 
-cd alfresco-enterprise-repo
-mvn clean install -PenterpriseDocker -DskipTests=true -Dmaven.javadoc.skip=true
+## Aliases
+There are a set of aliases to help with building. You may find them useful, as they will help you only build selected parts
+of the code base and will save you lots of typing.
+
+Aliases ending in `D` provide Maven commands for building local Docker images. The AMPS environment variable will be of
+interest, if you wish to build AMPs included in the repo and share projects. 
+
+The `aliases` file includes a more detailed description.
+~~~
+source acs-community-packaging/dev/aliases
+~~~
+
+## Link the projects
+Generally you will want to link the different projects together by modifying the top level
+pom.xml files of each downstream project so that they reference the SNAPSHOT versions of the
+upstream projects. To help do this see the `acs-community-packaging` project's `scripts/dev/linkPoms.sh` and
+`scripts/dev/unlinkPoms.sh` scripts.
+
+~~~
+sh acs-community-packaging/scripts/dev/linkPoms.sh
+~~~
+
+## Build the alfresco-community-repo project
+Build the `alfresco-community-repo` projects (if you have not
+done so already), so that your changes are in the community alfresco.war file.
+~~~
+# The `comR` alias includes the following commands:
+cd alfresco-community-repo
+mvn clean install -DskipTests=true -Dversion.edition=Community
+cd ..
+~~~
+
+## Build the Share project
+Build the `alfresco-community-share` project (if you have not done so already), so that your
+changes are in the community share.war file, which also depends on your `alfresco-community-repo` project version.
+~~~
+# The `entS` alias is the same as the following commands:
+cd alfresco-community-share
+mvn clean install -DskipTests -Dmaven.javadoc.skip=true
 cd ..
 ~~~
 
 ## Docker test environment
-The repository code will need to talk to other ACS components, such as a databases, message queue and transformers.
+The repository code will need to talk to other ACS components, such as a database, message queue and transformers.
 The simplest way to create these, is to use the `docker-compose.yml` file in the `dev` directory.
 ~~~
+# The `envUp` alias is the same as the following commands. Run these in a new terminal session, or add a `-d` flag to
+the `docker-compose` command.
 cd acs-community-packaging
-docker-compose -f dev/docker-compose.yml up -d
+docker-compose -f dev/docker-compose.yml up
+Creating dev_activemq_1           ... done
+Creating dev_solr6_1              ... done
+Creating dev_postgres_1           ... done
+Creating dev_transform-core-aio_1 ... done
+...
+cd ..
 ~~~
 
-## Alfresco Global Properties and Log4j
+## Alfresco global properties and Log4j
 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
 ~~~
 
@@ -37,68 +90,55 @@ Create the development tomcat environment, apply AMPs on top of the repository c
 run tomcat. The `run` profile is what starts tomcat. The `withShare` applies
 the Share services AMP and adds the `share.war` to tomcat. 
 Once started, you will be able to access Share on `http://localhost:8080/share` and various repository
-endpoints via `http://localhost:8080/alfresco/`. `entT` is an alias for the
-following command and `entTDebug` will allow a debugger to be attached.
+endpoints via `http://localhost:8080/alfresco/`. `comT` is an alias for the
+following command and `comTDebug` will allow a debugger to be attached.
 ~~~
-$ # The alias entT is the same as the following mvn command. entTDebug may also be used.
-$ mvn clean install -Prun,withShare
+# The alias comT is the same as the following commands:
+cd acs-community-packaging
+mvn clean install -Prun -rf dev
+[INFO] Scanning for projects...
 [INFO] ------------------------------------------------------------------------
 [INFO] Reactor Build Order:
 [INFO] 
-[INFO] Alfresco Content Services Community Packaging                      [pom]
-[INFO] Alfresco Content Services Community Distribution zip               [jar]
-[INFO] Alfresco Content Services Public API Javadoc                       [pom]
-[INFO] ACS Community Docker Image Builder for Alfresco Community          [pom]
-[INFO] Scanning for projects...
-[INFO] --------------------------------[ pom ]---------------------------------
+[INFO] Development Tomcat Environment                                     [pom]
+[INFO] Tomcat Configuration                                               [pom]
+[INFO] Repo WAR with amps                                                 [war]
+[INFO] Share WAR with amps                                                [war]
+[INFO] Tomcat                                                             [war]
 ...
 INFO: Starting ProtocolHandler ["http-bio-8080"]
+cd ..
 ~~~
 
 If you kill the tomcat instance (^C) and wish to restart it, use the following command
-or the `entO` alias, or `entODebug` to attach a debuger.
+or the `comO` alias, or `comODebug` to attach a debugger.
 ~~~
-$ mvn install -Prun,withShare -rf dev-acs-amps-overlay
+mvn install -Prun,withShare -rf dev-acs-amps-overlay
 ~~~
 
 
 ## Clean up
 When finished, kill the tomcat instance and stop the Docker instances. You will normally also
 remove the Docker containers, as you will need a clean database if you are going to issue
-another `mvn clean install` command.
+another `mvn clean install` command. If you started `docker-compose` in a separate terminal session,
+simply use `^C` or if you used a `-d` flag, use `docker-compose -f dev/docker-compose.yml stop`.
 ~~~
-$ ^C
+^C
 ... Stopped 'sysAdmin' subsystem, ID: [sysAdmin, default]
 
-$ docker-compose -f dev/docker-compose.yml stop
-Stopping dev_transform-core-aio_1 ... done
-Stopping dev_transform-router_1   ... done
-Stopping dev_solr6_1              ... done
-Stopping dev_postgres_1           ... done
-Stopping dev_activemq_1           ... done
-Stopping dev_shared-file-store_1  ... done
-
-$ docker-compose -f dev/docker-compose.yml rm
+docker-compose -f dev/docker-compose.yml rm
 Going to remove dev_transform-core-aio_1, dev_transform-router_1, dev_solr6_1, dev_postgres_1, dev_activemq_1, dev_shared-file-store_1
 Are you sure? [yN] y
 Removing dev_transform-core-aio_1 ... done
-Removing dev_transform-router_1   ... done
 Removing dev_solr6_1              ... done
 Removing dev_postgres_1           ... done
 Removing dev_activemq_1           ... done
-Removing dev_shared-file-store_1  ... done
 ~~~
 
 If you have not removed the containers, it is possible to restart the tomcat instance with
 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`.
-
-## Aliases
-You may also find the aliases specified in the following file useful, as they may save you some typing.
-~~~
-$ source acs-community-packaging/dev/aliases
-~~~

dev/aliases

@@ -1,22 +1,30 @@
 # The aliases in this script provide simple commands to build projects, start tomcat and combinations of these. This
 # give the flexibility to only rebuild or repackage parts of the codebase that have changed.
 #
-# Once the repository component has been built, it will need to be combined with other ACS components in the
-# acs_community_packaging projects.
+# Once the repository component has been built, it will need to be combined with other ACS components such as Share
+# in the acs_community_packaging projects.
 #
-# When developing code, you will normally not be creating repository docker images, but will be creating war files and
-# then running them in a local tomcat instance. To provide the environment needed to do this you will need to start a
-# docker-compose environment to provide access to a databases and other ACS components.
+# When developing code, you will normally not be creating repository docker images, or TAS test jar files, but will be
+# creating war files and then running them in a local tomcat instance. To provide the environment needed to do this you
+# will need to start a docker-compose environment to provide access to a databases and other ACS components.
+#
+# If need to create Docker images or create TAS test jar files (extended in downstream projects), use the aliases that
+# end in D for Docker.
+#
+# By default only the share-services AMP is built by these aliases. Additional AMPS may be included by adding their
+# profile to the AMPS environment variable. For example: export AMPS="-Pags"
 #
 # Aliases to build a sequence of projects and start tomcat - remember to start a CLEAN docker-compose environment - see envUp
 #   com - builds alfresco-community-repo & acs-community-packaging
 #
-# Aliases to build projects WITHOUT creating docker images
+# Aliases to build projects WITHOUT creating docker images or TAS tests jars
 #   comR - alfresco-community-repo
+#   comS - alfresco-community-share
 #   comP - acs-community-packaging
 #
-# Aliases to build projects including DOCKER images
+# Aliases to build projects including DOCKER images and TAS tests jars
 #   comRD - alfresco-community-repo
+#   comSD - alfresco-community-share
 #   comPD - acs-community-packaging
 
 # Aliases to start tomcat in a CLEAN environment - remember to start a docker-compose environment - see envUp
@@ -27,27 +35,36 @@
 #   comO - acs-community-packaging
 #   comODebug - acs-community-packaging (uses mvnDebug to allow a debugger to be attached)
 
-export TAG=latest
+# Set environment variables if not already set
+if [ -z ${AMPS+x} ]
+then
+  export AMPS=""
+fi
 
-alias comR='(cd alfresco-community-repo  && mvn clean install                                                                          -DskipTests=true -Dversion.edition=Community)'
-alias comP='(cd acs-community-packaging  && mvn clean install                                                                          -Dmaven.javadoc.skip=true)'
+alias  comR='(cd alfresco-community-repo   && mvn clean install $AMPS -DskipTests=true                                       -Dversion.edition=Community)'
+alias  comS='(cd alfresco-community-share  && mvn clean install $AMPS -DskipTests                  -Dmaven.javadoc.skip=true)'
+alias  comP='(cd acs-community-packaging   && mvn clean install $AMPS                              -Dmaven.javadoc.skip=true)'
 
-alias comRD="(cd alfresco-community-repo  && mvn clean install -PcommunityDocker  -Dimage.tag=$TAG                             -DskipTests=true -Dversion.edition=Community)"
-alias comPD="(cd acs-community-packaging  && mvn clean install -PcommunityDocker  -Dimage.tag=$TAG -Drepo.image.tag=$TAG -Dmaven.javadoc.skip=true)"
+alias comRD='(cd alfresco-community-repo   && mvn clean install $AMPS -DskipTests=true                                       -Dversion.edition=Community -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest)'
+alias comSD='(cd alfresco-community-share  && mvn clean install $AMPS -DskipTests=true -DskipTests -Dmaven.javadoc.skip=true                             -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest -Drepo.image.tag=latest)'
+alias comPD='(cd acs-community-packaging   && mvn clean install $AMPS -DskipTests=true             -Dmaven.javadoc.skip=true                             -Pall-tas-tests -Pbuild-docker-images -Dimage.tag=latest -Drepo.image.tag=latest -Dshare.image.tag=latest)'
 
-alias comT='     (cd acs-community-packaging  && mvn      clean install -Prun,withShare)'
-alias comTDebug='(cd acs-community-packaging  && mvnDebug clean install -Prun,withShare)'
-alias comO='     (cd acs-community-packaging  && mvn            install -Prun,withShare -rf dev/dev-acs-amps-overlay)'
-alias comODebug='(cd acs-community-packaging  && mvnDebug       install -Prun,withShare -rf dev/dev-acs-amps-overlay)'
+alias      comT='(cd acs-community-packaging  && mvn      clean install -Prun $AMPS -rf dev)'
+alias comTDebug='(cd acs-community-packaging  && mvnDebug clean install -Prun $AMPS -rf dev)'
+alias      comO='(cd acs-community-packaging  && mvn            install -Prun $AMPS -rf dev/dev-repo-amps-overlay)'
+alias comODebug='(cd acs-community-packaging  && mvnDebug       install -Prun $AMPS -rf dev/dev-repo-amps-overlay)'
 
-alias com='comR && comP && comT'
-alias comD='comRD && comPD'
+alias   com='comR  && comS  && comP  && comT'
+alias  comD='comRD && comSD && comPD'
+alias  comX='comR  && comS  && comP'
+alias comDR='comRD && comRD && comPD'
+alias comXR='comR  && comR  && comP'
+alias comXS='comS  && comP'
 
 # Clean up of docker images and content stores (alf_data directories)
-alias drm='docker rm -f $(docker ps -q)'
-alias arm='rm -rf `find . -name alf_data`'
-alias     envUp='docker-compose -f acs-community-packaging/dev/docker-compose.yml up'
-alias   envStop='docker-compose -f acs-community-packaging/dev/docker-compose.yml stop'
-alias   envKill='docker-compose -f acs-community-packaging/dev/docker-compose.yml kill'
-alias     envRm='docker-compose -f acs-community-packaging/dev/docker-compose.yml rm'
-
+alias     drm='docker rm -f $(docker ps -q)'
+alias     arm='rm -rf `find . -name alf_data`'
+alias   envUp='./acs-community-packaging/scripts/dev/start-compose.sh'
+alias envStop='docker-compose -f acs-community-packaging/dev/docker-compose.yml stop'
+alias envKill='docker-compose -f acs-community-packaging/dev/docker-compose.yml kill'
+alias   envRm='docker-compose -f acs-community-packaging/dev/docker-compose.yml rm'

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

@@ -1,358 +1,272 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>dev-acs-community-amps-overlay</artifactId>
-    <name>Content Services WAR with amps</name>
-    <packaging>war</packaging>
-
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <tomcat.version>7.0.86</tomcat.version>
-        <tomcat.default.solr6.port>8983</tomcat.default.solr6.port>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>content-services-community</artifactId>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-share-services</artifactId>
-            <type>amp</type>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>alfresco</finalName>
-        <plugins>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <overlays>
-                        <overlay>
-                            <groupId>org.alfresco</groupId>
-                            <artifactId>content-services-community</artifactId>
-                            <type>war</type>
-                        </overlay>
-                        <overlay>
-                            <groupId>org.alfresco</groupId>
-                            <artifactId>alfresco-share-services</artifactId>
-                            <type>amp</type>
-                        </overlay>
-                    </overlays>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>prepare-exploded-war</id>
-                        <goals>
-                            <goal>exploded</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.alfresco.maven.plugin</groupId>
-                        <artifactId>alfresco-maven-plugin</artifactId>
-                        <version>3.0.1</version>
-                    </dependency>
-                </dependencies>
-            </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>none</solr.secureComms>
-                        <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>
-                            <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>
-                            <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>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <!-- Download and unpack the tomcat config zip file -->
-                    <execution>
-                        <id>unpack-tomcat-config</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/tomcat-conf</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>alfresco-dev-community-tomcat</artifactId>
-                                    <version>${project.version}</version>
-                                    <classifier>config</classifier>
-                                    <overWrite>true</overWrite>
-                                    <type>zip</type>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <!-- Copy tomcat config from build directory to correct location -->
-                    <!--
-                        Q. Why not unpack directly to ${runtime.tomcat.conf.folder} ?
-                        A. There is no way of telling maven NOT to overwrite the directory if it is already there.
-                           overWrite doesn't work, overWriteIfNewer doesn't work either. The plugin uses marker files
-                           to determine whether the zip has already been unpacked, rather than using the actual folder
-                           where the contents are being unpacked - so if a clean is performed the marker files disappear
-                           and the zip is unpacked regardless (overwriting your customised tomcat config). Whilst you
-                           can change the location of the marker files, doing things this way really is going to be more
-                           reliable, since the existing directory will be respected properly.
-                     -->
-                    <execution>
-                        <id>copy-tomcat-config</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <target>
-                                <taskdef resource="net/sf/antcontrib/antcontrib.properties"
-                                         classpathref="maven.plugin.classpath"/>
-                                <if>
-                                    <available file="${runtime.tomcat.conf.folder}" type="dir"/>
-                                    <then>
-                                        <echo message="Skipping creation of tomcat configuration, already exists: ${runtime.tomcat.conf.folder}"/>
-                                    </then>
-                                    <else>
-                                        <echo message="Creating tomcat runtime configuration: ${runtime.tomcat.conf.folder}"/>
-                                        <copy todir="${runtime.tomcat.conf.folder}">
-                                            <fileset dir="${project.build.directory}/tomcat-conf"/>
-                                        </copy>
-                                    </else>
-                                </if>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>ant-contrib</groupId>
-                        <artifactId>ant-contrib</artifactId>
-                        <version>20020829</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>run</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tomcat.maven</groupId>
-                        <artifactId>tomcat7-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>run-exploded-webapp</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>withShare</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tomcat.maven</groupId>
-                        <artifactId>tomcat7-maven-plugin</artifactId>
-                        <configuration>
-                            <webapps combine.children="append">
-                                <webapp>
-                                    <groupId>org.alfresco</groupId>
-                                    <artifactId>share</artifactId>
-                                    <contextPath>/share</contextPath>
-                                    <version>${alfresco.share.version}</version>
-                                    <type>war</type>
-                                    <asWebapp>true</asWebapp>
-                                </webapp>
-                            </webapps>
-                        </configuration>
-                        <!-- Workaround required to make Share work after Tika upgrade -->
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.sis.core</groupId>
-                                <artifactId>sis-utility</artifactId>
-                                <version>0.6</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.sis.core</groupId>
-                                <artifactId>sis-metadata</artifactId>
-                                <version>0.6</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.sis.storage</groupId>
-                                <artifactId>sis-storage</artifactId>
-                                <version>0.6</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dev-acs-community-amps-overlay</artifactId>
+    <name>Run Tomcat</name>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
+        <version>23.1.0-A43</version>
+    </parent>
+
+    <properties>
+        <dependency.sis.version>1.3</dependency.sis.version>
+
+        <tomcat.default.solr6.port>8983</tomcat.default.solr6.port>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>dev-community-repo-amps-overlay</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <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>
+                <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>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>alfresco-server-root</artifactId>
+                            <type>war</type>
+                            <properties>
+                                <context>/</context>
+                            </properties>
+                        </deployable>
+                        <deployable>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>api-explorer</artifactId>
+                            <type>war</type>
+                            <properties>
+                                <context>/api-explorer</context>
+                            </properties>
+                        </deployable>
+                        <deployable>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>dev-community-share-amps-overlay</artifactId>
+                            <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>
+                </configuration>
+                <dependencies>
+                    <!-- Workaround required to make Share work after Tika upgrade -->
+                    <dependency>
+                        <groupId>org.apache.sis.core</groupId>
+                        <artifactId>sis-utility</artifactId>
+                        <version>${dependency.sis.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.sis.core</groupId>
+                        <artifactId>sis-metadata</artifactId>
+                        <version>${dependency.sis.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.sis.storage</groupId>
+                        <artifactId>sis-storage</artifactId>
+                        <version>${dependency.sis.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <!-- Download and unpack the tomcat config zip file -->
+                    <execution>
+                        <id>unpack-tomcat-config</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/tomcat-conf</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-dev-community-tomcat</artifactId>
+                                    <version>${project.version}</version>
+                                    <classifier>config</classifier>
+                                    <overWrite>true</overWrite>
+                                    <type>zip</type>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <!-- Copy tomcat config from build directory to correct location -->
+                    <!--
+                        Q. Why not unpack directly to ${runtime.tomcat.conf.folder} ?
+                        A. There is no way of telling maven NOT to overwrite the directory if it is already there.
+                           overWrite doesn't work, overWriteIfNewer doesn't work either. The plugin uses marker files
+                           to determine whether the zip has already been unpacked, rather than using the actual folder
+                           where the contents are being unpacked - so if a clean is performed the marker files disappear
+                           and the zip is unpacked regardless (overwriting your customised tomcat config). Whilst you
+                           can change the location of the marker files, doing things this way really is going to be more
+                           reliable, since the existing directory will be respected properly.
+                     -->
+                    <execution>
+                        <id>copy-tomcat-config</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <target>
+                                <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                                <if>
+                                    <available file="${runtime.tomcat.conf.folder}" type="dir" />
+                                    <then>
+                                        <echo message="Skipping creation of tomcat configuration, already exists: ${runtime.tomcat.conf.folder}" />
+                                    </then>
+                                    <else>
+                                        <echo message="Creating tomcat runtime configuration: ${runtime.tomcat.conf.folder}" />
+                                        <copy todir="${runtime.tomcat.conf.folder}">
+                                            <fileset dir="${project.build.directory}/tomcat-conf" />
+                                        </copy>
+                                    </else>
+                                </if>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>ant-contrib</groupId>
+                        <artifactId>ant-contrib</artifactId>
+                        <version>20020829</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>third-party-licenses</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>run</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven3-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>run-exploded-webapp</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

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

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dev-community-repo-amps-overlay</artifactId>
+    <name>Repo WAR with amps</name>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
+        <version>23.1.0-A43</version>
+    </parent>
+
+    <build>
+        <finalName>alfresco</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-war-file</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>content-services-community</artifactId>
+                                    <version>${dependency.alfresco-community-repo.version}</version>
+                                    <type>war</type>
+                                    <outputDirectory>${project.build.directory}/alfresco</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-base-amps</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-share-services</artifactId>
+                                    <version>${dependency.alfresco-community-repo.version}</version>
+                                    <type>amp</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>
+                                </artifactItem>
+                                <!-- Inclusion of AOS results in
+                                    java.lang.ClassNotFoundException: org.alfresco.repo.web.filter.beans.BeanProxyFilter
+                                    This is probably because, the configuration of the dev tomcat, unlike production
+                                    is shared between webapps and something (possibly a web.xml fragment) is
+                                    incorrectly being picked up by the /share webapp. The previous version did
+                                    not include aos or googledrive.
+                                <artifactItem>
+                                    <groupId>org.alfresco.aos-module</groupId>
+                                    <artifactId>alfresco-aos-module</artifactId>
+                                    <type>amp</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>
+                                </artifactItem>
+                                -->
+                                <artifactItem>
+                                    <groupId>org.alfresco.integrations</groupId>
+                                    <artifactId>alfresco-googledrive-repo-community</artifactId>
+                                    <type>amp</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.alfresco.maven.plugin</groupId>
+                <artifactId>alfresco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install-amps</id>
+                        <goals>
+                            <goal>install</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <backup>true</backup>
+                            <ampLocation>
+                                ${project.build.directory}/amps
+                            </ampLocation>
+                            <warLocation>${project.build.directory}/alfresco</warLocation>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <includeWebResources>true</includeWebResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>ags</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-ags-amp</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.alfresco</groupId>
+                                            <artifactId>alfresco-governance-services-community-repo</artifactId>
+                                            <version>${dependency.alfresco-community-repo.version}</version>
+                                            <type>amp</type>
+                                            <overWrite>false</overWrite>
+                                            <outputDirectory>${project.build.directory}/amps</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

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

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>dev-community-share-amps-overlay</artifactId>
+    <name>Share WAR with amps</name>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
+        <version>23.1.0-A43</version>
+    </parent>
+
+    <build>
+        <finalName>share</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack-war-file</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>share</artifactId>
+                                    <version>${dependency.alfresco-community-share.version}</version>
+                                    <type>war</type>
+                                    <outputDirectory>${project.build.directory}/share</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-base-amps</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco.integrations</groupId>
+                                    <artifactId>alfresco-googledrive-share</artifactId>
+                                    <version>${alfresco.googledrive.version}</version>
+                                    <type>amp</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${project.build.directory}/amps-share</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.alfresco.maven.plugin</groupId>
+                <artifactId>alfresco-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install-amps</id>
+                        <goals>
+                            <goal>install</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <backup>true</backup>
+                            <ampLocation>
+                                ${project.build.directory}/amps-share
+                            </ampLocation>
+                            <warLocation>${project.build.directory}/share</warLocation>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <includeWebResources>true</includeWebResources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>ags</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>copy-ags-amp</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>copy</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>org.alfresco</groupId>
+                                            <artifactId>alfresco-governance-services-community-share</artifactId>
+                                            <version>${dependency.alfresco-community-share.version}</version>
+                                            <type>amp</type>
+                                            <overWrite>false</overWrite>
+                                            <outputDirectory>${project.build.directory}/amps-share</outputDirectory>
+                                        </artifactItem>
+                                    </artifactItems>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

dev/dev-tomcat/pom.xml

@@ -1,62 +1,62 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-dev-community-tomcat</artifactId>
-    <name>Tomcat Configuration</name>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <dev.tomcat.conf.folder>${basedir}/src/main/tomcat</dev.tomcat.conf.folder>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>dev-tomcat-config-zip</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <attach>true</attach>
-                            <descriptors>
-                                <descriptor>src/assembly/tomcat-conf.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>properties-maven-plugin</artifactId>
-                <executions>
-                    <!-- Read alfresco-global.properties if it exists, to use it for cleaning runtime data (e.g. which database?) -->
-                    <execution>
-                        <id>read-alfresco-global-properties</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>read-project-properties</goal>
-                        </goals>
-                        <configuration>
-                            <files>
-                                <file>${alfresco.properties.file}</file>
-                            </files>
-                            <quiet>true</quiet>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>alfresco-dev-community-tomcat</artifactId>
+    <name>Tomcat Configuration</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
+        <version>23.1.0-A43</version>
+    </parent>
+
+    <properties>
+        <dev.tomcat.conf.folder>${basedir}/src/main/tomcat</dev.tomcat.conf.folder>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>dev-tomcat-config-zip</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <attach>true</attach>
+                            <descriptors>
+                                <descriptor>src/assembly/tomcat-conf.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <executions>
+                    <!-- Read alfresco-global.properties if it exists, to use it for cleaning runtime data (e.g. which database?) -->
+                    <execution>
+                        <id>read-alfresco-global-properties</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>read-project-properties</goal>
+                        </goals>
+                        <configuration>
+                            <files>
+                                <file>${alfresco.properties.file}</file>
+                            </files>
+                            <quiet>true</quiet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
+  <Resources cachingAllowed="true" cacheMaxSize="102400">
+    <PostResources className="org.apache.catalina.webresources.DirResourceSet"
+                   base="${catalina.home}/shared/classes"
+                   webAppMount="/WEB-INF/classes"/>
+  </Resources>
 </Context>

dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco-global.properties

@@ -1,14 +1,5 @@
 alfresco.cluster.interface=127.0.0.1
 
-## Legacy external executables (Docker containers)
-alfresco-pdf-renderer.url=http://localhost:8090/
-img.url=http://localhost:8090/
-jodconverter.url=http://localhost:8090/
-tika.url=http://localhost:8090/
-transform.misc.url=http://localhost:8090/
-
-jodconverter.enabled=true
-
 ##
 # PostgreSQL RDBMS
 ##
@@ -125,3 +116,8 @@ share.host=localhost
 share.port=8080
 
 
+transformer.debug.entries=10
+
+mimetype.config.dir=dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco/extension/mimetypes
+rendition.config.dir=dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco/extension/transform/renditions
+local.transform.pipeline.config.dir=dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco/extension/transform/pipelines

dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j.properties

@@ -1,22 +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.rendition2.LegacyTransformClient=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.enterprise.repo.rendition2.RemoteTransformServiceRegistry=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

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

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

@@ -1,13 +0,0 @@
-<?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

@@ -6,7 +6,7 @@ version: "2"
 
 services:
     transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
+        image: alfresco/alfresco-transform-core-aio:${TRANSFORMERS_TAG}
         mem_limit: 1536m
         environment:
             JAVA_OPTS: " -Xms256m -Xmx1536m"
@@ -14,7 +14,7 @@ services:
             - 8090:8090
 
     postgres:
-        image: postgres:11.7
+        image: postgres:14.4
         mem_limit: 512m
         environment:
             - POSTGRES_PASSWORD=alfresco
@@ -25,25 +25,29 @@ services:
             - 5432:5432
 
     solr6:
-        image: alfresco/alfresco-search-services:2.0.0
+        image: alfresco/alfresco-search-services:2.0.3
         mem_limit: 2g
         environment:
             #Solr needs to know how to register itself with Alfresco
-            - SOLR_ALFRESCO_HOST=alfresco
-            - SOLR_ALFRESCO_PORT=8080
+            SOLR_ALFRESCO_HOST: "host.docker.internal"
+            SOLR_ALFRESCO_PORT: "8080"
             #Alfresco needs to know how to call solr
-            - SOLR_SOLR_HOST=solr6
-            - SOLR_SOLR_PORT=8983
+            SOLR_SOLR_HOST: "localhost"
+            SOLR_SOLR_PORT: "8983"
             #Create the default alfresco and archive cores
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+            SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
             #HTTP by default
-            - ALFRESCO_SECURE_COMMS=none
-            - "SOLR_JAVA_MEM=-Xms2g -Xmx2g"
+            ALFRESCO_SECURE_COMMS: "secret"
+            JAVA_TOOL_OPTIONS:
+              "
+              -Dalfresco.secureComms.secret=secret
+              "
+            SOLR_JAVA_MEM: "-Xms2g -Xmx2g"
         ports:
-            - 8083:8983 #Browser port
+            - 8983:8983 #Browser port
 
     activemq:
-        image: alfresco/alfresco-activemq:5.15.8
+        image: alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
         mem_limit: 1g
         ports:
             - 8161:8161 # Web Console
@@ -51,10 +55,3 @@ services:
             - 61616:61616 # OpenWire
             - 61613:61613 # STOMP
 
-#    proxy:
-#        image: alfresco/acs-community-ngnix:1.0.0
-#        mem_limit: 128m
-#        depends_on:
-#            - alfresco
-#        ports:
-#            - 8080:8080

dev/pom.xml

@@ -1,27 +1,41 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-    <name>Development Tomcat Environment</name>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>org.alfresco</groupId>
-        <artifactId>acs-community-packaging</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <!-- Development Tomcat runtime environment configuration -->
-        <runtime.data.folder>${project.build.directory}/dev-instance/runtime</runtime.data.folder>
-        <runtime.tomcat.conf.folder>${project.build.directory}/dev-instance/tomcat</runtime.tomcat.conf.folder>
-        <alfresco.properties.file>${runtime.tomcat.conf.folder}/shared/classes/alfresco-global.properties</alfresco.properties.file>
-    </properties>
-
-    <modules>
-        <module>dev-tomcat</module>
-        <module>dev-acs-amps-overlay</module>
-    </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>alfresco-dev-community-tomcat-env</artifactId>
+    <name>Development Tomcat Environment</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>acs-community-packaging</artifactId>
+        <version>23.1.0-A43</version>
+    </parent>
+
+    <properties>
+        <!-- Development Tomcat runtime environment configuration -->
+        <runtime.data.folder>${project.build.directory}/dev-instance/runtime</runtime.data.folder>
+        <runtime.tomcat.conf.folder>${project.build.directory}/dev-instance/tomcat</runtime.tomcat.conf.folder>
+        <alfresco.properties.file>${runtime.tomcat.conf.folder}/shared/classes/alfresco-global.properties</alfresco.properties.file>
+    </properties>
+
+    <modules>
+        <module>dev-tomcat</module>
+        <module>dev-repo-amps-overlay</module>
+        <module>dev-share-amps-overlay</module>
+        <module>dev-acs-amps-overlay</module>
+    </modules>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <!-- Versions higher than 3.3.0 were causing the tomcat dev environment to fail to start with a
+                     ClassNotFoundException: org.springframework.web.context.ContextLoaderListener -->
+                <plugin>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.2.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>

distribution-ags/pom.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>alfresco-governance-services-community-distribution</artifactId>
+    <name>Alfresco Governance Services Community Distribution Zip</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>org.alfresco</groupId>
+        <artifactId>acs-community-packaging</artifactId>
+        <version>23.1.0-A43</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-governance-services-community-repo</artifactId>
+            <version>${dependency.alfresco-community-repo.version}</version>
+            <type>amp</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-governance-services-community-rest-api-explorer</artifactId>
+            <version>${dependency.alfresco-community-repo.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.alfresco</groupId>
+            <artifactId>alfresco-governance-services-community-share</artifactId>
+            <version>${dependency.alfresco-community-share.version}</version>
+            <type>amp</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>create-distribution</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>alfresco-governance-services-community-${project.version}</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/assemble/ags-distribution.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

distribution-ags/src/assemble/ags-distribution.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>distribution-ags</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
+            <unpack>false</unpack>
+        </dependencySet>
+    </dependencySets>
+</assembly>

distribution/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.0.0-A11</version>
+        <version>23.1.0-A43</version>
     </parent>
 
     <dependencies>
@@ -20,42 +20,11 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-data-model</artifactId>
-            <exclusions>
-              <!-- REPO-4998 - Exclusion due to classpath conflicts between org.codehaus.woodstox:woodstox-core-asl and com.fasterxml.woodstox:woodstox-core -->
-              <exclusion>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>woodstox-core-asl</artifactId>
-              </exclusion>
-              <!-- REPO-5009 Excluded to avoid duplicated classes with javax.jws:javax.jws-api -->
-              <exclusion>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-              </exclusion>
-              <!-- Duplicates classes from jakarta.transaction:jakarta.transaction-api -->
-              <exclusion>
-                <groupId>javax.transaction</groupId>
-                <artifactId>jta</artifactId>
-              </exclusion>
-              <!-- Duplicates classes from jakarta.xml.bind:jakarta.xml.bind-api -->
-              <exclusion>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-              </exclusion>
-              <!-- Duplicates classes from jakarta.annotation:jakarta.annotation-api -->
-              <exclusion>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
-              </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-data-model</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-server-root</artifactId>
@@ -72,19 +41,6 @@
             <version>${dependency.postgresql.version}</version>
             <scope>compile</scope>
         </dependency>
-        <!-- Alfresco Pdf Renderer -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-pdf-renderer</artifactId>
-            <classifier>linux</classifier>
-            <type>tgz</type>
-        </dependency>
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-pdf-renderer</artifactId>
-            <classifier>win64</classifier>
-            <type>tgz</type>
-        </dependency>
         <!-- SHARE Distribution -->
         <dependency>
             <groupId>org.alfresco</groupId>

distribution/src/assembly/distribution.xml

@@ -13,6 +13,9 @@
         <fileSet>
             <directory>target/classes</directory>
             <outputDirectory></outputDirectory>
+            <excludes>
+                <exclude>META-INF/**</exclude>
+            </excludes>
         </fileSet>
         <!-- Licenses -->
         <fileSet>
@@ -35,7 +38,7 @@
 
         <!-- Share -->
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${dependency.acs-packaging.version}</directory>
             <outputDirectory/>
             <includes>
                 <include>web-server/**</include>
@@ -44,7 +47,7 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
+            <directory>${project.build.directory}/dependency/alfresco-content-services-share-distribution-${dependency.acs-packaging.version}/web-extension-samples</directory>
             <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>
         </fileSet>
     </fileSets>
@@ -104,16 +107,6 @@
             </unpackOptions>
         </dependencySet>
 
-        <!-- Alfresco Pdf Renderer -->
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <useStrictFiltering>true</useStrictFiltering>
-            <outputDirectory>alfresco-pdf-renderer</outputDirectory>
-            <includes>
-                <include>org.alfresco:alfresco-pdf-renderer</include>
-            </includes>
-        </dependencySet>
-
     </dependencySets>
 
 </assembly>

distribution/src/main/resources/README.txt

@@ -4,6 +4,6 @@ Alfresco Community (Build: ${project.version})
 Contains:
 	- Alfresco Content Services Community:	${project.version}
 	- Alfresco Repository:	${dependency.alfresco-community-repo.version}
-	- Alfresco Share:		${alfresco.share.version}
+	- Alfresco Share:		${dependency.alfresco-community-share.version}
 
 For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm

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

docker-alfresco/ags/Dockerfile

@@ -0,0 +1,39 @@
+ARG BASE_IMAGE
+# BUILD STAGE AGS
+FROM debian:11-slim AS AGSBUILDER
+
+RUN export DEBIAN_FRONTEND=noninteractive; \
+    apt-get update -qqy && apt-get -yqq install unzip && \
+    mkdir -p /build/gs-api-explorer
+
+### Copy the AGS war from the local context
+COPY target/gs-api-explorer-*.war /build
+
+RUN unzip -q /build/gs-api-explorer-*.war -d /build/gs-api-explorer && \
+    chmod -R g-w,o= /build
+
+# ACTUAL IMAGE
+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.
+USER root
+
+COPY target/alfresco-governance-services-community-repo-*.amp /usr/local/tomcat/amps/
+
+# Install amps on alfresco.war
+RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
+              /usr/local/tomcat/amps \
+              /usr/local/tomcat/webapps/alfresco -directory -nobackup
+
+### Copy gs-api-explorer war into webapps folder
+COPY --chown=root:Alfresco --from=AGSBUILDER /build/gs-api-explorer /usr/local/tomcat/webapps/gs-api-explorer
+
+# All files in the tomcat folder must be owned by root user and Alfresco group as mentioned in the parent Dockerfile
+RUN chgrp -R Alfresco /usr/local/tomcat && \
+    find /usr/local/tomcat/webapps -type d -exec chmod 0750 {} \; && \
+    find /usr/local/tomcat/webapps -type f -exec chmod 0640 {} \; && \
+    chmod -R g+r /usr/local/tomcat/webapps
+
+# Switching back to alfresco user after having added amps files to run the container as non-root
+USER alfresco

docker-alfresco/ags/pom.xml

@@ -0,0 +1,74 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>content-services-community-docker-ags</artifactId>
+   <name>Alfresco Content Services Community Docker Image Builder for AGS</name>
+   <description>Alfresco Governance Services Community Repository Extension</description>
+   <packaging>pom</packaging>
+
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>content-services-community-docker</artifactId>
+      <version>23.1.0-A43</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>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>unpack-war-files</id>
+                  <phase>process-resources</phase>
+                  <goals>
+                     <goal>unpack</goal>
+                  </goals>
+                  <configuration>
+                     <artifactItems>
+                        <artifactItem>
+                           <groupId>org.alfresco</groupId>
+                           <artifactId>api-explorer</artifactId>
+                           <version>${alfresco.api-explorer.version}</version>
+                           <type>war</type>
+                           <outputDirectory>${project.build.directory}/war/api-explorer</outputDirectory>
+                        </artifactItem>
+                     </artifactItems>
+                  </configuration>
+               </execution>
+               <execution>
+                  <id>copy-amps</id>
+                  <phase>process-resources</phase>
+                  <goals>
+                     <goal>copy</goal>
+                  </goals>
+                  <configuration>
+                     <artifactItems>
+                        <artifactItem>
+                           <groupId>org.alfresco</groupId>
+                           <artifactId>alfresco-governance-services-community-rest-api-explorer</artifactId>
+                           <version>${dependency.alfresco-community-repo.version}</version>
+                           <type>war</type>
+                           <destFileName>gs-api-explorer-${dependency.alfresco-community-repo.version}.war</destFileName>
+                           <outputDirectory>${project.build.directory}</outputDirectory>
+                        </artifactItem>
+                        <artifactItem>
+                           <groupId>org.alfresco</groupId>
+                           <artifactId>alfresco-governance-services-community-repo</artifactId>
+                           <version>${dependency.alfresco-community-repo.version}</version>
+                           <type>amp</type>
+                           <outputDirectory>${project.build.directory}</outputDirectory>
+                        </artifactItem>
+                     </artifactItems>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+</project>

docker-alfresco/pom.xml

@@ -1,17 +1,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>content-services-community-docker-alfresco</artifactId>
-    <name>ACS Community Docker Image Builder for Alfresco Community</name>
+    <artifactId>content-services-community-docker</artifactId>
+    <name>ACS Community Docker Image Builder</name>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.0.0-A11</version>
+        <version>23.1.0-A43</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>
@@ -49,25 +52,11 @@
                                 <artifactItem>
                                     <groupId>org.alfresco</groupId>
                                     <artifactId>alfresco-share-services</artifactId>
-                                    <version>${alfresco.alfresco-share-services.version}</version>
+                                    <version>${dependency.alfresco-community-repo.version}</version>
                                     <type>amp</type>
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${project.build.directory}/amps</outputDirectory>
                                 </artifactItem>
-<!--                                <artifactItem>-->
-<!--                                    <groupId>org.alfresco.aos-module</groupId>-->
-<!--                                    <artifactId>alfresco-aos-module</artifactId>-->
-<!--                                    <type>amp</type>-->
-<!--                                    <overWrite>false</overWrite>-->
-<!--                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>-->
-<!--                                </artifactItem>-->
-<!--                                <artifactItem>-->
-<!--                                    <groupId>org.alfresco.integrations</groupId>-->
-<!--                                    <artifactId>alfresco-googledrive-repo-community</artifactId>-->
-<!--                                    <type>amp</type>-->
-<!--                                    <overWrite>false</overWrite>-->
-<!--                                    <outputDirectory>${project.build.directory}/amps</outputDirectory>-->
-<!--                                </artifactItem>-->
                             </artifactItems>
                         </configuration>
                     </execution>
@@ -78,22 +67,22 @@
 
     <profiles>
         <profile>
-            <id>communityDocker</id>
+            <id>build-docker-images</id>
             <!-- builds "image:latest" locally -->
             <build>
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
                             <images>
                                 <image>
                                     <name>${image.name}:${image.tag}</name>
                                     <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
+                                        <args>
+                                            <BASE_IMAGE>${base.image}</BASE_IMAGE>
+                                        </args>
+                                        <contextDir>${project.basedir}</contextDir>
                                     </build>
                                 </image>
                             </images>
@@ -113,24 +102,31 @@
         </profile>
 
         <profile>
-            <id>internal</id>
-            <!-- publishes "image:latest" on Quay & DockerHub -->
+            <id>build-multiarch-docker-images</id>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
                             <images>
-                                <!-- Quay image -->
                                 <image>
-                                    <name>${image.name}:${image.tag}</name>
-                                    <registry>${image.registry}</registry>
+                                    <name>${local.registry}/${image.name}:${image.tag}</name>
                                     <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
+                                        <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>
@@ -146,39 +142,60 @@
                             </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>release</id>
-            <!-- publishes "image:release_version" on Quay & DockerHub -->
+            <id>push-docker-images</id>
+            <!-- publishes "image:latest" to Quay -->
             <build>
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
-                        <configuration combine.self="override">
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
                             <images>
                                 <!-- Quay image -->
                                 <image>
-                                    <name>${image.name}:${project.version}</name>
-                                    <registry>${image.registry}</registry>
+                                    <name>${image.registry}/${image.name}:${image.tag}</name>
                                     <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
-                                    </build>
-                                </image>
-                                <!-- DockerHub image -->
-                                <image>
-                                    <name>${image.name}:${project.version}</name>
-                                    <build>
-                                        <dockerFileDir>${project.basedir}/</dockerFileDir>
-                                        <buildOptions>
-                                            <squash>true</squash>
-                                        </buildOptions>
+                                        <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>
@@ -186,7 +203,7 @@
                         <executions>
                             <execution>
                                 <id>build-push-image</id>
-                                <phase>deploy</phase>
+                                <phase>install</phase>
                                 <goals>
                                     <goal>build</goal>
                                     <goal>push</goal>
@@ -194,6 +211,129 @@
                             </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>release</id>
+            <!-- publishes "image:release_version" to DockerHub and Quay -->
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>build-push-image</id>
+                                <phase>deploy</phase>
+                                <configuration combine.self="override">
+                                    <images>
+                                        <!-- 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>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>build-push-quay-image</id>
+                                <phase>deploy</phase>
+                                <configuration combine.self="override">
+                                    <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>
+                                        </image>
+                                    </images>
+                                </configuration>
+                                <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>

docker-share/ags/Dockerfile

@@ -0,0 +1,15 @@
+### Apply AGS community share AMP to Share image
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE}
+
+LABEL quay.expires-after=${docker.quay-expires.value}
+
+### Copy the AMP from build context to amps_share
+COPY target/alfresco-governance-services-community-share-*.amp /usr/local/tomcat/amps_share/
+### Install AMP on share
+RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
+              /usr/local/tomcat/amps_share/alfresco-governance-services-community-share-*.amp /usr/local/tomcat/webapps/share -nobackup
+
+ENTRYPOINT ["/usr/local/tomcat/shared/classes/alfresco/substituter.sh", "catalina.sh run"]
+
+EXPOSE 8000

docker-share/ags/pom.xml

@@ -0,0 +1,323 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>share-community-docker-ags</artifactId>
+   <packaging>pom</packaging>
+   <name>Alfresco Share Community Docker Image Builder for AGS</name>
+   <description>Alfresco Governance Services Share Community Extension</description>
+
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>share-community-docker</artifactId>
+      <version>23.1.0-A43</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>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>copy-amps</id>
+                  <phase>process-resources</phase>
+                  <goals>
+                     <goal>copy</goal>
+                  </goals>
+                  <configuration>
+                     <artifactItems>
+                        <artifactItem>
+                           <groupId>org.alfresco</groupId>
+                           <artifactId>alfresco-governance-services-community-share</artifactId>
+                           <version>${dependency.alfresco-community-share.version}</version>
+                           <type>amp</type>
+                        </artifactItem>
+                     </artifactItems>
+                     <outputDirectory>${project.build.directory}</outputDirectory>
+                  </configuration>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+
+   <profiles>
+      <profile>
+         <id>build-docker-images</id>
+         <!-- builds "image:latest" locally -->
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>io.fabric8</groupId>
+                  <artifactId>docker-maven-plugin</artifactId>
+                  <configuration>
+                     <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>
+                  <executions>
+                     <execution>
+                        <id>build-image</id>
+                        <phase>install</phase>
+                        <goals>
+                           <goal>build</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </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 -->
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>io.fabric8</groupId>
+                  <artifactId>docker-maven-plugin</artifactId>
+                  <configuration>
+                     <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>
+                        </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>release</id>
+         <!-- publishes "image:release_version" to DockerHub and Quay -->
+         <build>
+            <plugins>
+               <plugin>
+                  <groupId>io.fabric8</groupId>
+                  <artifactId>docker-maven-plugin</artifactId>
+                  <executions>
+                     <execution>
+                        <id>build-push-image</id>
+                        <phase>deploy</phase>
+                        <configuration combine.self="override">
+                           <images>
+                              <!-- 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>
+                        <goals>
+                           <goal>build</goal>
+                           <goal>push</goal>
+                        </goals>
+                     </execution>
+                     <execution>
+                        <id>build-push-quay-image</id>
+                        <phase>deploy</phase>
+                        <configuration combine.self="override">
+                           <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>
+                              </image>
+                           </images>
+                        </configuration>
+                        <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>
+   </profiles>
+</project>

docker-share/pom.xml

@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>share-community-docker</artifactId>
+   <name>Alfresco Share Community Docker Image Builder</name>
+   <packaging>pom</packaging>
+
+   <parent>
+      <groupId>org.alfresco</groupId>
+      <artifactId>acs-community-packaging</artifactId>
+      <version>23.1.0-A43</version>
+   </parent>
+</project>

pom.xml

@@ -3,20 +3,29 @@
     <artifactId>acs-community-packaging</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>7.0.0-A11</version>
+    <version>23.1.0-A43</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>8.337</version>
+        <version>23.1.0.225</version>
     </parent>
 
+    <properties>
+        <dependency.alfresco-community-repo.version>23.1.0.225</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>23.1.0.230</dependency.alfresco-community-share.version>
+        <dependency.acs-packaging.version>23.1.0-A43</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>
+    </properties>
+
     <scm>
         <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.0.0-A11</tag>
+        <tag>23.1.0-A43</tag>
     </scm>
 
     <distributionManagement>
@@ -30,41 +39,42 @@
         </snapshotRepository>
     </distributionManagement>
 
-    <properties>
-        <dependency.alfresco-community-repo.version>8.337</dependency.alfresco-community-repo.version>
+    <repositories>
+        <repository>
+            <id>alfresco-public</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>alfresco-public-snapshots</id>
+            <url>https://artifacts.alfresco.com/nexus/content/groups/public-snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 
-        <repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
-        <share.image.tag>${alfresco.share.version}</share.image.tag>
-
-        <alfresco.share.version>7.0.0-A10</alfresco.share.version>
-        <alfresco.alfresco-share-services.version>${alfresco.share.version}</alfresco.alfresco-share-services.version>
-        <alfresco.api-explorer.version>7.0.0-M1</alfresco.api-explorer.version>
-    </properties>
+    <modules>
+        <module>distribution</module>
+        <module>docker-alfresco</module>
+        <module>docker-share</module>
+    </modules>
 
     <profiles>
         <profile>
-            <id>fullBuild</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>ags</id>
             <modules>
-                <module>distribution</module>
-                <module>public-javadoc</module>
-                <module>docker-alfresco</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>communityDocker</id>
-            <modules>
-                <module>distribution</module>
-                <module>docker-alfresco</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>internal</id>
-            <modules>
-                <module>distribution</module>
-                <module>docker-alfresco</module>
+                <module>distribution-ags</module>
+                <module>docker-alfresco/ags</module>
+                <module>docker-share/ags</module>
             </modules>
         </profile>
         <profile>
@@ -76,8 +86,8 @@
         <profile>
             <id>release</id>
             <modules>
-                <module>distribution</module>
-                <module>docker-alfresco</module>
+                <module>public-javadoc</module>
+                <module>dev</module>
             </modules>
         </profile>
         <profile>
@@ -149,10 +159,20 @@
                 <artifactId>alfresco-community-repo-distribution</artifactId>
                 <version>${dependency.alfresco-community-repo.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>alfresco-mmt</artifactId>
+                <version>${dependency.alfresco-community-repo.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.alfresco.tas</groupId>
-                <artifactId>alfresco-community-repo-cmis-test</artifactId>
+                <artifactId>cmis</artifactId>
+                <version>${dependency.alfresco-community-repo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.alfresco.tas</groupId>
+                <artifactId>cmis</artifactId>
                 <version>${dependency.alfresco-community-repo.version}</version>
                 <classifier>tests</classifier>
                 <scope>test</scope>
@@ -173,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>
@@ -185,41 +210,40 @@
                 <classifier>tests</classifier>
                 <scope>test</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-content-services-share-distribution</artifactId>
-                <version>${alfresco.share.version}</version>
+                <version>${dependency.acs-packaging.version}</version>
                 <type>zip</type>
             </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-share-services</artifactId>
-                <version>${alfresco.alfresco-share-services.version}</version>
+                <version>${dependency.alfresco-community-repo.version}</version>
                 <type>amp</type>
             </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>share</artifactId>
-                <version>${alfresco.share.version}</version>
+                <version>${dependency.alfresco-community-share.version}</version>
                 <type>war</type>
             </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-wcmqs-distribution</artifactId>
-                <version>${alfresco.share.version}</version>
+                <version>${dependency.alfresco-community-share.version}</version>
                 <type>zip</type>
             </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-wcmqs-web</artifactId>
-                <version>${alfresco.share.version}</version>
+                <version>${dependency.alfresco-community-share.version}</version>
                 <classifier>classes</classifier>
             </dependency>
             <dependency>
                 <groupId>org.alfresco</groupId>
                 <artifactId>alfresco-wcmqs-client-api</artifactId>
-                <version>${alfresco.share.version}</version>
+                <version>${dependency.alfresco-community-share.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

public-javadoc/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.0.0-A11</version>
+        <version>23.1.0-A43</version>
     </parent>
     <packaging>pom</packaging>
 
@@ -23,7 +23,7 @@
             <groupId>org.alfresco</groupId>
             <artifactId>share</artifactId>
             <classifier>classes</classifier>
-            <version>${alfresco.share.version}</version>
+            <version>${dependency.alfresco-community-share.version}</version>
         </dependency>
 
         <!-- Downloads the docflex license -->

scripts/ci/build.sh

@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+echo "=========================== Starting Build Script ==========================="
+PS4="\[\e[35m\]+ \[\e[m\]"
+set -vex
+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)
+
+# Either both the parent and the upstream dependency are the same, or else fail the build
+if [ "${COM_DEPENDENCY_VERSION}" != "$(retrievePomParentVersion)" ]; then
+  printf "Upstream dependency version (%s) is different then the project parent version!\n" "${COM_DEPENDENCY_VERSION}"
+  exit 1
+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
+  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
+  printf "Cannot release project with SNAPSHOT dependencies!\n"
+  exit 1
+fi
+
+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"
+else
+  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$ && "${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$ ]] && [ "${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"
+# 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}"
+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}"
+fi
+
+# Build the current project
+mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -P$BUILD_PROFILE -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
+
+
+popd
+set +vex
+echo "=========================== Finishing Build Script =========================="
+

scripts/ci/build_functions.sh

@@ -2,18 +2,18 @@
 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() {
   local REPO="${1}"
   local TAG_OR_BRANCH="${2}"
 
-  printf "Clonning \"%s\" on %s\n" "${TAG_OR_BRANCH}" "${REPO}"
+  printf "Cloning \"%s\" on %s\n" "${TAG_OR_BRANCH}" "${REPO}"
 
   # clone the repository branch/tag
   pushd "$(dirname "${BASH_SOURCE[0]}")/../../../" >/dev/null
@@ -26,7 +26,13 @@ function cloneRepo() {
 }
 
 function retrievePomParentVersion() {
-  pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
+  local REPO="${1}"
+
+  if [ -z "${REPO}" ]; then
+    pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
+  else
+    pushd "$(dirname "${BASH_SOURCE[0]}")/../../../$(basename "${REPO%.git}")" >/dev/null
+  fi
 
   sed -n '/<parent>/,/<\/parent>/p' pom.xml \
     | sed -n '/<version>/,/<\/version>/p' \
@@ -39,8 +45,13 @@ function retrievePomParentVersion() {
 
 function retrievePomProperty() {
   local KEY="${1}"
+  local REPO="${2}"
 
-  pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
+  if [ -z "${REPO}" ]; then
+    pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
+  else
+    pushd "$(dirname "${BASH_SOURCE[0]}")/../../../$(basename "${REPO%.git}")" >/dev/null
+  fi
 
   sed -n '/<properties>/,/<\/properties>/p' pom.xml \
     | sed -n "/<${KEY}>/,/<\/${KEY}>/p" \
@@ -56,7 +67,7 @@ function evaluatePomProperty() {
 
   pushd "$(dirname "${BASH_SOURCE[0]}")/../../" >/dev/null
 
-  mvn -B -q help:evaluate -Dexpression="${KEY}" -DforceStdout
+  mvn -B -ntp -q help:evaluate -Dexpression="${KEY}" -DforceStdout
 
   popd >/dev/null
 }
@@ -71,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
 
@@ -94,6 +99,42 @@ function pullUpstreamTag() {
   cloneRepo "${UPSTREAM_REPO}" "${TAG}"
 }
 
+function pullSameBranch() {
+  local UPSTREAM_REPO="${1}"
+
+  local SOURCE_BRANCH="$(identifyUpstreamSourceBranch "${UPSTREAM_REPO}")"
+
+  cloneRepo "${UPSTREAM_REPO}" "${SOURCE_BRANCH}"
+}
+
+function buildUpstreamTag() {
+  local UPSTREAM_REPO="${1}"
+  local TAG="${2}"
+  local EXTRA_BUILD_ARGUMENTS="${3}"
+
+  pushd "$(dirname "${BASH_SOURCE[0]}")/../../../"
+
+  cd "$(basename "${UPSTREAM_REPO%.git}")"
+
+  mvn -B -ntp -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
+
+  popd
+}
+
+function buildSameBranchOnUpstream() {
+  local UPSTREAM_REPO="${1}"
+  local EXTRA_BUILD_ARGUMENTS="${2}"
+
+  pushd "$(dirname "${BASH_SOURCE[0]}")/../../../"
+
+  cd "$(basename "${UPSTREAM_REPO%.git}")"
+
+  mvn -B -ntp -V -q clean install -DskipTests -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
+  mvn -B -ntp -V -q install -DskipTests -f packaging/tests/pom.xml
+
+  popd
+}
+
 function pullUpstreamTagAndBuildDockerImage() {
   local UPSTREAM_REPO="${1}"
   local TAG="${2}"
@@ -105,7 +146,7 @@ function pullUpstreamTagAndBuildDockerImage() {
 
   cd "$(basename "${UPSTREAM_REPO%.git}")"
 
-  mvn -B -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
+  mvn -B -ntp -V clean package -DskipTests -Dmaven.javadoc.skip=true "-Dimage.tag=${TAG}" ${EXTRA_BUILD_ARGUMENTS}
 
   popd
 }
@@ -122,8 +163,8 @@ function pullAndBuildSameBranchOnUpstream() {
 
   cd "$(basename "${UPSTREAM_REPO%.git}")"
 
-  mvn -B -V -q clean install -DskipTests -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
-  mvn -B -V -q install -DskipTests -f packaging/tests/pom.xml
+  mvn -B -ntp -V -q clean install -DskipTests -Dmaven.javadoc.skip=true ${EXTRA_BUILD_ARGUMENTS}
+  mvn -B -ntp -V -q install -DskipTests -f packaging/tests/pom.xml
 
   popd
 }

scripts/ci/copy_ags_to_release_bucket.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+echo "=========================== Starting Copy to Release Bucket Script ==========================="
+PS4="\[\e[35m\]+ \[\e[m\]"
+set -vex
+
+#
+# Copy from S3 Release bucket to S3 eu.dl bucket
+#
+
+if [ -z "${RELEASE_VERSION}" ]; then
+  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (e.g. 7.2.0-A2)"
+  exit 1
+fi
+
+SOURCE="s3://alfresco-artefacts-staging/community/RM/${RELEASE_VERSION}"
+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}"
+
+set +vex
+echo "=========================== Finishing Copy to Release Bucket Script =========================="

scripts/ci/copy_to_release_bucket.sh

@@ -8,24 +8,16 @@ set -vex
 #
 
 if [ -z "${RELEASE_VERSION}" ]; then
-  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.0.0-EA or 7.0.0-SNAPSHOT)"
+  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (e.g. 7.2.0-A2)"
   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 \
-  "${SOURCE}/alfresco.war" \
-  "${DESTINATION}/alfresco.war"
-
-aws s3 cp --acl private \
-  "${SOURCE}/alfresco-content-services-community-distribution-${RELEASE_VERSION}.zip" \
-  "${DESTINATION}/alfresco-content-services-community-distribution-${RELEASE_VERSION}.zip"
-
+aws s3 cp --acl private --recursive --copy-props none "${SOURCE}" "${DESTINATION}"
 
 set +vex
 echo "=========================== Finishing Copy to Release Bucket Script =========================="
-

scripts/ci/init.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+echo "=========================== Starting Init Script ==========================="
+PS4="\[\e[35m\]+ \[\e[m\]"
+set -vex
+pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
+
+# Maven Setup
+find "${HOME}/.m2/repository/" -type d -name "*-SNAPSHOT*" | xargs -r -l rm -rf
+
+# Docker Logins
+echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
+echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
+
+popd
+set +vex
+echo "=========================== Finishing Init Script =========================="
+

scripts/ci/maven_release.sh

@@ -6,20 +6,22 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
 
 
 if [ -z "${RELEASE_VERSION}" ] || [ -z "${DEVELOPMENT_VERSION}" ]; then
-  echo "Please provide a Release and Development version in the format <acs-version>-<additional-info> (7.0.0-EA or 7.0.0-SNAPSHOT)"
+  echo "Please provide a Release and Development version in the format <acs-version>-<additional-info> (e.g. 7.2.0-A2)"
   exit 1
 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 \
-  -Prelease,fullBuild,all-tas-tests \
+  -ntp \
+  -Prelease,all-tas-tests -Pags \
   -DreleaseVersion="${RELEASE_VERSION}" \
   -DdevelopmentVersion="${DEVELOPMENT_VERSION}" \
-  "-Darguments=-Prelease,fullBuild,all-tas-tests -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}" \

scripts/ci/prepare_staging_deploy.sh

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+echo "========================== Starting Prepare Staging Deploy Script ==========================="
+PS4="\[\e[35m\]+ \[\e[m\]"
+set -vex
+pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
+
+# Identify latest annotated tag (latest version)
+export VERSION=$(git describe --abbrev=0 --tags)
+
+# Get third party license scripts.
+git clone --depth=1 https://github.com/Alfresco/third-party-license-overrides.git
+
+# Move the final artifacts to a single folder (deploy_dir) to be copied to S3
+mkdir -p deploy_dir
+cp distribution/target/alfresco.war deploy_dir
+cp distribution/target/*-distribution*.zip deploy_dir
+# Create third party license csv file and add it to the deploy directory.
+unzip deploy_dir/*-distribution*.zip -d deploy_dir/community-acs
+zippaths=""
+for file in `find deploy_dir/community-acs -name "*.amp" -o -name "*.war" -not -name "ROOT.war" -not -name "_vti_bin.war"`
+do
+    zippaths+="$file|"
+done
+zippaths=${zippaths::-1}
+python3 ./third-party-license-overrides/thirdPartyLicenseCSVCreator.py --zippaths "${zippaths}" --version "${VERSION}" --combined --output "deploy_dir"
+rm -rf deploy_dir/community-acs
+echo "Local deploy directory content:"
+ls -lA deploy_dir
+
+# Create deploy directory for AGS.
+mkdir -p deploy_dir_ags
+cp distribution-ags/target/*.zip deploy_dir_ags
+# Generate third party license csv for AGS.
+unzip deploy_dir_ags/*.zip -d deploy_dir_ags/community-ags
+zippaths=""
+for file in `find deploy_dir_ags/community-ags -name "*.amp" -o -name "*.war"`
+do
+    zippaths+="$file|"
+done
+zippaths=${zippaths::-1}
+python3 ./third-party-license-overrides/thirdPartyLicenseCSVCreator.py --zippaths ${zippaths} --version "${VERSION}" --combined --output "deploy_dir_ags"
+rm -rf deploy_dir_ags/community-ags
+echo "Local AGS deploy directory content:"
+ls -lA deploy_dir_ags
+
+# Tidy up.
+rm -rf ./third-party-license-overrides
+
+popd
+set +vex
+echo "========================== Finishing Prepare Staging Deploy Script =========================="

scripts/ci/verify_release_tag.sh

@@ -9,7 +9,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
 #
 
 if [ -z "${RELEASE_VERSION}" ]; then
-  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.0.0-EA or 7.0.0-SNAPSHOT)"
+  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (e.g. 7.2.0-A2)"
   exit 1
 fi
 

scripts/dev/dev_functions.sh

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+function updatePomParent() {
+    local PROJECT="$1"
+    local PARENT_POM_VERSION="$2"
+
+    if [ -d "${ROOT_DIR}/${PROJECT}" -a -n "${PARENT_POM_VERSION}" ]
+    then
+      # Cannot use "mvn versions:update-parent" as the version must exist before it can be set. The ed command is also faster.
+      pushd "${ROOT_DIR}/${PROJECT}" &>/dev/null
+      ed -s pom.xml &>/tmp/$$.log << EOF
+/<parent>
+/<version>.*<\/version>/s//<version>${PARENT_POM_VERSION}<\/version>/
+wq
+EOF
+      if [ $? -ne 0 ]
+      then
+        echo
+        echo "\"update of <pom><parent><version> version failed on ${PROJECT}"
+        cat "/tmp/$$.log"
+        exit 1
+      fi
+      printf "%-25s %46s=%s\n" "${PROJECT}" "<pom><parent><version>" "${PARENT_POM_VERSION}"
+      popd &>/dev/null
+  fi
+}
+
+function updatePomProperty() {
+    local PROJECT="$1"
+    local PROPERTY_VALUE="$2"
+    local PROPERTY_NAME="$3"
+
+    if [ -d "${ROOT_DIR}/${PROJECT}" -a -n "${PROPERTY_VALUE}" ]
+    then
+      # Can use "mvn versions:set-property", but ed is so much faster.
+      # mvn -B versions:set-property  versions:commit  -Dproperty="${PROPERTY_NAME}" "-DnewVersion=${PROPERTY_VALUE}"
+      pushd "${ROOT_DIR}/${PROJECT}" &>/dev/null
+      ed -s pom.xml &>/tmp/$$.log << EOF
+/\(<${PROPERTY_NAME}>\).*\(<\/${PROPERTY_NAME}>\)/s//\1${PROPERTY_VALUE}\2/
+wq
+EOF
+      if [ $? -ne 0 ]
+      then
+        echo
+        echo "\"update of <${PROPERTY_NAME}> failed on ${PROJECT}"
+        cat "/tmp/$$.log"
+        exit 1
+      fi
+      printf "%-25s %46s=%s\n" "${PROJECT}" "<${PROPERTY_NAME}>" "${PROPERTY_VALUE}"
+      popd &>/dev/null
+    fi
+}

scripts/dev/linkPoms.sh

@@ -0,0 +1,245 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT_DIR="${SCRIPT_DIR}/../../.."
+ENV_FILE=".linkPoms.env"
+ENV_PATH="${ROOT_DIR}/${ENV_FILE}"
+
+source "$(dirname "${BASH_SOURCE[0]}")/dev_functions.sh"
+
+usage() {
+    echo "Updates the downstream projects with the versions of the upstream projects. Reversed by unlinkPoms.sh" 1>&2;
+    echo 1>&2;
+    echo "Usage: $0 [-b <branch>] [-mpxuh]" 1>&2;
+    echo "  -m: Checkout master of each project" 1>&2;
+    echo "  -b: Checkout the <branch> of each project or master if <branch> is blank" 1>&2;
+    echo "  -p: Pull the latest version of each project" 1>&2;
+    echo "  -x: Skip the extract of values from each project" 1>&2;
+    echo "  -u: Skip the update of values in each project" 1>&2;
+    echo "  -h: Display this help" 1>&2;
+    exit 1;
+}
+
+function checkout() {
+    local PROJECT="${1}"
+    local BRANCH="${2}"
+
+    if [ -d "${ROOT_DIR}/${PROJECT}" ]
+    then
+      pushd "${ROOT_DIR}/${PROJECT}" &>/dev/null
+      git checkout "${BRANCH}" &>/tmp/$$.log
+      if [ $? -ne 0 ]
+      then
+        echo
+        echo "\"git checkout ${BRANCH}\" failed on ${PROJECT}"
+        cat "/tmp/$$.log"
+        exit 1
+      fi
+      echo "${PROJECT} is now on ${BRANCH}"
+      popd &>/dev/null
+    fi
+}
+
+function pull_latest() {
+    local PROJECT="${1}"
+
+    if [ -d "${ROOT_DIR}/${PROJECT}" ]
+    then
+      pushd "${ROOT_DIR}/${PROJECT}" &>/dev/null
+      git pull &>/tmp/$$.log
+      if [ $? -ne 0 ]
+      then
+        echo
+        echo "\"git pull\" failed on ${PROJECT}"
+        cat "/tmp/$$.log"
+        exit 1
+      fi
+      echo "${PROJECT} is now using latest"
+      popd &>/dev/null
+    fi
+}
+
+function readTopLevelTag() {
+  local TAG_NAME="${1}"
+  local POM_FILE="${2}"
+  # Might be possible to generalise this function to accept an XPath so it could be used in place of sed commands
+
+  # Read the file with an IFS (Input Field Separator) of the start of XML tag character <
+  local IFS=\>
+  local DEPTH=-99
+  while read -d \< ENTITY CONTENT
+  do
+    if [[ $ENTITY == project\ * ]] # outer <project> tag
+    then
+      DEPTH=0
+    elif [[ $ENTITY == /* ]] # end tag
+    then
+      ((DEPTH=DEPTH-1))
+    else                     # start tag
+      ((DEPTH=DEPTH+1))
+    fi
+
+    if [[ $ENTITY = "${TAG_NAME}" ]] && [[ $DEPTH == 1 ]] ; then
+        echo $CONTENT
+        exit
+    fi
+  done < $POM_FILE
+  exit 1
+}
+
+function exportPomVersion() {
+  local PROJECT="${1}"
+  local ENV_NAME="${2}"
+
+  if [ -d "${ROOT_DIR}/${PROJECT}" ]
+    then
+    pushd "${ROOT_DIR}/${PROJECT}" &>/dev/null
+    # Same as slower/simpler: "mvn help:evaluate -Dexpression=project.version"
+    VERSION=$(readTopLevelTag version pom.xml)
+    if [ $? -ne 0 ]
+    then
+      echo
+      echo "\"readTopLevelTagContent version pom.xml\" failed on ${PROJECT}"
+      exit 1
+    fi
+    echo "export ${ENV_NAME}=${VERSION}" >> "${ENV_PATH}"
+    popd &>/dev/null
+  fi
+}
+
+function exportPomParent() {
+  local PROJECT="${1}"
+  local ENV_NAME="${2}"
+
+  if [ -d "${ROOT_DIR}/${PROJECT}" ]
+    then
+    pushd "${ROOT_DIR}/${PROJECT}" &>/dev/null
+    # Same as slower/simpler: "mvn help:evaluate -Dexpression=project.parent.version"
+    PROPERTY_VALUE=$(sed -n '/<parent>/,/<\/parent>/p' pom.xml | sed -n "s/.*<version>\(.*\)<\/version>/\1/p" | sed 's/\r//g')
+    if [ $? -ne 0 ]
+    then
+      echo
+      echo "\"sed -n '/<parent>/,/<\/parent>/p' pom.xml | sed -n \\\"s/.*<version>\(.*\)<\/version>/\1/p\\\" | sed 's/\r//g'\" failed on ${PROJECT}"
+      exit 1
+    fi
+    echo "export ${ENV_NAME}=${PROPERTY_VALUE}" >> "${ENV_PATH}"
+    popd &>/dev/null
+  fi
+}
+
+# Original version was simpler/slower: exportPomPropertyOrig <project> <env_name> project.parent.version
+function exportPomProperty() {
+    local PROJECT="${1}"
+    local ENV_NAME="${2}"
+    local PROPERTY_NAME="${3}"
+
+  if [ -d "${ROOT_DIR}/${PROJECT}" ]
+    then
+    pushd "${ROOT_DIR}/${PROJECT}" &>/dev/null
+    # Same as slower/simpler: "mvn help:evaluate -Dexpression=${PROPERTY_NAME}"
+    PROPERTY_VALUE=$(sed -n '/<properties>/,/<\/properties>/p' pom.xml | sed -n "s/.*<${PROPERTY_NAME}>\(.*\)<\/${PROPERTY_NAME}>/\1/p" | sed 's/\r//g')
+    if [ $? -ne 0 ]
+    then
+      echo
+      echo "\"sed -n '/<properties>/,/<\/properties>/p' pom.xml | sed -n \\\"s/.*<${PROPERTY_NAME}>\(.*\)<\/${PROPERTY_NAME}>/\1/p\\\" | sed 's/\r//g'\" failed on ${PROJECT}"
+      exit 1
+    fi
+    echo "export ${ENV_NAME}=${PROPERTY_VALUE}" >> "${ENV_PATH}"
+    popd &>/dev/null
+  fi
+}
+
+while getopts "b:mpxuh" arg; do
+    case $arg in
+        b)
+            B_FLAG_SET="true"
+            ;;
+        m)
+            M_FLAG_B_FLAG_SET="true"
+            ;;
+        p)
+            # git pull after git checkout
+            ;;
+        x)
+            SKIP_EXPORT="true"
+            ;;
+        u)
+            SKIP_UPDATE="true"
+            ;;
+        h | *)
+            usage
+            exit 0
+            ;;
+    esac
+done
+if [ -n "${B_FLAG_SET}" -a -n "${M_FLAG_B_FLAG_SET}" ]
+then
+  echo "-m and -b may not both be set"
+  exit 1
+fi
+OPTIND=1
+while getopts "b:mpxuh" arg; do
+    case $arg in
+        b)
+            BRANCH="${OPTARG:-master}"
+            checkout alfresco-community-repo   "${BRANCH}"
+            checkout alfresco-community-share  "${BRANCH}"
+            checkout acs-community-packaging   "${BRANCH}"
+            ;;
+        m)
+            BRANCH="master"
+            checkout alfresco-community-repo   "${BRANCH}"
+            checkout alfresco-community-share  "${BRANCH}"
+            checkout acs-community-packaging   "${BRANCH}"
+            ;;
+    esac
+done
+OPTIND=1
+while getopts "b:mpxuh" arg; do
+    case $arg in
+        p)
+            pull_latest alfresco-community-repo
+            pull_latest alfresco-community-share
+            pull_latest acs-community-packaging
+            ;;
+    esac
+done
+
+if [ -z ${SKIP_EXPORT+x} ]
+then
+  rm -f "${ENV_FILE}"
+
+  exportPomVersion  alfresco-community-repo   COM_R_VERSION
+
+  exportPomVersion  alfresco-enterprise-repo  ENT_R_VERSION
+  exportPomParent   alfresco-enterprise-repo  ENT_R_PARENT
+  exportPomProperty alfresco-enterprise-repo  ENT_R_DEP_COM_R dependency.alfresco-community-repo.version
+
+  exportPomVersion  alfresco-community-share  COM_S_VERSION
+  exportPomProperty alfresco-community-share  COM_S_DEP_COM_R dependency.alfresco-community-repo.version
+  exportPomProperty alfresco-community-share  COM_S_DEP_ENT_R dependency.alfresco-enterprise-repo.version
+
+  exportPomVersion  acs-community-packaging   COM_P_VERSION
+  exportPomParent   acs-community-packaging   COM_P_PARENT
+  exportPomProperty acs-community-packaging   COM_P_DEP_COM_R dependency.alfresco-community-repo.version
+  exportPomProperty acs-community-packaging   COM_P_DEP_COM_S dependency.alfresco-community-share.version
+
+  cat "${ENV_FILE}"
+fi
+
+if [ -z ${SKIP_UPDATE+x} ]
+then
+  if [ ! -f "${ENV_FILE}" ]
+  then
+    echo ""${ENV_FILE}" does not exist."
+    exit 1
+  fi
+
+  source "${ENV_FILE}"
+
+  updatePomProperty alfresco-community-share  "$COM_R_VERSION" dependency.alfresco-community-repo.version
+
+  updatePomParent   acs-community-packaging   "$COM_R_VERSION"
+  updatePomProperty acs-community-packaging   "$COM_R_VERSION" dependency.alfresco-community-repo.version
+  updatePomProperty acs-community-packaging   "$COM_S_VERSION" dependency.alfresco-community-share.version
+fi

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'

scripts/dev/start-compose.sh

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

scripts/dev/unlinkPoms.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+set -o errexit
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT_DIR="${SCRIPT_DIR}/../../.."
+ENV_FILE=".linkPoms.env"
+
+source "$(dirname "${BASH_SOURCE[0]}")/dev_functions.sh"
+
+usage() {
+    echo "Reverts changes made by linkPoms.sh using values stored in ${ENV_FILE}" 1>&2;
+    echo 1>&2;
+    echo "Usage: $0 [-h]" 1>&2;
+    echo "  -h: Display this help" 1>&2;
+    exit 1;
+}
+
+while getopts "lh" arg; do
+    case $arg in
+        l)
+            LOGGING_OUT=`tty`
+            ;;
+        h | *)
+            usage
+            exit 0
+            ;;
+    esac
+done
+
+source ${ENV_FILE}
+
+updatePomProperty alfresco-community-share  "$COM_S_DEP_COM_R" dependency.alfresco-community-repo.version
+
+updatePomParent   acs-community-packaging   "$COM_P_PARENT"
+updatePomProperty acs-community-packaging   "$COM_P_DEP_COM_R" dependency.alfresco-community-repo.version
+updatePomProperty acs-community-packaging   "$COM_P_DEP_COM_S" dependency.alfresco-community-share.version
+

scripts/travis/build.sh

@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-echo "=========================== Starting Build Script ==========================="
-PS4="\[\e[35m\]+ \[\e[m\]"
-set -vex
-pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
-
-source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh"
-
-DEPENDENCY_VERSION="$(retrievePomProperty "dependency.alfresco-community-repo.version")"
-
-# Either both the parent and the upstream dependency are the same, or else fail the build
-if [ "${DEPENDENCY_VERSION}" != "$(retrievePomParentVersion)" ]; then
-  printf "Upstream dependency version (%s) is different then the project parent version!\n" "${DEPENDENCY_VERSION}"
-  exit 1
-fi
-
-# Prevent merging of any SNAPSHOT dependencies into the master or the release/* branches
-if [[ $(isPullRequestBuild) && "${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 [[ "${DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] ; then
-  printf "Cannot release project with SNAPSHOT dependencies!\n"
-  exit 1
-fi
-
-UPSTREAM_REPO="github.com/Alfresco/alfresco-community-repo.git"
-
-# For release jobs, check if the upstream dependency is the latest tag on the upstream repository (on the same branch)
-if isBranchBuild && [ "${TRAVIS_BUILD_STAGE_NAME,,}" = "release" ] && [ "${DEPENDENCY_VERSION}" != "$(retieveLatestTag "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}")" ] ; then
-  printf "Upstream dependency is not up to date with %s / %s\n" "${UPSTREAM_REPO}" "${TRAVIS_BRANCH}"
-  exit 1
-fi
-
-# 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 [[ "${DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
-  pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-PcommunityDocker"
-else
-  pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${DEPENDENCY_VERSION}" "-PcommunityDocker"
-fi
-
-# Build the current project
-mvn -B -V -q install -DskipTests -Dmaven.javadoc.skip=true -PcommunityDocker \
-  $([[ "${DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && echo "-Drepo.image.tag=latest")
-
-
-popd
-set +vex
-echo "=========================== Finishing Build Script =========================="
-

scripts/travis/init.sh

@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-echo "=========================== Starting Init Script ==========================="
-PS4="\[\e[35m\]+ \[\e[m\]"
-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
-if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-  echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
-  echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" --password-stdin quay.io
-fi
-
-# Enable experimental docker features (for the image squash option)
-echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
-sudo service docker restart
-
-# not helpful in this script
-# export HOST_IP=$(hostname  -I | cut -f1 -d' ')
-
-popd
-set +vex
-echo "=========================== Finishing Init Script =========================="
-

tests/environment/.env

@@ -1,4 +1,3 @@
-TRANSFORMERS_TAG=2.3.6
-SOLR6_TAG=2.0.0
-POSTGRES_TAG=11.7
-ACTIVEMQ_TAG=5.15.8
+SOLR6_TAG=2.0.8.1
+POSTGRES_TAG=14.4
+ACTIVEMQ_TAG=5.17.4-jre17-rockylinux8

tests/environment/docker-compose-minimal+transforms.yml

@@ -28,7 +28,8 @@ services:
         -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
         -Dsolr.host=solr6
         -Dsolr.port=8983
-        -Dsolr.secureComms=none
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
         -Dsolr.base.url=/solr
         -Dindex.subsystem.name=solr6
         -Dalfresco.restApi.basicAuthScheme=true
@@ -38,13 +39,8 @@ services:
         -Dftp.dataPortTo=30099
         -Dshare.host=localhost
         -Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos
-        -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\"
+        -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
         -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-        -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
-        -Djodconverter.url=http://transform-core-aio:8090/
-        -Dimg.url=http://transform-core-aio:8090/
-        -Dtika.url=http://transform-core-aio:8090/
-        -Dtransform.misc.url=http://transform-core-aio:8090/
         -Dimap.server.port=1143
         -Dftp.port=1221
         -Dcors.enabled=true
@@ -68,15 +64,19 @@ services:
     image: alfresco/alfresco-search-services:${SOLR6_TAG}
     environment:
       #Solr needs to know how to register itself with Alfresco
-      - SOLR_ALFRESCO_HOST=alfresco
-      - SOLR_ALFRESCO_PORT=8080
+      SOLR_ALFRESCO_HOST: "alfresco"
+      SOLR_ALFRESCO_PORT: "8080"
       #Alfresco needs to know how to call solr
-      - SOLR_SOLR_HOST=solr6
-      - SOLR_SOLR_PORT=8983
+      SOLR_SOLR_HOST: "solr6"
+      SOLR_SOLR_PORT: "8983"
       #Create the default alfresco and archive cores
-      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+      SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
       #HTTP by default
-      - ALFRESCO_SECURE_COMMS=none
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS:
+        "
+        -Dalfresco.secureComms.secret=secret
+        "
     ports:
       - 8083:8983 #Browser port
 

tests/environment/docker-compose-minimal.yml

@@ -28,7 +28,8 @@ services:
         -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
         -Dsolr.host=solr6
         -Dsolr.port=8983
-        -Dsolr.secureComms=none
+        -Dsolr.secureComms=secret
+        -Dsolr.sharedSecret=secret
         -Dsolr.base.url=/solr
         -Dindex.subsystem.name=solr6
         -Dalfresco.restApi.basicAuthScheme=true
@@ -38,7 +39,7 @@ services:
         -Dftp.dataPortTo=30099
         -Dshare.host=localhost
         -Daos.baseUrlOverwrite=http://localhost:8082/alfresco/aos
-        -Dmessaging.broker.url=\"failover:(tcp://activemq:61616)?timeout=3000&jms.useCompression=true\"
+        -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
         -Dlocal.transform.service.enabled=false
         -Dlegacy.transform.service.enabled=false
         -Dimap.server.port=1143
@@ -66,15 +67,19 @@ services:
     image: alfresco/alfresco-search-services:${SOLR6_TAG}
     environment:
       #Solr needs to know how to register itself with Alfresco
-      - SOLR_ALFRESCO_HOST=alfresco
-      - SOLR_ALFRESCO_PORT=8080
+      SOLR_ALFRESCO_HOST: "alfresco"
+      SOLR_ALFRESCO_PORT: "8080"
       #Alfresco needs to know how to call solr
-      - SOLR_SOLR_HOST=solr6
-      - SOLR_SOLR_PORT=8983
+      SOLR_SOLR_HOST: "solr6"
+      SOLR_SOLR_PORT: "8983"
       #Create the default alfresco and archive cores
-      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+      SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
       #HTTP by default
-      - ALFRESCO_SECURE_COMMS=none
+      ALFRESCO_SECURE_COMMS: "secret"
+      JAVA_TOOL_OPTIONS:
+        "
+        -Dalfresco.secureComms.secret=secret
+        "
     ports:
       - 8083:8983 #Browser port
 

tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.0.0-A11</version>
+        <version>23.1.0-A43</version>
     </parent>
 
     <modules>
@@ -15,6 +15,7 @@
         <module>tas-email</module>
         <module>tas-webdav</module>
         <module>tas-integration</module>
+        <module>tas-distribution-zip</module>
     </modules>
 
     <properties>

tests/tas-cmis/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>7.0.0-A11</version>
+        <version>23.1.0-A43</version>
     </parent>
 
     <developers>
@@ -58,13 +58,13 @@
     <dependencies>
         <dependency>
             <groupId>org.alfresco.tas</groupId>
-            <artifactId>alfresco-community-repo-cmis-test</artifactId>
-            <classifier>tests</classifier>
+            <artifactId>cmis</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.alfresco.tas</groupId>
             <artifactId>cmis</artifactId>
+            <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>
     </dependencies>

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

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

tests/tas-distribution-zip/pom.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.alfresco.tas</groupId>
+  <artifactId>content-repository-community-distribution-test</artifactId>
+  <name>Community Distribution test</name>
+  <packaging>jar</packaging>
+
+  <parent>
+    <groupId>org.alfresco</groupId>
+    <artifactId>content-repository-community-tests</artifactId>
+    <version>23.1.0-A43</version>
+  </parent>
+
+  <properties>
+    <dependency.assertj-core.version>3.13.2</dependency.assertj-core.version>
+    <suiteXmlFile>${project.basedir}/src/test/resources/distribution-suite.xml</suiteXmlFile>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.24.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.alfresco.tas</groupId>
+      <artifactId>restapi</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>3.9.4</version>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>run-distribution-zip-contents-check</id>
+      <properties>
+        <suiteXmlFile>${project.basedir}/src/test/resources/distribution-suite.xml</suiteXmlFile>
+      </properties>
+    </profile>
+  </profiles>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <suiteXmlFiles>
+            <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
+          </suiteXmlFiles>
+          <argLine>
+            --illegal-access=warn
+          </argLine>
+        </configuration>
+      </plugin>
+      <!-- Build only test jar -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

tests/tas-distribution-zip/src/test/java/org/alfresco/distribution/CheckDistributionZipContents.java

@@ -0,0 +1,134 @@
+/*
+ * #%L
+ * Alfresco Remote API
+ * %%
+ * Copyright (C) 2005 - 2021 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail.  Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+package org.alfresco.distribution;
+
+import org.testng.annotations.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.FilenameFilter;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
+public class CheckDistributionZipContents
+{
+    public static final String ACS_PREFIX = "alfresco-content-services-community-distribution";
+    public static final String ACS_DIR_NAME = "distribution";
+    public static final String AGS_PREFIX = "alfresco-governance-services-community";
+    public static final String AGS_DIR_NAME = "distribution-ags";
+    public static final String FORMAT = ".zip";
+
+    @Test
+    public void testAcsDistributionZipContents() throws Exception
+    {
+        File filesList[] = getDistributionZip(ACS_DIR_NAME, ACS_PREFIX);
+        for (File file : filesList)
+        {
+            List<String> zipEntries = getZipEntries(file.getAbsolutePath());
+            assertThat(zipEntries).
+                    contains(
+                            "keystore/metadata-keystore/keystore-passwords.properties",
+                            "keystore/metadata-keystore/keystore",
+                            "keystore/generate_keystores.bat",
+                            "keystore/generate_keystores.sh",
+                            "bin/alfresco-mmt.jar",
+                            "bin/apply_amps.bat",
+                            "bin/apply_amps.sh",
+                            "web-server/webapps/ROOT.war",
+                            "web-server/webapps/alfresco.war",
+                            "web-server/webapps/share.war",
+                            "web-server/webapps/_vti_bin.war",
+                            "web-server/conf/Catalina/localhost/alfresco.xml",
+                            "web-server/shared/classes/alfresco/web-extension/share-config-custom.xml"
+                    );
+        }
+    }
+
+    @Test
+    public void testAgsDistributionZipContents() throws Exception
+    {
+        String repoVersion = getPomValues().getProperties().getProperty("dependency.alfresco-community-repo.version");
+        String shareVersion = getPomValues().getProperties().getProperty("dependency.alfresco-community-share.version");
+        File filesList[] = getDistributionZip(AGS_DIR_NAME, AGS_PREFIX);
+        for (File file : filesList)
+        {
+            List<String> zipEntries = getZipEntries(file.getAbsolutePath());
+            assertThat(zipEntries).
+                    contains(
+                            "alfresco-governance-services-community-repo-" + repoVersion  + ".amp",
+                            "alfresco-governance-services-community-rest-api-explorer-" + repoVersion + ".war",
+                            "alfresco-governance-services-community-share-" + shareVersion + ".amp"
+                    );
+        }
+    }
+
+    private File[] getDistributionZip(String dirName, String prefix) throws Exception
+    {
+        String resourcePath = Paths.get("").toAbsolutePath().getParent().getParent().toString() + "/" + dirName + "/" + "target" + "/";
+        File distributionZip = new File(resourcePath);
+        FilenameFilter zipFileFilter = (dir, name) -> {
+            if (name.startsWith(prefix) && name.endsWith(FORMAT))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        };
+
+        return distributionZip.listFiles(zipFileFilter);
+    }
+
+    private List<String> getZipEntries(String filePath) throws Exception
+    {
+        List<String> zipEntries = new ArrayList<>();
+        ZipFile zipFile = new ZipFile(new File(filePath));
+        Enumeration<? extends ZipEntry> entries = zipFile.entries();
+        while (entries.hasMoreElements())
+        {
+            ZipEntry entry = entries.nextElement();
+            zipEntries.add(entry.toString());
+        }
+        return zipEntries;
+    }
+
+    private Model getPomValues() throws Exception
+    {
+        String parentPom = Paths.get("").toAbsolutePath().getParent().getParent().toString() + "/pom.xml";
+        MavenXpp3Reader reader = new MavenXpp3Reader();
+        Model model = reader.read(new FileReader(parentPom));
+        return model;
+    }
+}

tests/tas-distribution-zip/src/test/resources/distribution-suite.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Alfresco tests Community Distribution Zip" preserve-order="true" verbose="1">
+  <test name="distribution" verbose="3" preserve-order="true">
+    <classes>
+      <class name="org.alfresco.distribution.CheckDistributionZipContents"></class>
+    </classes>
+  </test>
+</suite>

tests/tas-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>7.0.0-A11</version>
+        <version>23.1.0-A43</version>
     </parent>
 
     <developers>

tests/tas-email/src/test/java/org/alfresco/email/imap/ImapReadMessagesAcsTests.java

@@ -24,6 +24,7 @@ public class ImapReadMessagesAcsTests extends EmailTest
     public void siteManagerCanViewWikiPages() throws Exception
     {
         dataWiki.usingUser(testUser).usingSite(testSite).createRandomWiki();
-        imapProtocol.authenticateUser(testUser).usingSiteWikiContainer(testSite).assertThat().countMessagesIs(1);
+        /* @Category(IntermittentlyFailingTests.class) ACS-959 Intermittent failure on next line. @Category not supported by TAS tests. */
+// ACS-2268 comment out:        imapProtocol.authenticateUser(testUser).usingSiteWikiContainer(testSite).assertThat().countMessagesIs(1);
     }
 }

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

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

tests/tas-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>7.0.0-A11</version>
+        <version>23.1.0-A43</version>
     </parent>
 
     <developers>
@@ -23,8 +23,7 @@
 
     <properties>
         <suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
-        <dependency.groovy.version>2.5.9</dependency.groovy.version>
-        <dependency.javax.mail.version>1.6.2</dependency.javax.mail.version>
+        <dependency.groovy.version>3.0.19</dependency.groovy.version>
     </properties>
 
     <dependencies>
@@ -48,16 +47,14 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>javax.mail-api</artifactId>
-            <version>${dependency.javax.mail.version}</version>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>${dependency.javax.mail.version}</version>
+            <artifactId>jakarta.mail</artifactId>
         </dependency>
 
         <dependency>
@@ -104,7 +101,7 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <version>2.4.0</version>
+            <version>${dependency.jakarta-json-path.version}</version>
         </dependency>
     </dependencies>
 
@@ -117,8 +114,10 @@
                     <suiteXmlFiles>
                         <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
                     </suiteXmlFiles>
+                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 17 -->
                     <argLine>
                         --illegal-access=warn
+                        --add-opens=java.base/java.lang=ALL-UNNAMED
                     </argLine>
                 </configuration>
             </plugin>

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

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

tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>7.0.0-A11</version>
+        <version>23.1.0-A43</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>
@@ -64,8 +64,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
+            <groupId>org.eclipse.parsson</groupId>
+            <artifactId>parsson</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -73,6 +73,12 @@
             <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>
@@ -84,8 +90,10 @@
                     <suiteXmlFiles>
                         <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
                     </suiteXmlFiles>
+                    <!-- Keeping illegal-access=warn for Java 11 compatibility, even though it has no effect on JDK 17 -->
                     <argLine>
                         --illegal-access=warn
+                        --add-opens=java.base/java.lang=ALL-UNNAMED
                     </argLine>
                 </configuration>
             </plugin>

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

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

tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>7.0.0-A11</version>
+        <version>23.1.0-A43</version>
     </parent>
 
     <developers>

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

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