From c47c9be32d397b07ab1ae67476f736c9be3882ce Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Sat, 27 Mar 2021 18:32:14 +0000
Subject: [PATCH] Switch master to support ACS 7.1.0

* incremented pom versions to 11.0 so that 9 may be used by 7.0.1 and 10 for 7.0.2
---
 .travis.yml                              | 6 +++---
 dev/dev-acs-amps-overlay/pom.xml         | 2 +-
 dev/dev-tomcat/pom.xml                   | 2 +-
 dev/pom.xml                              | 2 +-
 distribution/pom.xml                     | 2 +-
 docker-alfresco/pom.xml                  | 2 +-
 pom.xml                                  | 6 +++---
 public-javadoc/pom.xml                   | 2 +-
 scripts/travis/copy_to_release_bucket.sh | 2 +-
 scripts/travis/maven_release.sh          | 2 +-
 scripts/travis/verify_release_tag.sh     | 2 +-
 tests/pom.xml                            | 2 +-
 tests/tas-cmis/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 +-
 17 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eb8e30c67..c7888dd78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,9 @@ env:
   global:
     - TAS_SCRIPTS=../alfresco-community-repo/packaging/tests/scripts
     - TAS_ENVIRONMENT=./tests/environment
-    # Release version has to start with real version  (7.0.1-....) for the docker image to build successfully.
-    - RELEASE_VERSION=7.0.1-A0
-    - DEVELOPMENT_VERSION=7.0.1-SNAPSHOT
+    # Release version has to start with real version  (7.1.0-....) for the docker image to build successfully.
+    - RELEASE_VERSION=7.1.0-A0
+    - DEVELOPMENT_VERSION=7.1.0-SNAPSHOT
 
 stages:
   - name: test
diff --git a/dev/dev-acs-amps-overlay/pom.xml b/dev/dev-acs-amps-overlay/pom.xml
index ba594b81a..f29f4e979 100644
--- 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-community-tomcat-env</artifactId>
-        <version>7.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/dev/dev-tomcat/pom.xml b/dev/dev-tomcat/pom.xml
index d50a87f00..c150032d7 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/dev/pom.xml b/dev/pom.xml
index 97c8b89b6..a6497c47e 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index f47c5025a..b58e4f00d 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml
index b104dd57e..f4cba336a 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index 75a36ef85..fdb85ff2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,17 +3,17 @@
     <artifactId>acs-community-packaging</artifactId>
     <packaging>pom</packaging>
     <name>Alfresco Content Services Community Packaging</name>
-    <version>7.0.1-SNAPSHOT</version>
+    <version>7.1.0-SNAPSHOT</version>
 
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-       <version>9.0</version>
+       <version>11.0</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-community-repo.version>9.0</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-repo.version>11.0</dependency.alfresco-community-repo.version>
 
         <alfresco.share.version>7.0.0</alfresco.share.version>
         <alfresco.alfresco-share-services.version>${alfresco.share.version}</alfresco.alfresco-share-services.version>
diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml
index f7b074bee..0732bf985 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 
diff --git a/scripts/travis/copy_to_release_bucket.sh b/scripts/travis/copy_to_release_bucket.sh
index c737073d2..da66d733e 100755
--- a/scripts/travis/copy_to_release_bucket.sh
+++ b/scripts/travis/copy_to_release_bucket.sh
@@ -8,7 +8,7 @@ set -vex
 #
 
 if [ -z "${RELEASE_VERSION}" ]; then
-  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.0.1-EA or 7.0.1-SNAPSHOT)"
+  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.1.0-EA or 7.1.0-SNAPSHOT)"
   exit 1
 fi
 
diff --git a/scripts/travis/maven_release.sh b/scripts/travis/maven_release.sh
index 00404615a..e26b40137 100755
--- a/scripts/travis/maven_release.sh
+++ b/scripts/travis/maven_release.sh
@@ -6,7 +6,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
 
 
 if [ -z "${RELEASE_VERSION}" ] || [ -z "${DEVELOPMENT_VERSION}" ]; then
-  echo "Please provide a Release and Development version in the format <acs-version>-<additional-info> (7.0.1-EA or 7.0.1-SNAPSHOT)"
+  echo "Please provide a Release and Development version in the format <acs-version>-<additional-info> (7.1.0-EA or 7.1.0-SNAPSHOT)"
   exit 1
 fi
 
diff --git a/scripts/travis/verify_release_tag.sh b/scripts/travis/verify_release_tag.sh
index cc8e22dc5..3312042ad 100755
--- a/scripts/travis/verify_release_tag.sh
+++ b/scripts/travis/verify_release_tag.sh
@@ -9,7 +9,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../../"
 #
 
 if [ -z "${RELEASE_VERSION}" ]; then
-  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.0.1-EA or 7.0.1-SNAPSHOT)"
+  echo "Please provide a RELEASE_VERSION in the format <acs-version>-<additional-info> (7.1.0-EA or 7.1.0-SNAPSHOT)"
   exit 1
 fi
 
diff --git a/tests/pom.xml b/tests/pom.xml
index e7790cd94..378b1f7ec 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/tests/tas-cmis/pom.xml b/tests/tas-cmis/pom.xml
index 9ca1e666c..aa1fab530 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-email/pom.xml b/tests/tas-email/pom.xml
index bb8f800e6..bf8e2f29b 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-integration/pom.xml b/tests/tas-integration/pom.xml
index 0a77349bf..2f796b20a 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-restapi/pom.xml b/tests/tas-restapi/pom.xml
index 4c1e3a4ce..c99c549f4 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/tests/tas-webdav/pom.xml b/tests/tas-webdav/pom.xml
index abbf14a65..e1e67e768 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.0.1-SNAPSHOT</version>
+        <version>7.1.0-SNAPSHOT</version>
     </parent>
 
     <developers>