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

Update upstream versions
    - alfresco-community-repo:   22.14
    - alfresco-enterprise-share: 22.6
    - acs-packaging:             7.4.2-A5
    - RELEASE_VERSION:           7.4.2-A5
    - DEVELOPMENT_VERSION:       7.4.2-A6-SNAPSHOT

.github/dependabot.yml

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

.github/workflows/ci.yml

@@ -28,23 +28,11 @@ env:
   QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
   TAS_ENVIRONMENT: ./tests/environment
   TAS_SCRIPTS: ../alfresco-community-repo/packaging/tests/scripts
-    # Release version has to start with real version (23.2.0-....) for the docker image to build successfully.
-  RELEASE_VERSION: 25.2.0
-  DEVELOPMENT_VERSION: 25.3.0-A.1-SNAPSHOT
+    # Release version has to start with real version (7.4.2-....) for the docker image to build successfully.
+  RELEASE_VERSION: 7.4.2-A5
+  DEVELOPMENT_VERSION: 7.4.2-A6-SNAPSHOT
 
 jobs:
-  precommit:
-    name: Pre-Commit checks
-    runs-on: ubuntu-latest
-    if: >
-      !contains(github.event.head_commit.message, '[skip tests]')
-    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v8.16.0
-
   tas_tests:
     name: ${{ matrix.testSuite }} TAS tests
     runs-on: ubuntu-latest
@@ -90,9 +78,9 @@ jobs:
             profiles: all-tas-tests
             compose-file: docker-compose-minimal.yml
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+      - 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: |
@@ -112,9 +100,9 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip tests]')"
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+      - 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: |
@@ -128,37 +116,6 @@ jobs:
       - 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@v4
-        with:
-          persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
-      - 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
@@ -174,12 +131,11 @@ jobs:
         ports:
           - 5000:5000
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -206,14 +162,13 @@ jobs:
         ports:
           - 5000:5000
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -228,7 +183,7 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
       - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@v4
+        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 }}
@@ -249,10 +204,10 @@ jobs:
       (github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
       - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@v4
+        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 }}

.github/workflows/precommit_formatter.yml

@@ -1,39 +0,0 @@
-name: Pre-Commit formatter
-
-on:
-  push:
-    branches:
-      - precommit/**
-
-env:
-  MAVEN_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-  MAVEN_USERNAME: ${{ secrets.NEXUS_USERNAME }}
-
-jobs:
-  format-code:
-    name: "Reformat code"
-    runs-on: ubuntu-latest
-    if: contains(github.event.head_commit.message, '[reformat code]')
-    steps:
-      - uses: actions/checkout@v4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v8.16.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v8.16.0
-      - name: Set up Python ${{ inputs.python-version }}
-        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
-        with:
-          python-version: "3.9"
-      - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
-        continue-on-error: true
-        with:
-          extra_args: --all-files
-      - name: Update secrets baseline
-        run: pip install detect-secrets && detect-secrets scan --baseline .secrets.baseline
-      - uses: Alfresco/alfresco-build-tools/.github/actions/git-commit-changes@v8.16.0
-        with:
-          username: ${{ secrets.BOT_GITHUB_USERNAME }}
-          add-options: -u
-          commit-message: "Apply Pre-Commit code formatting"
-          skip-if-no-changes: true
-      - name: Push changes
-        run: git push

.pre-commit-config.yaml

@@ -1,14 +0,0 @@
-repos:
-  - repo: https://github.com/Yelp/detect-secrets
-    rev: v1.5.0
-    hooks:
-      - id: detect-secrets
-        args: ["--baseline", ".secrets.baseline"]
-  - repo: local
-    hooks:
-      - id: check-format-and-headers
-        name: Check format and headers and fix if necessary
-        entry: ./scripts/hooks/check-format-and-headers.sh
-        language: script
-        files: ".*.java"
-        pass_filenames: false

.secrets.baseline

@@ -1,292 +0,0 @@
-{
-  "version": "1.5.0",
-  "plugins_used": [
-    {
-      "name": "ArtifactoryDetector"
-    },
-    {
-      "name": "AWSKeyDetector"
-    },
-    {
-      "name": "AzureStorageKeyDetector"
-    },
-    {
-      "name": "Base64HighEntropyString",
-      "limit": 4.5
-    },
-    {
-      "name": "BasicAuthDetector"
-    },
-    {
-      "name": "CloudantDetector"
-    },
-    {
-      "name": "DiscordBotTokenDetector"
-    },
-    {
-      "name": "GitHubTokenDetector"
-    },
-    {
-      "name": "GitLabTokenDetector"
-    },
-    {
-      "name": "HexHighEntropyString",
-      "limit": 3.0
-    },
-    {
-      "name": "IbmCloudIamDetector"
-    },
-    {
-      "name": "IbmCosHmacDetector"
-    },
-    {
-      "name": "IPPublicDetector"
-    },
-    {
-      "name": "JwtTokenDetector"
-    },
-    {
-      "name": "KeywordDetector",
-      "keyword_exclude": ""
-    },
-    {
-      "name": "MailchimpDetector"
-    },
-    {
-      "name": "NpmDetector"
-    },
-    {
-      "name": "OpenAIDetector"
-    },
-    {
-      "name": "PrivateKeyDetector"
-    },
-    {
-      "name": "PypiTokenDetector"
-    },
-    {
-      "name": "SendGridDetector"
-    },
-    {
-      "name": "SlackDetector"
-    },
-    {
-      "name": "SoftlayerDetector"
-    },
-    {
-      "name": "SquareOAuthDetector"
-    },
-    {
-      "name": "StripeDetector"
-    },
-    {
-      "name": "TelegramBotTokenDetector"
-    },
-    {
-      "name": "TwilioKeyDetector"
-    }
-  ],
-  "filters_used": [
-    {
-      "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
-    },
-    {
-      "path": "detect_secrets.filters.common.is_baseline_file",
-      "filename": ".secrets.baseline"
-    },
-    {
-      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
-      "min_level": 2
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_indirect_reference"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_likely_id_string"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_lock_file"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_potential_uuid"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_sequential_string"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_swagger_file"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_templated_secret"
-    }
-  ],
-  "results": {
-    "dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco-global.properties": [
-      {
-        "type": "Secret Keyword",
-        "filename": "dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco-global.properties",
-        "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b",
-        "is_verified": false,
-        "line_number": 8
-      }
-    ],
-    "dev/dev-tomcat/src/main/tomcat/tomcat-users.xml": [
-      {
-        "type": "Secret Keyword",
-        "filename": "dev/dev-tomcat/src/main/tomcat/tomcat-users.xml",
-        "hashed_secret": "2be88ca4242c76e8253ac62474851065032d6833",
-        "is_verified": false,
-        "line_number": 19
-      }
-    ],
-    "dev/docker-compose.yml": [
-      {
-        "type": "Secret Keyword",
-        "filename": "dev/docker-compose.yml",
-        "hashed_secret": "d1ebbc78705ad98aa2c8fb357d2e30c8f001673a",
-        "is_verified": false,
-        "line_number": 41
-      }
-    ],
-    "tests/environment/docker-compose-minimal+transforms.yml": [
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/environment/docker-compose-minimal+transforms.yml",
-        "hashed_secret": "9e3d103f7aa5f4f778cf752087dfceeba15d4fef",
-        "is_verified": false,
-        "line_number": 13
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/environment/docker-compose-minimal+transforms.yml",
-        "hashed_secret": "92cda941553ea9ba9b39716c79a46b08a740613c",
-        "is_verified": false,
-        "line_number": 23
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/environment/docker-compose-minimal+transforms.yml",
-        "hashed_secret": "d1ebbc78705ad98aa2c8fb357d2e30c8f001673a",
-        "is_verified": false,
-        "line_number": 76
-      }
-    ],
-    "tests/environment/docker-compose-minimal.yml": [
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/environment/docker-compose-minimal.yml",
-        "hashed_secret": "9e3d103f7aa5f4f778cf752087dfceeba15d4fef",
-        "is_verified": false,
-        "line_number": 13
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/environment/docker-compose-minimal.yml",
-        "hashed_secret": "92cda941553ea9ba9b39716c79a46b08a740613c",
-        "is_verified": false,
-        "line_number": 23
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/environment/docker-compose-minimal.yml",
-        "hashed_secret": "d1ebbc78705ad98aa2c8fb357d2e30c8f001673a",
-        "is_verified": false,
-        "line_number": 79
-      }
-    ],
-    "tests/tas-cmis/src/test/resources/default.properties": [
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-cmis/src/test/resources/default.properties",
-        "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
-        "is_verified": false,
-        "line_number": 8
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-cmis/src/test/resources/default.properties",
-        "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b",
-        "is_verified": false,
-        "line_number": 84
-      }
-    ],
-    "tests/tas-email/src/test/resources/default.properties": [
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-email/src/test/resources/default.properties",
-        "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
-        "is_verified": false,
-        "line_number": 8
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-email/src/test/resources/default.properties",
-        "hashed_secret": "43b7ed74f99cf021109506832a48aa75435b817d",
-        "is_verified": false,
-        "line_number": 35
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-email/src/test/resources/default.properties",
-        "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b",
-        "is_verified": false,
-        "line_number": 97
-      }
-    ],
-    "tests/tas-integration/src/test/resources/default.properties": [
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-integration/src/test/resources/default.properties",
-        "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
-        "is_verified": false,
-        "line_number": 8
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-integration/src/test/resources/default.properties",
-        "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b",
-        "is_verified": false,
-        "line_number": 118
-      }
-    ],
-    "tests/tas-restapi/src/test/resources/default.properties": [
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-restapi/src/test/resources/default.properties",
-        "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
-        "is_verified": false,
-        "line_number": 21
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-restapi/src/test/resources/default.properties",
-        "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b",
-        "is_verified": false,
-        "line_number": 87
-      }
-    ],
-    "tests/tas-webdav/src/test/resources/default.properties": [
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-webdav/src/test/resources/default.properties",
-        "hashed_secret": "d033e22ae348aeb5660fc2140aec35850c4da997",
-        "is_verified": false,
-        "line_number": 8
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "tests/tas-webdav/src/test/resources/default.properties",
-        "hashed_secret": "a4a747bd4ba5e3a5049cad116881867c71fb625b",
-        "is_verified": false,
-        "line_number": 73
-      }
-    ]
-  },
-  "generated_at": "2025-03-18T15:20:48Z"
-}

dev/README.md

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

dev/aliases

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

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

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

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

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <build>

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

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <build>

dev/dev-tomcat/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <properties>

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

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

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

@@ -20,7 +20,7 @@ db.create.command=create database ${db.name}
 #db.name=alfresco
 #db.username=alfresco
 #db.password=alfresco
-#db.driver=com.mysql.cj.jdbc.Driver
+#db.driver=com.mysql.jdbc.Driver
 #db.url=jdbc:mysql://localhost/${db.name}?useUnicode=true&characterEncoding=UTF-8
 #db.master.url=jdbc:mysql://localhost/
 #db.master.username=${db.username}

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

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

dev/docker-compose.yml

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

dev/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <properties>

distribution-ags/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <dependencies>

distribution/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <dependencies>

docker-alfresco/ags/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>content-services-community-docker</artifactId>
-      <version>25.2.0</version>
+      <version>7.4.2-A5</version>
    </parent>
 
    <properties>

docker-alfresco/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <properties>
@@ -119,9 +119,6 @@
                                                 <platform>linux/amd64</platform>
                                                 <platform>linux/arm64</platform>
                                             </platforms>
-                                            <attestations>
-                                                <provenance>false</provenance>
-                                            </attestations>
                                         </buildx>
                                         <dockerFileDir>${project.basedir}</dockerFileDir>
                                         <args>
@@ -188,9 +185,6 @@
                                                 <platform>linux/amd64</platform>
                                                 <platform>linux/arm64</platform>
                                             </platforms>
-                                            <attestations>
-                                                <provenance>false</provenance>
-                                            </attestations>
                                         </buildx>
                                         <dockerFileDir>${project.basedir}</dockerFileDir>
                                         <args>
@@ -261,9 +255,6 @@
                                                         <platform>linux/amd64</platform>
                                                         <platform>linux/arm64</platform>
                                                     </platforms>
-                                                    <attestations>
-                                                        <provenance>false</provenance>
-                                                    </attestations>
                                                 </buildx>
                                                 <dockerFileDir>${project.basedir}</dockerFileDir>
                                                 <args>
@@ -293,9 +284,6 @@
                                                         <platform>linux/amd64</platform>
                                                         <platform>linux/arm64</platform>
                                                     </platforms>
-                                                    <attestations>
-                                                        <provenance>false</provenance>
-                                                    </attestations>
                                                 </buildx>
                                                 <dockerFileDir>${project.basedir}</dockerFileDir>
                                                 <args>

docker-share/ags/pom.xml

@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>share-community-docker</artifactId>
-      <version>25.2.0</version>
+      <version>7.4.2-A5</version>
    </parent>
 
    <properties>
@@ -101,9 +101,6 @@
                                     <platform>linux/amd64</platform>
                                     <platform>linux/arm64</platform>
                                  </platforms>
-                                 <attestations>
-                                    <provenance>false</provenance>
-                                 </attestations>
                               </buildx>
                               <dockerFileDir>${project.basedir}</dockerFileDir>
                               <args>
@@ -170,9 +167,6 @@
                                     <platform>linux/amd64</platform>
                                     <platform>linux/arm64</platform>
                                  </platforms>
-                                 <attestations>
-                                    <provenance>false</provenance>
-                                 </attestations>
                               </buildx>
                               <dockerFileDir>${project.basedir}</dockerFileDir>
                               <args>
@@ -243,9 +237,6 @@
                                           <platform>linux/amd64</platform>
                                           <platform>linux/arm64</platform>
                                        </platforms>
-                                       <attestations>
-                                          <provenance>false</provenance>
-                                       </attestations>
                                     </buildx>
                                     <dockerFileDir>${project.basedir}</dockerFileDir>
                                     <args>
@@ -275,9 +266,6 @@
                                           <platform>linux/amd64</platform>
                                           <platform>linux/arm64</platform>
                                        </platforms>
-                                       <attestations>
-                                          <provenance>false</provenance>
-                                       </attestations>
                                     </buildx>
                                     <dockerFileDir>${project.basedir}</dockerFileDir>
                                     <args>

docker-share/pom.xml

@@ -7,6 +7,6 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>acs-community-packaging</artifactId>
-      <version>25.2.0</version>
+      <version>7.4.2-A5</version>
    </parent>
 </project>

pom.xml

@@ -3,19 +3,19 @@
     <artifactId>acs-community-packaging</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>25.2.0</version>
+    <version>7.4.2-A5</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>25.2.0.64</version>
+        <version>22.14</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-community-repo.version>25.2.0.64</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>25.2.0.46</dependency.alfresco-community-share.version>
-        <dependency.acs-packaging.version>25.2.0</dependency.acs-packaging.version> <!-- for Share distribution zip -->
+        <dependency.alfresco-community-repo.version>22.14</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>22.6</dependency.alfresco-community-share.version>
+        <dependency.acs-packaging.version>7.4.2-A5</dependency.acs-packaging.version> <!-- for Share distribution zip -->
 
         <repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
         <share.image.tag>${dependency.alfresco-community-share.version}</share.image.tag>
@@ -25,7 +25,7 @@
         <connection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</developerConnection>
         <url>https://github.com/Alfresco/acs-community-packaging</url>
-        <tag>25.2.0</tag>
+        <tag>7.4.2-A5</tag>
     </scm>
 
     <distributionManagement>
@@ -247,13 +247,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.diffplug.spotless</groupId>
-                <artifactId>spotless-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>

public-javadoc/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
     <packaging>pom</packaging>
 

scripts/dev/start-compose.sh

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

scripts/hooks/check-format-and-headers.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set +x
-
-mvn spotless:apply validate -DlicenseUpdateHeaders=true -Pags,all-tas-tests > /dev/null || true
-
-set -x

tests/environment/.env

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.16-A.2
-POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
+SOLR6_TAG=2.0.10-A1
+POSTGRES_TAG=14.4
+ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8

tests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <modules>

tests/tas-cmis/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <developers>

tests/tas-distribution-zip/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.alfresco</groupId>
     <artifactId>content-repository-community-tests</artifactId>
-    <version>25.2.0</version>
+    <version>7.4.2-A5</version>
   </parent>
 
   <properties>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.26.3</version>
+      <version>3.23.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>3.9.4</version>
+      <version>3.8.6</version>
     </dependency>
   </dependencies>
 

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

@@ -1,128 +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 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;
-import org.testng.annotations.Test;
-
-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",
-                    "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;
-    }
-}
+/*
+ * #%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-email/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <developers>

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

@@ -1,31 +1,30 @@
-package org.alfresco.email.imap;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import org.alfresco.email.EmailTest;
-import org.alfresco.utility.model.*;
-import org.alfresco.utility.testrail.ExecutionType;
-import org.alfresco.utility.testrail.annotation.TestRail;
-
-public class ImapReadMessagesAcsTests extends EmailTest
-{
-    @BeforeClass(alwaysRun = true)
-    public void dataPreparation() throws Exception
-    {
-        testUser = dataUser.createRandomTestUser();
-        testSite = dataSite.usingUser(testUser).createIMAPSite();
-        adminUser = dataUser.getAdminUser();
-        adminSite = dataSite.usingAdmin().createIMAPSite();
-    }
-
-    @TestRail(section = {TestGroup.PROTOCOLS, TestGroup.IMAP}, executionType = ExecutionType.REGRESSION,
-            description = "Verify that site manager can see wiki pages via IMAP")
-    @Test(groups = {TestGroup.PROTOCOLS, TestGroup.IMAP, TestGroup.CORE})
-    public void siteManagerCanViewWikiPages() throws Exception
-    {
-        dataWiki.usingUser(testUser).usingSite(testSite).createRandomWiki();
-        /* @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);
-    }
-}
+package org.alfresco.email.imap;
+
+import org.alfresco.email.EmailTest;
+import org.alfresco.utility.model.*;
+import org.alfresco.utility.testrail.ExecutionType;
+import org.alfresco.utility.testrail.annotation.TestRail;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class ImapReadMessagesAcsTests extends EmailTest
+{
+    @BeforeClass(alwaysRun=true)
+    public void dataPreparation() throws Exception
+    {
+        testUser = dataUser.createRandomTestUser();
+        testSite = dataSite.usingUser(testUser).createIMAPSite();
+        adminUser = dataUser.getAdminUser();
+        adminSite = dataSite.usingAdmin().createIMAPSite();
+    }
+
+    @TestRail(section = { TestGroup.PROTOCOLS, TestGroup.IMAP }, executionType = ExecutionType.REGRESSION,
+            description = "Verify that site manager can see wiki pages via IMAP")
+    @Test(groups = { TestGroup.PROTOCOLS, TestGroup.IMAP, TestGroup.CORE })
+    public void siteManagerCanViewWikiPages() throws Exception
+    {
+        dataWiki.usingUser(testUser).usingSite(testSite).createRandomWiki();
+        /* @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-integration/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <developers>
@@ -23,7 +23,7 @@
 
     <properties>
         <suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
-        <dependency.groovy.version>3.0.22</dependency.groovy.version>
+        <dependency.groovy.version>3.0.12</dependency.groovy.version>
     </properties>
 
     <dependencies>

tests/tas-restapi/pom.xml

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

tests/tas-webdav/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>25.2.0</version>
+        <version>7.4.2-A5</version>
     </parent>
 
     <developers>