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

[release] 23.1.0-A21
Update upstream versions - alfresco-community-repo: 23.1.0.167 - alfresco-enterprise-share: 23.1.0.170 - acs-packaging: 23.1.0-A21 - RELEASE_VERSION: 23.1.0-A21 - DEVELOPMENT_VERSION: 23.1.0-A22-SNAPSHOT
2025-09-10 14:12:09 +00:00 · 2023-07-23 03:12:23 +00:00 · 2023-07-23 01:53:04 +00:00 · 2023-07-16 03:30:40 +00:00 · 2023-07-16 03:30:38 +00:00 · 2023-07-16 01:49:56 +00:00
25 changed files with 193 additions and 214 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,8 +29,8 @@ env:
  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.1-A1
-  DEVELOPMENT_VERSION: 7.4.1-A2-SNAPSHOT
+  RELEASE_VERSION: 23.1.0-A21
+  DEVELOPMENT_VERSION: 23.1.0-A22-SNAPSHOT

 jobs:
  tas_tests:
@@ -116,6 +116,33 @@ 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
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - name: "Init"
+        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
+        run: |
+          bash ./scripts/ci/init.sh
+          bash ./scripts/ci/build.sh
+      - name: "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
--- a/dev/dev-acs-amps-overlay/pom.xml
+++ b/dev/dev-acs-amps-overlay/pom.xml
@@ -7,13 +7,12 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <properties>
-        <dependency.sis.version>1.2</dependency.sis.version>
+        <dependency.sis.version>1.3</dependency.sis.version>

-        <tomcat.version>7.0.86</tomcat.version>
        <tomcat.default.solr6.port>8983</tomcat.default.solr6.port>
    </properties>

@@ -32,180 +31,116 @@
            <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>
-                <artifactId>maven-war-plugin</artifactId>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven3-plugin</artifactId>
                <configuration>
-                    <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>
+                    <container>
+                        <containerId>tomcat9x</containerId>
+                        <type>embedded</type>
+                        <log>target/cargo.log</log>
+                        <systemProperties>
+                            <cargo.tomcat.ajp.port>-1</cargo.tomcat.ajp.port>
+
+                            <index.subsystem.name>solr6</index.subsystem.name>
+                            <solr.port>${tomcat.default.solr6.port}</solr.port>
+                            <dir.root>${runtime.data.folder}/alf_data</dir.root>
+                            <solr.host>localhost</solr.host>
+                            <solr.base.url>/solr</solr.base.url>
+                            <solr.secureComms>secret</solr.secureComms>
+                            <solr.sharedSecret>secret</solr.sharedSecret>
+                            <encryption.keystore.type>pkcs12</encryption.keystore.type>
+                            <encryption.cipherAlgorithm>AES/CBC/PKCS5Padding</encryption.cipherAlgorithm>
+                            <encryption.keyAlgorithm>AES</encryption.keyAlgorithm>
+                            <metadata-keystore.password>mp6yc0UD9e</metadata-keystore.password>
+                            <metadata-keystore.aliases>metadata</metadata-keystore.aliases>
+                            <metadata-keystore.metadata.password>mp6yc0UD9e</metadata-keystore.metadata.password>
+                            <metadata-keystore.metadata.algorithm>AES</metadata-keystore.metadata.algorithm>
+                        </systemProperties>
+                    </container>
+                    <configuration>
+                        <configfiles>
+                            <configfile>
+                                <file>${runtime.tomcat.conf.folder}/alfresco-context.xml</file>
+                                <todir>conf</todir>
+                                <tofile>context.xml</tofile>
+                            </configfile>
+                            <configfile>
+                                <file>${runtime.tomcat.conf.folder}/tomcat-users.xml</file>
+                                <todir>conf</todir>
+                                <tofile>tomcat-users.xml</tofile>
+                            </configfile>
+                        </configfiles>
+                        <files>
+                            <file>
+                                <file>${runtime.tomcat.conf.folder}/shared</file>
+                                <todir>shared</todir>
+                            </file>
+                        </files>
+                    </configuration>
+                    <deployables>
+                        <deployable>
                            <groupId>org.alfresco</groupId>
                            <artifactId>alfresco-server-root</artifactId>
-                            <version>${dependency.alfresco-server-root.version}</version>
-                            <contextPath>/</contextPath>
                            <type>war</type>
-                            <asWebapp>true</asWebapp>
-                            <!-- Workaround for https://issues.apache.org/jira/browse/MTOMCAT-269 -->
-                            <!-- tomcat7-maven-plugin does not pick up the context.xml file from META-INF -->
-                            <contextFile>
-                                ${project.build.directory}/tomcat/webapps/alfresco-server-root/META-INF/context.xml
-                            </contextFile>
-                        </webapp>
-                        <webapp>
+                            <properties>
+                                <context>/</context>
+                            </properties>
+                        </deployable>
+                        <deployable>
                            <groupId>org.alfresco</groupId>
                            <artifactId>api-explorer</artifactId>
-                            <version>${alfresco.api-explorer.version}</version>
-                            <contextPath>/api-explorer</contextPath>
                            <type>war</type>
-                            <asWebapp>true</asWebapp>
-                        </webapp>
-                        <webapp>
+                            <properties>
+                                <context>/api-explorer</context>
+                            </properties>
+                        </deployable>
+                        <deployable>
                            <groupId>org.alfresco</groupId>
                            <artifactId>dev-community-share-amps-overlay</artifactId>
-                            <contextPath>/share</contextPath>
-                            <version>${project.version}</version>
                            <type>war</type>
-                            <asWebapp>true</asWebapp>
-                        </webapp>
-                    </webapps>
+                            <properties>
+                                <context>/share</context>
+                            </properties>
+                        </deployable>
+                        <deployable>
+                            <groupId>org.alfresco</groupId>
+                            <artifactId>dev-acs-community-amps-overlay</artifactId>
+                            <type>war</type>
+                            <properties>
+                                <context>/alfresco</context>
+                            </properties>
+                        </deployable>
+                    </deployables>
                </configuration>
                <dependencies>
-                    <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>
@@ -318,8 +253,8 @@
            <build>
                <plugins>
                    <plugin>
-                        <groupId>org.apache.tomcat.maven</groupId>
-                        <artifactId>tomcat7-maven-plugin</artifactId>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven3-plugin</artifactId>
                        <executions>
                            <execution>
                                <id>run-exploded-webapp</id>
--- a/dev/dev-repo-amps-overlay/pom.xml
+++ b/dev/dev-repo-amps-overlay/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

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

    <build>
--- a/dev/dev-tomcat/pom.xml
+++ b/dev/dev-tomcat/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>alfresco-dev-community-tomcat-env</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <properties>
--- a/dev/dev-tomcat/src/main/tomcat/alfresco-context.xml
+++ b/dev/dev-tomcat/src/main/tomcat/alfresco-context.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context docBase="${project.build.directory}/${project.build.finalName}" path="/alfresco">
-  <Resources className="org.apache.naming.resources.VirtualDirContext"
-    extraResourcePaths="/=${project.build.directory}/${project.build.finalName}" />
-  <Loader searchVirtualFirst="true"
-    className="org.apache.catalina.loader.VirtualWebappLoader"
-    virtualClasspath="${project.build.outputDirectory};${runtime.tomcat.conf.folder}/shared/classes" />
+<Context>
+  <Resources cachingAllowed="true" cacheMaxSize="102400">
+    <PostResources className="org.apache.catalina.webresources.DirResourceSet"
+                   base="${catalina.home}/shared/classes"
+                   webAppMount="/WEB-INF/classes"/>
+  </Resources>
 </Context>
--- a/dev/dev-tomcat/src/main/tomcat/solr-context.xml
+++ b/dev/dev-tomcat/src/main/tomcat/solr-context.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context crossContext="true">
-   <Environment name="solr/home"        type="java.lang.String" value="${solr.solr.home}" override="true"/>
-   <Environment name="solr/model/dir"   type="java.lang.String" value="${solr.solr.model.dir}" override="true"/>
-   <Environment name="solr/content/dir" type="java.lang.String" value="${solr.solr.content.dir}" override="true"/>
-  
-   <Resources className="org.apache.naming.resources.VirtualDirContext"
-    extraResourcePaths="/=${project.build.directory}/tomcat/webapps/alfresco-solr4" />
-   <Loader searchVirtualFirst="true"
-    className="org.apache.catalina.loader.VirtualWebappLoader"
-    virtualClasspath="${project.build.directory}/tomcat/webapps/alfresco-solr4/WEB-INF/classes" />
-   
-</Context>
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -29,10 +29,10 @@ services:
        mem_limit: 2g
        environment:
            #Solr needs to know how to register itself with Alfresco
-            SOLR_ALFRESCO_HOST: "alfresco"
+            SOLR_ALFRESCO_HOST: "host.docker.internal"
            SOLR_ALFRESCO_PORT: "8080"
            #Alfresco needs to know how to call solr
-            SOLR_SOLR_HOST: "solr6"
+            SOLR_SOLR_HOST: "localhost"
            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:
-            - 8083:8983 #Browser port
+            - 8983:8983 #Browser port

    activemq:
-        image: alfresco/alfresco-activemq:5.17.1-jre11-rockylinux8
+        image: alfresco/alfresco-activemq:5.17.4-jre17-rockylinux8
        mem_limit: 1g
        ports:
            - 8161:8161 # Web Console
--- a/dev/pom.xml
+++ b/dev/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <properties>
--- a/distribution-ags/pom.xml
+++ b/distribution-ags/pom.xml
@@ -8,7 +8,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <dependencies>
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <dependencies>
--- a/docker-alfresco/ags/pom.xml
+++ b/docker-alfresco/ags/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>content-services-community-docker</artifactId>
-      <version>7.4.1-A1</version>
+      <version>23.1.0-A21</version>
   </parent>

   <properties>
--- a/docker-alfresco/pom.xml
+++ b/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <properties>
@@ -119,6 +119,9 @@
                                                <platform>linux/amd64</platform>
                                                <platform>linux/arm64</platform>
                                            </platforms>
+                                            <attestations>
+                                                <provenance>false</provenance>
+                                            </attestations>
                                        </buildx>
                                        <dockerFileDir>${project.basedir}</dockerFileDir>
                                        <args>
@@ -185,6 +188,9 @@
                                                <platform>linux/amd64</platform>
                                                <platform>linux/arm64</platform>
                                            </platforms>
+                                            <attestations>
+                                                <provenance>false</provenance>
+                                            </attestations>
                                        </buildx>
                                        <dockerFileDir>${project.basedir}</dockerFileDir>
                                        <args>
@@ -255,6 +261,9 @@
                                                        <platform>linux/amd64</platform>
                                                        <platform>linux/arm64</platform>
                                                    </platforms>
+                                                    <attestations>
+                                                        <provenance>false</provenance>
+                                                    </attestations>
                                                </buildx>
                                                <dockerFileDir>${project.basedir}</dockerFileDir>
                                                <args>
@@ -284,6 +293,9 @@
                                                        <platform>linux/amd64</platform>
                                                        <platform>linux/arm64</platform>
                                                    </platforms>
+                                                    <attestations>
+                                                        <provenance>false</provenance>
+                                                    </attestations>
                                                </buildx>
                                                <dockerFileDir>${project.basedir}</dockerFileDir>
                                                <args>
--- a/docker-share/ags/pom.xml
+++ b/docker-share/ags/pom.xml
@@ -8,7 +8,7 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>share-community-docker</artifactId>
-      <version>7.4.1-A1</version>
+      <version>23.1.0-A21</version>
   </parent>

   <properties>
@@ -101,6 +101,9 @@
                                    <platform>linux/amd64</platform>
                                    <platform>linux/arm64</platform>
                                 </platforms>
+                                 <attestations>
+                                    <provenance>false</provenance>
+                                 </attestations>
                              </buildx>
                              <dockerFileDir>${project.basedir}</dockerFileDir>
                              <args>
@@ -167,6 +170,9 @@
                                    <platform>linux/amd64</platform>
                                    <platform>linux/arm64</platform>
                                 </platforms>
+                                 <attestations>
+                                    <provenance>false</provenance>
+                                 </attestations>
                              </buildx>
                              <dockerFileDir>${project.basedir}</dockerFileDir>
                              <args>
@@ -237,6 +243,9 @@
                                          <platform>linux/amd64</platform>
                                          <platform>linux/arm64</platform>
                                       </platforms>
+                                       <attestations>
+                                          <provenance>false</provenance>
+                                       </attestations>
                                    </buildx>
                                    <dockerFileDir>${project.basedir}</dockerFileDir>
                                    <args>
@@ -266,6 +275,9 @@
                                          <platform>linux/amd64</platform>
                                          <platform>linux/arm64</platform>
                                       </platforms>
+                                       <attestations>
+                                          <provenance>false</provenance>
+                                       </attestations>
                                    </buildx>
                                    <dockerFileDir>${project.basedir}</dockerFileDir>
                                    <args>
--- a/docker-share/pom.xml
+++ b/docker-share/pom.xml
@@ -7,6 +7,6 @@
   <parent>
      <groupId>org.alfresco</groupId>
      <artifactId>acs-community-packaging</artifactId>
-      <version>7.4.1-A1</version>
+      <version>23.1.0-A21</version>
   </parent>
 </project>
--- a/pom.xml
+++ b/pom.xml
@@ -3,19 +3,19 @@
    <artifactId>acs-community-packaging</artifactId>
    <packaging>pom</packaging>
    <name>Alfresco Content Services Community Packaging</name>
-    <version>7.4.1-A1</version>
+    <version>23.1.0-A21</version>

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

    <properties>
-        <dependency.alfresco-community-repo.version>20.163</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>20.164</dependency.alfresco-community-share.version>
-        <dependency.acs-packaging.version>7.4.1-A1</dependency.acs-packaging.version> <!-- for Share distribution zip -->
+        <dependency.alfresco-community-repo.version>23.1.0.167</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>23.1.0.170</dependency.alfresco-community-share.version>
+        <dependency.acs-packaging.version>23.1.0-A21</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.1-A1</tag>
+        <tag>23.1.0-A21</tag>
    </scm>

    <distributionManagement>
--- a/public-javadoc/pom.xml
+++ b/public-javadoc/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>
    <packaging>pom</packaging>

--- a/tests/environment/.env
+++ b/tests/environment/.env
@@ -1,3 +1,3 @@
 SOLR6_TAG=2.0.7-A5
 POSTGRES_TAG=14.4
-ACTIVEMQ_TAG=5.17.1-jre11-rockylinux8
+ACTIVEMQ_TAG=5.17.4-jre17-rockylinux8
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>acs-community-packaging</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <modules>
--- a/tests/tas-cmis/pom.xml
+++ b/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <developers>
--- a/tests/tas-distribution-zip/pom.xml
+++ b/tests/tas-distribution-zip/pom.xml
@@ -9,7 +9,7 @@
  <parent>
    <groupId>org.alfresco</groupId>
    <artifactId>content-repository-community-tests</artifactId>
-    <version>7.4.1-A1</version>
+    <version>23.1.0-A21</version>
  </parent>

  <properties>
@@ -21,7 +21,7 @@
    <dependency>
      <groupId>org.assertj</groupId>
      <artifactId>assertj-core</artifactId>
-      <version>3.23.1</version>
+      <version>3.24.2</version>
      <scope>test</scope>
    </dependency>
    <dependency>
@@ -32,7 +32,7 @@
    <dependency>
      <groupId>org.apache.maven</groupId>
      <artifactId>maven-model</artifactId>
-      <version>3.8.6</version>
+      <version>3.9.3</version>
    </dependency>
  </dependencies>

--- a/tests/tas-email/pom.xml
+++ b/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <developers>
--- a/tests/tas-integration/pom.xml
+++ b/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <developers>
@@ -23,7 +23,7 @@

    <properties>
        <suiteXmlFile>${project.basedir}/src/test/resources/integration-suite.xml</suiteXmlFile>
-        <dependency.groovy.version>3.0.12</dependency.groovy.version>
+        <dependency.groovy.version>3.0.18</dependency.groovy.version>
    </properties>

    <dependencies>
--- a/tests/tas-restapi/pom.xml
+++ b/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <developers>
@@ -73,6 +73,12 @@
            <artifactId>spring-test</artifactId>
            <scope>test</scope>
        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${dependency.awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
    </dependencies>

    <build>
--- a/tests/tas-webdav/pom.xml
+++ b/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
    <parent>
        <groupId>org.alfresco</groupId>
        <artifactId>content-repository-community-tests</artifactId>
-        <version>7.4.1-A1</version>
+        <version>23.1.0-A21</version>
    </parent>

    <developers>
Author	SHA1	Message	Date
alfresco-build	5b0738e762	[maven-release-plugin][skip ci] prepare release 23.1.0-A21	2023-07-23 03:12:23 +00:00
alfresco-build	06c40dbaf4	[release] 23.1.0-A21 Update upstream versions - alfresco-community-repo: 23.1.0.167 - alfresco-enterprise-share: 23.1.0.170 - acs-packaging: 23.1.0-A21 - RELEASE_VERSION: 23.1.0-A21 - DEVELOPMENT_VERSION: 23.1.0-A22-SNAPSHOT	2023-07-23 01:53:04 +00:00
alfresco-build	17b709a19b	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-16 03:30:40 +00:00
alfresco-build	79c0d8c57c	[maven-release-plugin][skip ci] prepare release 23.1.0-A20	2023-07-16 03:30:38 +00:00
alfresco-build	6e1d0b8885	[release] 23.1.0-A20 Update upstream versions - alfresco-community-repo: 23.1.0.164 - alfresco-enterprise-share: 23.1.0.162 - acs-packaging: 23.1.0-A20 - RELEASE_VERSION: 23.1.0-A20 - DEVELOPMENT_VERSION: 23.1.0-A21-SNAPSHOT	2023-07-16 01:49:56 +00:00
dependabot[bot]	6c64e4ac46	Bump maven-model from 3.9.2 to 3.9.3 (#1521 ) Bumps [maven-model](https://github.com/apache/maven) from 3.9.2 to 3.9.3. - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.9.2...maven-3.9.3) --- updated-dependencies: - dependency-name: org.apache.maven:maven-model dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-12 11:54:16 +02:00
dependabot[bot]	d4fd707535	Bump groovy from 3.0.17 to 3.0.18 (#1523 ) Bumps [groovy](https://github.com/apache/groovy) from 3.0.17 to 3.0.18. - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-07-10 14:59:53 +02:00
mstrankowski	faef8d406a	ACS-5546: Add echo commands to indicate point of failure with Tomcat deployment	2023-07-10 14:30:47 +02:00
Marcin Strankowski	73bda87c3e	Add share verification with curl that ignores redirects (#1525 )	2023-07-05 19:32:41 +02:00
Marcin Strankowski	106952d3eb	Tomcat deployment test for acs-community-packaging (#1524 ) * Tomcat deployment test for acs-community-packaging * Remove action * Test tomcat 10 fails * Test with link directed to localhost:8080, with 500 exception it should be a better spot to notice failure than 302 with error from /alfresco * Test tomcat 9 works * Test tomcat 10 fails with non-redirect link * Tested failure properly, reverting to tomcat9	2023-07-04 18:33:21 +02:00
Marcin Strankowski	b3241b1cdb	Replace tomcat7-maven-plugin with cargo-maven3-plugin (#1522 )	2023-07-03 19:29:49 +02:00
alfresco-build	b70003dfd5	[maven-release-plugin][skip ci] prepare for next development iteration	2023-07-02 02:46:43 +00:00
alfresco-build	0c9005dc80	[maven-release-plugin][skip ci] prepare release 23.1.0-A19	2023-07-02 02:46:41 +00:00
alfresco-build	ca24b1500f	[release] 23.1.0-A19 Update upstream versions - alfresco-community-repo: 23.1.0.151 - alfresco-enterprise-share: 23.1.0.144 - acs-packaging: 23.1.0-A19 - RELEASE_VERSION: 23.1.0-A19 - DEVELOPMENT_VERSION: 23.1.0-A20-SNAPSHOT	2023-07-02 01:32:53 +00:00
alfresco-build	423b89f686	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-27 15:31:59 +00:00
alfresco-build	3e1ed57a8c	[maven-release-plugin][skip ci] prepare release 23.1.0-M2	2023-06-27 15:31:57 +00:00
alfresco-build	bf1d760602	[release] 23.1.0-M2 Update upstream versions - alfresco-community-repo: 23.1.0.146 - alfresco-enterprise-share: 23.1.0.142 - acs-packaging: 23.1.0-M2 - RELEASE_VERSION: 23.1.0-M2 - DEVELOPMENT_VERSION: 23.1.0-A19-SNAPSHOT	2023-06-27 14:12:56 +00:00
alfresco-build	45ffdee8ec	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-25 03:17:24 +00:00
alfresco-build	0b025df98b	[maven-release-plugin][skip ci] prepare release 23.1.0-A18	2023-06-25 03:17:23 +00:00
alfresco-build	f074aac8df	[release] 23.1.0-A18 Update upstream versions - alfresco-community-repo: 23.1.0.144 - alfresco-enterprise-share: 23.1.0.139 - acs-packaging: 23.1.0-A18 - RELEASE_VERSION: 23.1.0-A18 - DEVELOPMENT_VERSION: 23.1.0-A19-SNAPSHOT	2023-06-25 02:03:29 +00:00
alfresco-build	a0d711ebac	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-22 12:16:01 +00:00
alfresco-build	37738c6bcc	[maven-release-plugin][skip ci] prepare release 23.1.0-A17	2023-06-22 12:15:59 +00:00
alfresco-build	41b3250838	[release] 23.1.0-A17 Update upstream versions - alfresco-community-repo: 23.1.0.142 - alfresco-enterprise-share: 23.1.0.137 - acs-packaging: 23.1.0-A17 - RELEASE_VERSION: 23.1.0-A17 - DEVELOPMENT_VERSION: 23.1.0-A18-SNAPSHOT	2023-06-22 11:00:49 +00:00
alfresco-build	499cbf222f	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-19 09:47:10 +00:00
alfresco-build	6f005c2123	[maven-release-plugin][skip ci] prepare release 23.1.0-A16	2023-06-19 09:47:08 +00:00
alfresco-build	c21035e27f	[release] 23.1.0-A16 Update upstream versions - alfresco-community-repo: 23.1.0.141 - alfresco-enterprise-share: 23.1.0.135 - acs-packaging: 23.1.0-A16 - RELEASE_VERSION: 23.1.0-A16 - DEVELOPMENT_VERSION: 23.1.0-A17-SNAPSHOT	2023-06-19 08:28:04 +00:00
Domenico Sibilio	c892acaa0e	ACS-4063 Remove provenance layer from Docker images (#1520 ) Addresses https://issues.redhat.com/browse/PROJQUAY-5013	2023-06-12 12:29:04 +02:00
alfresco-build	dc2fd4768b	[maven-release-plugin][skip ci] prepare for next development iteration	2023-06-11 02:54:04 +00:00
alfresco-build	4275054845	[maven-release-plugin][skip ci] prepare release 23.1.0-A15	2023-06-11 02:54:01 +00:00
alfresco-build	e964f22a93	[release] 23.1.0-A15 Update upstream versions - alfresco-community-repo: 23.1.0.134 - alfresco-enterprise-share: 23.1.0.131 - acs-packaging: 23.1.0-A15 - RELEASE_VERSION: 23.1.0-A15 - DEVELOPMENT_VERSION: 23.1.0-A16-SNAPSHOT	2023-06-11 01:39:40 +00:00
alfresco-build	b804d7255d	[release] 23.1.0-A14 Update upstream versions - alfresco-community-repo: 23.1.0.130 - alfresco-enterprise-share: 23.1.0.127 - acs-packaging: 23.1.0-A14 - RELEASE_VERSION: 23.1.0-A14 - DEVELOPMENT_VERSION: 23.1.0-A15-SNAPSHOT	2023-06-04 01:43:17 +00:00
alfresco-build	b32290c444	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-28 03:38:31 +00:00
alfresco-build	d1ea01c1c4	[maven-release-plugin][skip ci] prepare release 23.1.0-A13	2023-05-28 03:38:28 +00:00
alfresco-build	c69097a351	[release] 23.1.0-A13 Update upstream versions - alfresco-community-repo: 23.1.0.128 - alfresco-enterprise-share: 23.1.0.121 - acs-packaging: 23.1.0-A13 - RELEASE_VERSION: 23.1.0-A13 - DEVELOPMENT_VERSION: 23.1.0-A14-SNAPSHOT	2023-05-28 01:36:30 +00:00
alfresco-build	a8c765447e	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-21 03:00:27 +00:00
alfresco-build	1809c3fa2a	[maven-release-plugin][skip ci] prepare release 23.1.0-A12	2023-05-21 03:00:25 +00:00
alfresco-build	a4b6cdc064	[release] 23.1.0-A12 Update upstream versions - alfresco-community-repo: 23.1.0.118 - alfresco-enterprise-share: 23.1.0.108 - acs-packaging: 23.1.0-A12 - RELEASE_VERSION: 23.1.0-A12 - DEVELOPMENT_VERSION: 23.1.0-A13-SNAPSHOT	2023-05-21 01:34:21 +00:00
dependabot[bot]	381a5e0c08	Bump assertj-core from 3.23.1 to 3.24.2 (#1501 ) Bumps assertj-core from 3.23.1 to 3.24.2. --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-05-18 10:04:07 +02:00
Kacper Magdziarz	662ff67685	[ACS-5192] Upgrade Repository Components to Java 17 (#1517 )	2023-05-18 09:54:12 +02:00
dependabot[bot]	fd72a77bb4	Bump groovy from 3.0.12 to 3.0.17 (#1512 ) Bumps [groovy](https://github.com/apache/groovy) from 3.0.12 to 3.0.17. - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-05-17 13:53:47 +02:00
dependabot[bot]	52ba2bda17	Bump dependency.sis.version from 1.2 to 1.3 (#1498 ) Bumps `dependency.sis.version` from 1.2 to 1.3. Updates `sis-utility` from 1.2 to 1.3 Updates `sis-metadata` from 1.2 to 1.3 Updates `sis-storage` from 1.2 to 1.3 --- updated-dependencies: - dependency-name: org.apache.sis.core:sis-utility dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.sis.core:sis-metadata dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.sis.storage:sis-storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-05-17 13:39:14 +02:00
Damian Ujma	d1e245d09f	ACS-5087 Add awaitility dependency (#1518 )	2023-05-16 16:09:49 +02:00
dependabot[bot]	70850f9c0a	Bump maven-model from 3.8.6 to 3.9.2 (#1516 ) Bumps [maven-model](https://github.com/apache/maven) from 3.8.6 to 3.9.2. - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.8.6...maven-3.9.2) --- updated-dependencies: - dependency-name: org.apache.maven:maven-model dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-05-16 13:13:47 +02:00
alfresco-build	9e40d147fb	[release] 23.1.0-A11 Update upstream versions - alfresco-community-repo: 23.1.0.102 - alfresco-enterprise-share: 23.1.0.101 - acs-packaging: 23.1.0-A11 - RELEASE_VERSION: 23.1.0-A11 - DEVELOPMENT_VERSION: 23.1.0-A12-SNAPSHOT	2023-05-14 01:48:54 +00:00
alfresco-build	3945b08218	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-09 18:20:51 +00:00
alfresco-build	3ad42e3259	[maven-release-plugin][skip ci] prepare release 23.1.0-A10	2023-05-09 18:20:48 +00:00
alfresco-build	5aaf16c9ea	[release] 23.1.0-A10 Update upstream versions - alfresco-community-repo: 23.1.0.100 - alfresco-enterprise-share: 23.1.0.100 - acs-packaging: 23.1.0-A10 - RELEASE_VERSION: 23.1.0-A10 - DEVELOPMENT_VERSION: 23.1.0-A11-SNAPSHOT	2023-05-09 16:48:24 +00:00
alfresco-build	d21e33def5	[maven-release-plugin][skip ci] prepare for next development iteration	2023-05-07 03:14:44 +00:00