Merge branch 'master' into feature/ACS-5325_invoke_required_policy

# Conflicts: # pom.xml
Alfresco · Oct 2, 2023 · 1b4cd00 · 1b4cd00
2 parents 0baaf24 + df33a79
commit 1b4cd00
Show file tree

Hide file tree

Showing 37 changed files with 278 additions and 49 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -68,7 +68,7 @@ jobs:
       !contains(github.event.head_commit.message, '[skip pmd]') &&
       !contains(github.event.head_commit.message, '[skip tests]')
     steps:
-      - uses: Alfresco/[email protected].0
+      - uses: Alfresco/[email protected].5
 
   tas_tests:
     name: ${{ matrix.testSuite }} TAS tests

diff --git a/.github/workflows/master_release.yml b/.github/workflows/master_release.yml
@@ -22,8 +22,8 @@ env:
   GITHUB_ACTIONS_DEPLOY_TIMEOUT: 60
   BASE_BUILD_NUMBER: 10000
   # Release version has to start with real version (7.4.0-....) for the docker image to build successfully.
-  RELEASE_VERSION: 23.1.0-M4
-  DEVELOPMENT_VERSION: 23.1.0-A43-SNAPSHOT
+  RELEASE_VERSION: 23.1.0-A45
+  DEVELOPMENT_VERSION: 23.1.0-A46-SNAPSHOT
 
 jobs:
   run_ci:

diff --git a/dev/dev-acs-amps-overlay/pom.xml b/dev/dev-acs-amps-overlay/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-tomcat-env</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git 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-tomcat-env</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <build>

diff --git 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-tomcat-env</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <build>

diff --git a/dev/dev-tomcat/pom.xml b/dev/dev-tomcat/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-dev-tomcat-env</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/dev/pom.xml b/dev/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/distribution-ags/pom.xml b/distribution-ags/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/distribution-share/pom.xml b/distribution-share/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <!-- To replace in share-config-custom.xml -->

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/docker-alfresco/ags/pom.xml b/docker-alfresco/ags/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-services-docker</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
     <properties>
         <image.name>alfresco/alfresco-governance-repository-enterprise</image.name>

diff --git a/docker-alfresco/aws/pom.xml b/docker-alfresco/aws/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-services-docker</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>share-docker</artifactId>
-      <version>23.1.0-A43-SNAPSHOT</version>
+      <version>23.1.0-A46-SNAPSHOT</version>
    </parent>
 
    <properties>

diff --git a/docker-share/aws/pom.xml b/docker-share/aws/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>share-docker</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/docker-share/pom.xml b/docker-share/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/tests/environment/.env b/tests/environment/.env
@@ -7,10 +7,10 @@ MSSQL_TAG=2019-CU9-ubuntu-16.04
 ORACLE_TAG=19.3.0-ee
 ACTIVEMQ_TAG=5.18.2-jre17-rockylinux8
 AIMS_TAG=1.2
-SYNC_SERVICE_TAG=4.0.0-M11
-TRANSFORM_ROUTER_TAG=3.1.0-M1
-TRANSFORM_CORE_AIO_TAG=4.1.0-M1
-SHARED_FILE_STORE_TAG=3.1.0-M1
+SYNC_SERVICE_TAG=4.0.0-A17
+TRANSFORM_ROUTER_TAG=4.0.0-A1
+TRANSFORM_CORE_AIO_TAG=5.0.0-A1
+SHARED_FILE_STORE_TAG=4.0.0-A1
 ACS_NGINX_TAG=3.0.0
 ES_TAG=7.17.3
 ELASTICSEARCH_TAG=7.17.3

diff --git a/tests/environment/docker-compose-pipeline-all-amps.yml b/tests/environment/docker-compose-pipeline-all-amps.yml
@@ -177,7 +177,7 @@ services:
             - share
 
     sync-service:
-        image: quay.io/alfresco/service-sync:4.0.0-M11
+        image: quay.io/alfresco/service-sync:4.0.0-A17
         mem_limit: 1g
         environment:
             JAVA_OPTS : "

diff --git a/tests/pipeline-all-amps/pom.xml b/tests/pipeline-all-amps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-tests</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/tests/pipeline-all-amps/repo/pom.xml b/tests/pipeline-all-amps/repo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>pipeline-all-amps</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <artifactId>alfresco-pipeline-all-amps-repo</artifactId>

diff --git a/tests/pipeline-all-amps/share/pom.xml b/tests/pipeline-all-amps/share/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>pipeline-all-amps</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <artifactId>alfresco-pipeline-all-amps-share</artifactId>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>acs-packaging</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <modules>

diff --git a/tests/tas-all-amps/pom.xml b/tests/tas-all-amps/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-tests</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <developers>

diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>content-repository-tests</artifactId>
-        <version>23.1.0-A43-SNAPSHOT</version>
+        <version>23.1.0-A46-SNAPSHOT</version>
     </parent>
 
     <developers>

diff --git 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-tests</artifactId>
-    <version>23.1.0-A43-SNAPSHOT</version>
+    <version>23.1.0-A46-SNAPSHOT</version>
   </parent>
 
   <properties>

diff --git a/tests/tas-elasticsearch/pom.xml b/tests/tas-elasticsearch/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.alfresco</groupId>
     <artifactId>content-repository-tests</artifactId>
-    <version>23.1.0-A43-SNAPSHOT</version>
+    <version>23.1.0-A46-SNAPSHOT</version>
   </parent>
 
   <profiles>