[maven-release-plugin][skip ci] prepare for next development iteration

Update upstream versions
    - alfresco-community-repo:   19.30
    - alfresco-enterprise-share: 19.20
    - acs-packaging:             7.3.2.4-A1
    - RELEASE_VERSION:           7.3.2.4-A1
    - DEVELOPMENT_VERSION:       7.3.2.4-A2-SNAPSHOT

.github/workflows/ci.yml

@@ -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 (7.4.0-....) for the docker image to build successfully.
-  RELEASE_VERSION: 7.4.0-A25
-  DEVELOPMENT_VERSION: 7.4.0-A26-SNAPSHOT
+  # Release version has to start with real version (7.3.0-....) for the docker image to build successfully.
+  RELEASE_VERSION: 7.3.2.4-A1
+  DEVELOPMENT_VERSION: 7.3.2.4-A2-SNAPSHOT
 
 jobs:
   tas_tests:
@@ -78,9 +78,9 @@ jobs:
             profiles: all-tas-tests
             compose-file: docker-compose-minimal.yml
     steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -100,9 +100,9 @@ jobs:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip tests]')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -125,22 +125,16 @@ jobs:
       !contains(github.event.head_commit.message, '[skip docker_latest]') && 
       (github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
       github.event_name != 'pull_request'
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000
     steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
           bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh -m
+          bash ./scripts/ci/build.sh
       - name: "Push Docker images"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: mvn -B -ntp -V clean install -DskipTests -Dmaven.javadoc.skip=true -Pags -Ppush-docker-images
@@ -156,24 +150,18 @@ jobs:
       contains(github.event.head_commit.message, '[release]') &&
       (github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
       github.event_name != 'pull_request'
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/free-hosted-runner-disk-space@v7.0.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v7.0.0
       - name: "Init"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
           bash ./scripts/ci/init.sh
-          bash ./scripts/ci/build.sh -m
+          bash ./scripts/ci/build.sh
       - name: "Release"
         timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
         run: |
@@ -183,7 +171,7 @@ jobs:
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
       - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_S3_STAGING_ACCESS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_S3_STAGING_SECRET_KEY }}
@@ -204,10 +192,10 @@ jobs:
       (github.ref_name == 'master' || startsWith(github.ref_name, 'release/')) &&
       github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v3
-      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: actions/checkout@v4
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v7.0.0
       - name: "Configure AWS credentials"
-        uses: aws-actions/configure-aws-credentials@v1
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_S3_RELEASE_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_S3_RELEASE_SECRET_ACCESS_KEY }}

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
@@ -81,7 +81,7 @@ cd ..
 Set any alfresco-global.properties or log4j properties you may need in the following files. They will be copied
 to the `dev/dev-acs-amps-overlay/target` directory. Other customisations may also be placed in the `extension` directory. 
 ~~~
-dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties
+dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j.properties
 dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco-global.properties
 ~~~
 
@@ -121,12 +121,12 @@ mvn install -Prun,withShare -rf dev-acs-amps-overlay
 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`.
+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
@@ -139,6 +139,6 @@ If you have not removed the containers, it is possible to restart the tomcat ins
 a `mvn install` (no `clean`), but this may result in failures if there are incompatibilities
 between the code, database and content in `dev/dev-acs-amps-overlay/target/dev-instance/runtime/alf_data`.
 Any changes made to alfresco-global properties or log4j will not be picked up, unless you
-directly edit `dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties`
+directly edit `dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco/extension/custom-log4j.properties`
 and `dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco-global.properties`, but they will be thrown away
 on the next `mvn clean`.

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

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

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.4.0-A25</version>
+        <version>7.3.2.4-A2-SNAPSHOT</version>
     </parent>
 
     <build>

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

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.4.0-A25</version>
+        <version>7.3.2.4-A2-SNAPSHOT</version>
     </parent>
 
     <build>

dev/dev-tomcat/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.4.0-A25</version>
+        <version>7.3.2.4-A2-SNAPSHOT</version>
     </parent>
 
     <properties>

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

@@ -0,0 +1,20 @@
+log4j.logger.org.alfresco.repo.content.transform.TransformerDebug=debug
+
+#log4j.logger.org.alfresco.util.exec.RuntimeExecBootstrapBean=debug
+#log4j.logger.org.alfresco.util.exec.RuntimeExec=debug
+
+#log4j.logger.org.alfresco.repo.rendition2=debug
+#log4j.logger.org.alfresco.repo.content.metadata=debug
+#log4j.logger.org.alfresco.repo.rendition2.LocalTransformClient=debug
+#log4j.logger.org.alfresco.repo.rendition.RenditionServiceImpl=debug
+#log4j.logger.org.alfresco.enterprise.repo.rendition2.RemoteTransformClient=debug
+
+#log4j.logger.org.alfresco.repo.content.transform.LocalTransformServiceRegistry=debug
+#log4j.logger.org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl=debug
+#log4j.logger.org.alfresco.repo.content.MimetypeMap=debug
+#log4j.logger.org.alfresco.repo.content.transform.LocalTransform=debug
+
+#log4j.logger.org.alfresco.repo.rawevents=debug
+
+#log4j.logger.org.alfresco.repo.jscript.RhinoScriptProcessor=debug
+#log4j.logger.RhinoScriptProcessor.calls=debug

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

@@ -1,36 +0,0 @@
-
-logger.alfresco-repo-content-transform-TransformerDebug.name=org.alfresco.repo.content.transform.TransformerDebug
-logger.alfresco-repo-content-transform-TransformerDebug.level=debug
-
-#logger.alfresco-util-exec-RuntimeExecBootstrapBean.name=org.alfresco.util.exec.RuntimeExecBootstrapBean
-#logger.alfresco-util-exec-RuntimeExecBootstrapBean.level=debug
-#logger.alfresco-util-exec-RuntimeExec.name=org.alfresco.util.exec.RuntimeExec
-#logger.alfresco-util-exec-RuntimeExec.level=debug
-
-#logger.alfresco-repo-rendition2.name=org.alfresco.repo.rendition2
-#logger.alfresco-repo-rendition2.level=debug
-#logger.alfresco-repo-content-metadata.name=org.alfresco.repo.content.metadata
-#logger.alfresco-repo-content-metadata.level=debug
-#logger.alfresco-repo-rendition2-LocalTransformClient.name=org.alfresco.repo.rendition2.LocalTransformClient
-#logger.alfresco-repo-rendition2-LocalTransformClient.level=debug
-#logger.alfresco-repo-rendition-RenditionServiceImpl.name=org.alfresco.repo.rendition.RenditionServiceImpl
-#logger.alfresco-repo-rendition-RenditionServiceImpl.level=debug
-#logger.alfresco-enterprise-repo-rendition2-RemoteTransformClient.name=org.alfresco.enterprise.repo.rendition2.RemoteTransformClient
-#logger.alfresco-enterprise-repo-rendition2-RemoteTransformClient.level=debug
-
-#logger.alfresco-repo-content-transform-LocalTransformServiceRegistry.name=org.alfresco.repo.content.transform.LocalTransformServiceRegistry
-#logger.alfresco-repo-content-transform-LocalTransformServiceRegistry.level=debug
-#logger.alfresco-repo-rendition2-RenditionDefinitionRegistry2Impl.name=org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl
-#logger.alfresco-repo-rendition2-RenditionDefinitionRegistry2Impl.level=debug
-#logger.alfresco-repo-content-MimetypeMap.name=org.alfresco.repo.content.MimetypeMap
-#logger.alfresco-repo-content-MimetypeMap.level=debug
-#logger.alfresco-repo-content-transform-LocalTransform.name=org.alfresco.repo.content.transform.LocalTransform
-#logger.alfresco-repo-content-transform-LocalTransform.level=debug
-
-#logger.alfresco-repo-rawevents.name=org.alfresco.repo.rawevents
-#logger.alfresco-repo-rawevents.level=debug
-
-#logger.alfresco-repo-jscript-RhinoScriptProcessor.name=org.alfresco.repo.jscript.RhinoScriptProcessor
-#logger.alfresco-repo-jscript-RhinoScriptProcessor.level=debug
-#logger.calls.name=RhinoScriptProcessor.calls
-#logger.calls.level=debug

dev/docker-compose.yml

@@ -25,7 +25,7 @@ services:
             - 5432:5432
 
     solr6:
-        image: alfresco/alfresco-search-services:2.0.3
+        image: alfresco/alfresco-search-services:2.0.11
         mem_limit: 2g
         environment:
             #Solr needs to know how to register itself with Alfresco

dev/pom.xml

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

distribution-ags/pom.xml

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

distribution/pom.xml

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

docker-alfresco/Dockerfile

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

docker-alfresco/ags/Dockerfile

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

docker-alfresco/ags/pom.xml

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

docker-alfresco/pom.xml

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

docker-share/ags/Dockerfile

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

docker-share/ags/pom.xml

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

docker-share/pom.xml

@@ -7,6 +7,6 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>acs-community-packaging</artifactId>
-      <version>7.4.0-A25</version>
+      <version>7.3.2.4-A2-SNAPSHOT</version>
    </parent>
 </project>

pom.xml

@@ -3,19 +3,19 @@
     <artifactId>acs-community-packaging</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>7.4.0-A25</version>
+    <version>7.3.2.4-A2-SNAPSHOT</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>20.121</version>
+        <version>19.30</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-community-repo.version>20.121</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>20.112</dependency.alfresco-community-share.version>
-        <dependency.acs-packaging.version>7.4.0-A25</dependency.acs-packaging.version> <!-- for Share distribution zip -->
+        <dependency.alfresco-community-repo.version>19.30</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>19.20</dependency.alfresco-community-share.version>
+        <dependency.acs-packaging.version>7.3.2.4-A1</dependency.acs-packaging.version> <!-- for Share distribution zip -->
 
         <repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
         <share.image.tag>${dependency.alfresco-community-share.version}</share.image.tag>
@@ -25,7 +25,7 @@
         <connection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/acs-community-packaging.git</developerConnection>
         <url>https://github.com/Alfresco/acs-community-packaging</url>
-        <tag>7.4.0-A25</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
@@ -193,12 +193,7 @@
             </dependency>
             <dependency>
                 <groupId>org.alfresco.tas</groupId>
-                <artifactId>restapi</artifactId>
-                <version>${dependency.alfresco-community-repo.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.alfresco.tas</groupId>
-                <artifactId>restapi</artifactId>
+                <artifactId>alfresco-community-repo-restapi-test</artifactId>
                 <version>${dependency.alfresco-community-repo.version}</version>
                 <classifier>tests</classifier>
                 <scope>test</scope>

public-javadoc/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.0-A25</version>
+        <version>7.3.2.4-A2-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

scripts/ci/build.sh

@@ -6,28 +6,6 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
 
 source "$(dirname "${BASH_SOURCE[0]}")/build_functions.sh"
 
-usage() {
-    echo "Builds the upstream projects first, then the current one." 1>&2;
-    echo 1>&2;
-    echo "Usage: $0 [-m]" 1>&2;
-    echo "  -m: Flag to build Docker images with multi-architecture" 1>&2;
-    echo "  -h: Display the usage information" 1>&2;
-    exit 1;
-}
-
-while getopts "mh" option; do
-   case $option in
-      m)
-        DOCKER_BUILD_PROFILE=build-multiarch-docker-images
-        ;;
-      h)
-        usage
-        ;;
-   esac
-done
-
-BUILD_PROFILE=${DOCKER_BUILD_PROFILE:-build-docker-images}
-
 COM_DEPENDENCY_VERSION="$(retrievePomProperty "dependency.alfresco-community-repo.version")"
 REPO_IMAGE=$([[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && echo "-Drepo.image.tag=latest" || echo)
 
@@ -54,9 +32,9 @@ UPSTREAM_REPO="github.com/Alfresco/alfresco-community-repo.git"
 # Search, checkout and build the same branch on the upstream project in case of SNAPSHOT dependencies
 # Otherwise, checkout the upstream tag and build its Docker image (use just "mvn package", without "mvn install")
 if [[ "${COM_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
-  pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true"
+  pullAndBuildSameBranchOnUpstream "${UPSTREAM_REPO}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
 else
-  pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true"
+  pullUpstreamTagAndBuildDockerImage "${UPSTREAM_REPO}" "${COM_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true"
 fi
 
 SHARE_DEPENDENCY_VERSION="$(retrievePomProperty "dependency.alfresco-community-share.version")"
@@ -75,15 +53,23 @@ if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] && [ "${JOB_NAME,,}" = "
 fi
 
 SHARE_UPSTREAM_REPO="github.com/Alfresco/alfresco-community-share.git"
+# Temporarily opening reflective access during compilation for community-share
+# This could be removed once community-share will become Java 17 compliant
+# (Maven plugins included e.g.: maven-war-plugin)
+export MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED \
+--add-opens=java.base/java.lang=ALL-UNNAMED \
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+--add-opens=java.base/java.text=ALL-UNNAMED \
+--add-opens=java.desktop/java.awt.font=ALL-UNNAMED"
 # Checkout the upstream share project (tag or branch; + build if the latter)
 if [[ "${SHARE_DEPENDENCY_VERSION}" =~ ^.+-SNAPSHOT$ ]] ; then
-  pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
+  pullAndBuildSameBranchOnUpstream "${SHARE_UPSTREAM_REPO}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER ${REPO_IMAGE} -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
 else
-  pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-P$BUILD_PROFILE -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
+  pullUpstreamTagAndBuildDockerImage "${SHARE_UPSTREAM_REPO}" "${SHARE_DEPENDENCY_VERSION}" "-Pbuild-docker-images -Pags -Dlicense.failOnNotUptodateHeader=true -Ddocker.quay-expires.value=NEVER -Ddependency.alfresco-community-repo.version=${COM_DEPENDENCY_VERSION}"
 fi
 
 # Build the current project
-mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -P$BUILD_PROFILE -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
+mvn -B -ntp -V -q install -DskipTests -Dmaven.javadoc.skip=true -Pbuild-docker-images -Pags ${REPO_IMAGE} ${SHARE_IMAGE}
 
 
 popd

scripts/dev/prepare_buildx.sh

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

scripts/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

tests/environment/.env

@@ -1,3 +1,3 @@
-SOLR6_TAG=2.0.3
+SOLR6_TAG=2.0.11
 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>7.4.0-A25</version>
+        <version>7.3.2.4-A2-SNAPSHOT</version>
     </parent>
 
     <modules>

tests/tas-cmis/pom.xml

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

tests/tas-cmis/src/test/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

tests/tas-cmis/src/test/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

tests/tas-distribution-zip/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.alfresco</groupId>
     <artifactId>content-repository-community-tests</artifactId>
-    <version>7.4.0-A25</version>
+    <version>7.3.2.4-A2-SNAPSHOT</version>
   </parent>
 
   <properties>

tests/tas-email/pom.xml

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

tests/tas-email/src/test/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

tests/tas-email/src/test/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

tests/tas-integration/pom.xml

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

tests/tas-integration/src/test/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

tests/tas-integration/src/test/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

tests/tas-restapi/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-community-tests</artifactId>
-        <version>7.4.0-A25</version>
+        <version>7.3.2.4-A2-SNAPSHOT</version>
     </parent>
 
     <developers>
@@ -49,7 +49,7 @@
     <dependencies>
         <dependency>
             <groupId>org.alfresco.tas</groupId>
-            <artifactId>restapi</artifactId>
+            <artifactId>alfresco-community-repo-restapi-test</artifactId>
             <classifier>tests</classifier>
             <scope>test</scope>
         </dependency>

tests/tas-restapi/src/test/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

tests/tas-restapi/src/test/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10

tests/tas-webdav/pom.xml

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

tests/tas-webdav/src/test/resources/log4j.properties

@@ -0,0 +1,26 @@
+# Root logger option
+log4j.rootLogger=INFO, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=./target/reports/alfresco-tas.log
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# TestRail particular log file
+# Direct log messages to a log file
+log4j.appender.testrailLog=org.apache.log4j.RollingFileAppender
+log4j.appender.testrailLog.File=./target/reports/alfresco-testrail.log
+log4j.appender.testrailLog.MaxBackupIndex=10
+log4j.appender.testrailLog.layout=org.apache.log4j.PatternLayout
+log4j.appender.testrailLog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+log4j.category.testrail=INFO, testrailLog
+log4j.additivity.testrail=false

tests/tas-webdav/src/test/resources/log4j2.properties

@@ -1,42 +0,0 @@
-# Root logger option
-rootLogger.level=info
-rootLogger.appenderRef.stdout.ref=ConsoleAppender
-rootLogger.appenderRef.rolling.ref=RollingAppender
-
-###### File appender definition #######
-appender.rolling.type=RollingFile
-appender.rolling.name=RollingAppender
-appender.rolling.fileName=./target/reports/alfresco-tas.log
-appender.rolling.filePattern=./target/reports/alfresco-tas.log.%i
-appender.rolling.layout.type=PatternLayout
-appender.rolling.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type=SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size=10MB
-appender.rolling.strategy.type=DefaultRolloverStrategy
-appender.rolling.strategy.max=10
-
-###### Console appender definition #######
-appender.console.type=Console
-appender.console.name=ConsoleAppender
-appender.console.layout.type=PatternLayout
-appender.console.layout.pattern=[%t] %d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-
-# TestRail particular log file
-# Direct log messages to a log file
-logger.testrail.name=testrail
-logger.testrail.level=info
-logger.testrail.additivity=false
-logger.testrail.appenderRef.testrail.ref=TestrailAppender
-
-appender.testrail.name=TestrailAppender
-appender.testrail.type=RollingFile
-appender.testrail.fileName=./target/reports/alfresco-testrail.log
-appender.testrail.filePattern=./target/reports/alfresco-testrail.log.%i
-appender.testrail.layout.type=PatternLayout
-appender.testrail.layout.pattern=%d{HH:mm:ss} %-5p %c{1}:%L - %replace{%m}{[\r\n]+}{}%n
-appender.testrail.policies.type=Policies
-appender.testrail.policies.size.type=SizeBasedTriggeringPolicy
-appender.testrail.policies.size.size=10MB
-appender.testrail.strategy.type=DefaultRolloverStrategy
-appender.testrail.strategy.max=10