From b77220553973bda3a66af22c294cd5330065b792 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@alfresco.com>
Date: Sat, 27 Mar 2021 09:45:27 +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
* version.schema not changed this time as it had already been incremented by 100 to 14100
---
 core/pom.xml                                                | 2 +-
 data-model/pom.xml                                          | 2 +-
 packaging/distribution/pom.xml                              | 2 +-
 packaging/docker-alfresco/pom.xml                           | 2 +-
 packaging/pom.xml                                           | 2 +-
 packaging/tests/pom.xml                                     | 2 +-
 packaging/tests/tas-cmis/pom.xml                            | 2 +-
 packaging/tests/tas-email/pom.xml                           | 2 +-
 packaging/tests/tas-integration/pom.xml                     | 2 +-
 packaging/tests/tas-restapi/pom.xml                         | 2 +-
 packaging/tests/tas-webdav/pom.xml                          | 2 +-
 packaging/war/pom.xml                                       | 2 +-
 pom.xml                                                     | 6 +++---
 remote-api/pom.xml                                          | 2 +-
 repository/pom.xml                                          | 2 +-
 .../org/alfresco/repo/module/ModuleVersionNumberTest.java   | 2 +-
 16 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 17fbf372b4..ab04ff591c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>9.7-SNAPSHOT</version>
+      <version>11.0-SNAPSHOT</version>
    </parent>
 
    <dependencies>
diff --git a/data-model/pom.xml b/data-model/pom.xml
index 4b682f01b5..1b9b23d1e0 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index 08ad7c6fb6..1fccf03ace 100644
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 </project>
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index 0557772c47..24068442cd 100644
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 31eea91ce6..2dcb3f9849 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <profiles>
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index 42eaae540a..12781b1db6 100644
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index 4a65475e3c..3e2ef3d221 100644
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index 4c6050834a..7a471d69b5 100644
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index b354aec2ac..9155afff51 100644
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index 97c2c02b40..5e3d114c5d 100644
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index 284127c53b..83531a1ab3 100644
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <developers>
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index f6c88d30b2..fa02413d66 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index ff2c362bbf..491d58b80f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alfresco-community-repo</artifactId>
-    <version>9.7-SNAPSHOT</version>
+    <version>11.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -22,8 +22,8 @@
 
     <properties>
         <acs.version.major>7</acs.version.major>
-        <acs.version.minor>0</acs.version.minor>
-        <acs.version.revision>1</acs.version.revision>
+        <acs.version.minor>1</acs.version.minor>
+        <acs.version.revision>0</acs.version.revision>
         <acs.version.label />
 
         <version.edition>Community</version.edition>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index ce0d315671..69d966c744 100644
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/repository/pom.xml b/repository/pom.xml
index 790d989735..ac94eb102f 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>9.7-SNAPSHOT</version>
+        <version>11.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/repository/src/test/java/org/alfresco/repo/module/ModuleVersionNumberTest.java b/repository/src/test/java/org/alfresco/repo/module/ModuleVersionNumberTest.java
index ac25191215..21fa56c8ef 100644
--- a/repository/src/test/java/org/alfresco/repo/module/ModuleVersionNumberTest.java
+++ b/repository/src/test/java/org/alfresco/repo/module/ModuleVersionNumberTest.java
@@ -231,7 +231,7 @@ public class ModuleVersionNumberTest extends TestCase
         return (ModuleVersionNumber) objectInputStream.readObject();
     }
 
-    // Tests that we can strip the suffixes such as "-M2", "-A12" or "-RC2" from versions "7.0.0-M2", "6.2.2-A12", "7.0.1-RC2"
+    // Tests that we can strip the suffixes such as "-M2", "-A12" or "-RC2" from versions "7.0.0-M2", "6.2.2-A12", "7.1.0-RC2"
     // The main version may contain 3 or 4 digit parts.
     public void testGetVersionWithoutSuffix()
     {