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

[release] 7.4.2-A2
Update upstream versions - alfresco-community-repo: 22.7 - alfresco-enterprise-share: 22.4 - acs-packaging: 7.4.2-A2 - RELEASE_VERSION: 7.4.2-A2 - DEVELOPMENT_VERSION: 7.4.2-SNAPSHOT
2026-09-16 18:13:21 +00:00 · 2024-03-22 14:51:00 +00:00 · 2024-03-22 13:53:49 +00:00 · 2024-03-22 08:33:25 +00:00 · 2024-03-22 08:33:23 +00:00 · 2024-03-22 07:33:37 +00:00
29 changed files with 249 additions and 242 deletions
@@ -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"
@@ -28,9 +28,9 @@ 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: 23.3.0-A35
-  DEVELOPMENT_VERSION: 23.3.0-A36-SNAPSHOT
+    # Release version has to start with real version (7.4.2-....) for the docker image to build successfully.
+  RELEASE_VERSION: 7.4.2-A2
+  DEVELOPMENT_VERSION: 7.4.2-SNAPSHOT

 jobs:
  tas_tests:
@@ -116,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@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
@@ -164,7 +133,6 @@ jobs:
    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
@@ -198,7 +166,6 @@ jobs:
        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
@@ -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
@@ -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'
@@ -7,12 +7,13 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</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>
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</version>
    </parent>

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

    <build>
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</version>
    </parent>

    <properties>
@@ -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>
@@ -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>
@@ -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.11
+        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: "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
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</version>
    </parent>

    <properties>
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</version>
    </parent>

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

    <dependencies>
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>content-services-community-docker</artifactId>
-      <version>23.3.0-A35</version>
+      <version>7.4.2-A2</version>
   </parent>

   <properties>
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</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>
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>share-community-docker</artifactId>
-      <version>23.3.0-A35</version>
+      <version>7.4.2-A2</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>
@@ -7,6 +7,6 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>acs-community-packaging</artifactId>
-      <version>23.3.0-A35</version>
+      <version>7.4.2-A2</version>
   </parent>
 </project>
@@ -3,19 +3,19 @@
    <artifactId>acs-community-packaging</artifactId>
    <packaging>pom</packaging>
    <name>Alfresco Content Services Community Packaging</name>
-    <version>23.3.0-A35</version>
+    <version>7.4.2-A2</version>

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

    <properties>
-        <dependency.alfresco-community-repo.version>23.3.0.94</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>23.3.0.81</dependency.alfresco-community-share.version>
-        <dependency.acs-packaging.version>23.3.0-A35</dependency.acs-packaging.version> <!-- for Share distribution zip -->
+        <dependency.alfresco-community-repo.version>22.7</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>22.4</dependency.alfresco-community-share.version>
+        <dependency.acs-packaging.version>7.4.2-A2</dependency.acs-packaging.version> <!-- for Share distribution zip -->

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

    <distributionManagement>
@@ -5,7 +5,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</version>
    </parent>
    <packaging>pom</packaging>

@@ -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
@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.11
-POSTGRES_TAG=15.4
-ACTIVEMQ_TAG=5.18.3-jre17-rockylinux8
+SOLR6_TAG=2.0.7-A5
+POSTGRES_TAG=14.4
+ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</version>
    </parent>

    <modules>
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</version>
    </parent>

    <developers>
@@ -67,11 +67,6 @@
            <classifier>tests</classifier>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>com.epam.reportportal</groupId>
-            <artifactId>agent-java-testng</artifactId>
-            <scope>test</scope>
-        </dependency>
    </dependencies>

    <build>
@@ -9,7 +9,7 @@
  <parent>
    <groupId>org.alfresco</groupId>
    <artifactId>content-repository-community-tests</artifactId>
-    <version>23.3.0-A35</version>
+    <version>7.4.2-A2</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>

@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</version>
    </parent>

    <developers>
@@ -33,12 +33,6 @@
            <scope>test</scope>
        </dependency>

-        <dependency>
-            <groupId>com.epam.reportportal</groupId>
-            <artifactId>agent-java-testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-
        <dependency>
            <groupId>org.alfresco.tas</groupId>
            <artifactId>email</artifactId>
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</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>
@@ -34,12 +34,6 @@
            <scope>test</scope>
        </dependency>

-        <dependency>
-            <groupId>com.epam.reportportal</groupId>
-            <artifactId>agent-java-testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-
        <dependency>
            <groupId>org.alfresco.tas</groupId>
            <artifactId>utility</artifactId>
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</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,17 +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>
-        <dependency>
-            <groupId>com.epam.reportportal</groupId>
-            <artifactId>agent-java-testng</artifactId>
-            <scope>test</scope>
-        </dependency>
    </dependencies>

    <build>
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>23.3.0-A35</version>
+        <version>7.4.2-A2</version>
    </parent>

    <developers>
@@ -37,11 +37,6 @@
            <classifier>tests</classifier>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>com.epam.reportportal</groupId>
-            <artifactId>agent-java-testng</artifactId>
-            <scope>test</scope>
-        </dependency>
    </dependencies>

    <build>
Author	SHA1	Message	Date
alfresco-build	48ab8cd349	[maven-release-plugin][skip ci] prepare release 7.4.2-A2	2024-03-22 14:51:00 +00:00
alfresco-build	c90ad56d5f	[release] 7.4.2-A2 Update upstream versions - alfresco-community-repo: 22.7 - alfresco-enterprise-share: 22.4 - acs-packaging: 7.4.2-A2 - RELEASE_VERSION: 7.4.2-A2 - DEVELOPMENT_VERSION: 7.4.2-SNAPSHOT	2024-03-22 13:53:49 +00:00
alfresco-build	8231909512	[maven-release-plugin][skip ci] prepare for next development iteration	2024-03-22 08:33:25 +00:00
alfresco-build	2af58891d8	[maven-release-plugin][skip ci] prepare release 7.4.2-A1	2024-03-22 08:33:23 +00:00
alfresco-build	5d3e5e4be7	[release] 7.4.2-A1 Update upstream versions - alfresco-community-repo: 22.4 - alfresco-enterprise-share: 22.3 - acs-packaging: 7.4.2-A1 - RELEASE_VERSION: 7.4.2-A1 - DEVELOPMENT_VERSION: 7.4.2-SNAPSHOT	2024-03-22 07:33:37 +00:00
mpichura	d17f124475	Update ServicePack branch to 7.4.2 [skip ci]	2023-08-09 13:19:28 +02:00
alfresco-build	f8c4ca0be4	[maven-release-plugin][skip ci] prepare for next development iteration	2023-08-08 15:11:30 +00:00
alfresco-build	442e4789ca	[maven-release-plugin][skip ci] prepare release 7.4.1	2023-08-08 15:11:28 +00:00
alfresco-build	fdc5cd4016	[release][publish] 7.4.1 Update upstream versions - alfresco-community-repo: 21.14 - alfresco-enterprise-share: 21.16 - acs-packaging: 7.4.1 - RELEASE_VERSION: 7.4.1 - DEVELOPMENT_VERSION: 7.4.2-A1-SNAPSHOT	2023-08-08 13:50:00 +00:00
alfresco-build	598a1f2f84	[release] 7.4.1-A4 Update upstream versions - alfresco-community-repo: 21.14 - alfresco-enterprise-share: 21.16 - acs-packaging: 7.4.1-A4 - RELEASE_VERSION: 7.4.1-A4 - DEVELOPMENT_VERSION: 7.4.1-A5-SNAPSHOT	2023-08-07 23:32:37 +00:00
alfresco-build	fe34b411e7	[release] 7.4.1-A3 Update upstream versions - alfresco-community-repo: 21.11 - alfresco-enterprise-share: 21.12 - acs-packaging: 7.4.1-A3 - RELEASE_VERSION: 7.4.1-A3 - DEVELOPMENT_VERSION: 7.4.1-A4-SNAPSHOT	2023-08-01 14:52:04 +00:00
alfresco-build	6721183427	[release] 7.4.1-A2 Update upstream versions - alfresco-community-repo: 21.10 - alfresco-enterprise-share: 21.11 - acs-packaging: 7.4.1-A2 - RELEASE_VERSION: 7.4.1-A2 - DEVELOPMENT_VERSION: 7.4.1-A3-SNAPSHOT	2023-07-28 20:44:54 +00:00
kmagdziarz	006dac0381	Create ServicePack branch release/7.4.N [skip ci]	2023-05-05 12:39:55 +02:00