From 51c51e16222f46fb7e7191f6e7a2cc7779cf6985 Mon Sep 17 00:00:00 2001
From: Krystian Dabrowski <krystian.dabrowski@hyland.com>
Date: Thu, 27 Oct 2022 12:26:54 +0200
Subject: [PATCH] Update Master branch to 7.4.0 [skip ci]

---
 .travis.yml                        | 6 +++---
 dev/dev-acs-amps-overlay/pom.xml   | 2 +-
 dev/dev-repo-amps-overlay/pom.xml  | 2 +-
 dev/dev-share-amps-overlay/pom.xml | 2 +-
 dev/dev-tomcat/pom.xml             | 2 +-
 dev/pom.xml                        | 2 +-
 distribution-ags/pom.xml           | 2 +-
 distribution/pom.xml               | 2 +-
 docker-alfresco/ags/pom.xml        | 2 +-
 docker-alfresco/pom.xml            | 2 +-
 docker-share/ags/pom.xml           | 2 +-
 docker-share/pom.xml               | 2 +-
 pom.xml                            | 8 ++++----
 public-javadoc/pom.xml             | 2 +-
 tests/pom.xml                      | 2 +-
 tests/tas-cmis/pom.xml             | 2 +-
 tests/tas-distribution-zip/pom.xml | 2 +-
 tests/tas-email/pom.xml            | 2 +-
 tests/tas-integration/pom.xml      | 2 +-
 tests/tas-restapi/pom.xml          | 2 +-
 tests/tas-webdav/pom.xml           | 2 +-
 21 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e4fa6c7a8..2be33621b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,9 +28,9 @@ env:
   global:
     - TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
     - TAS_ENVIRONMENT=./tests/environment
-    # Release version has to start with real version (7.3.0-....) for the docker image to build successfully.
-    - RELEASE_VERSION=7.3.0
-    - DEVELOPMENT_VERSION=7.4.0-A1-SNAPSHOT
+    # Release version has to start with real version (7.4.0-....) for the docker image to build successfully.
+    - RELEASE_VERSION=7.4.0-A1
+    - DEVELOPMENT_VERSION=7.4.0-SNAPSHOT
 
 stages:
   - name: test
diff --git a/dev/dev-acs-amps-overlay/pom.xml b/dev/dev-acs-amps-overlay/pom.xml
index 89b280ec2..48c7e3e0d 100644
--- a/dev/dev-acs-amps-overlay/pom.xml
+++ b/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-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/dev/dev-repo-amps-overlay/pom.xml b/dev/dev-repo-amps-overlay/pom.xml
index 34bb8faba..6c6de65ef 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/dev/dev-share-amps-overlay/pom.xml b/dev/dev-share-amps-overlay/pom.xml
index 9055a9b46..bff5ba57e 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/dev/dev-tomcat/pom.xml b/dev/dev-tomcat/pom.xml
index 415426438..9a2f6c0cb 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/dev/pom.xml b/dev/pom.xml
index c466b3672..2cc807379 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/distribution-ags/pom.xml b/distribution-ags/pom.xml
index 8161636d7..58b4cd568 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 8b8d9f52f..28727d365 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/docker-alfresco/ags/pom.xml b/docker-alfresco/ags/pom.xml
index cc74f316c..0d2b5596d 100644
--- 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.0-A1-SNAPSHOT</version>
+      <version>7.4.0-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index ca684d340..6f678b0b4 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/docker-share/ags/pom.xml b/docker-share/ags/pom.xml
index 26a57eb63..bbae54ea8 100644
--- 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.0-A1-SNAPSHOT</version>
+      <version>7.4.0-SNAPSHOT</version>
    </parent>
 
    <properties>
diff --git a/docker-share/pom.xml b/docker-share/pom.xml
index c2a629a04..1f499324e 100644
--- 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.0-A1-SNAPSHOT</version>
+      <version>7.4.0-SNAPSHOT</version>
    </parent>
 </project>
diff --git a/pom.xml b/pom.xml
index 39c92d9dc..ae94b9ce5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@
     <artifactId>acs-community-packaging</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>7.4.0-A1-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>17.183</version>
+        <version>20.1</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-community-repo.version>17.183</dependency.alfresco-community-repo.version>
-        <dependency.alfresco-community-share.version>17.138</dependency.alfresco-community-share.version>
+        <dependency.alfresco-community-repo.version>20.1</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-share.version>20.1</dependency.alfresco-community-share.version>
         <dependency.acs-packaging.version>7.3.0</dependency.acs-packaging.version> <!-- for Share distribution zip -->
 
         <repo.image.tag>${dependency.alfresco-community-repo.version}</repo.image.tag>
diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml
index 0807acced..451377ba6 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 
diff --git a/tests/pom.xml b/tests/pom.xml
index 7870e88d1..315c1bc37 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml
index 158dd1f57..4a2002ece 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-distribution-zip/pom.xml b/tests/tas-distribution-zip/pom.xml
index c854afd68..c2734d08d 100644
--- 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.0-A1-SNAPSHOT</version>
+    <version>7.4.0-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/tests/tas-email/pom.xml b/tests/tas-email/pom.xml
index 8c6d1d55f..2a03e3b5d 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-integration/pom.xml b/tests/tas-integration/pom.xml
index 70f3cbcbc..81eec2ab3 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-restapi/pom.xml b/tests/tas-restapi/pom.xml
index 2232fd5a5..688b94703 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-webdav/pom.xml b/tests/tas-webdav/pom.xml
index d9c2a6d35..05ba2a83f 100644
--- 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.0-A1-SNAPSHOT</version>
+        <version>7.4.0-SNAPSHOT</version>
     </parent>
 
     <developers>