From e27d6f1a70745ae9ab99b18166c15647d7e62707 Mon Sep 17 00:00:00 2001
From: Jose Luis Osorno <joseluis.osorno@ixxus.com>
Date: Mon, 25 Mar 2019 16:15:09 +0100
Subject: [PATCH 1/3] Archetypes - Update ACS 6.1 versions

- Update the ACS and share versions to Alfresco 6.1.
- Set Alfresco community 6.1 as the default one.
- Create new profile to test Alfresco community 6.0.
---
 pom.xml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index f00dcbfd..a9d4ae05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,8 +135,8 @@
         <alfresco.sdk.tests.exclude>*/*-enterprise*/*</alfresco.sdk.tests.exclude>
 
         <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
-        <alfresco.platform.version>6.0.7-ga</alfresco.platform.version>
-        <alfresco.share.version>6.0.b</alfresco.share.version>
+        <alfresco.platform.version>6.1.2-ga</alfresco.platform.version>
+        <alfresco.share.version>6.1.0-RC3</alfresco.share.version>
         <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
         <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
 
@@ -298,6 +298,18 @@
             </distributionManagement>
         </profile>
 
+        <!-- 6.0 -->
+        <profile>
+            <id>community-60-tests</id>
+            <properties>
+                <alfresco.bomDependency.artifactId>acs-community-packaging</alfresco.bomDependency.artifactId>
+                <alfresco.platform.version>6.0.7-ga</alfresco.platform.version>
+                <alfresco.share.version>6.0.b</alfresco.share.version>
+                <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
+                <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
+            </properties>
+        </profile>
+
         <profile>
             <id>enterprise-60-tests</id>
             <properties>
@@ -309,13 +321,14 @@
             </properties>
         </profile>
 
+        <!-- 6.1 -->
         <!-- This profile requires to be executed using Java 11 -->
         <profile>
             <id>enterprise-61-tests</id>
             <properties>
                 <alfresco.bomDependency.artifactId>acs-packaging</alfresco.bomDependency.artifactId>
-                <alfresco.platform.version>6.1.0-RC4</alfresco.platform.version>
-                <alfresco.share.version>6.1.0-RC3</alfresco.share.version>
+                <alfresco.platform.version>6.1.0</alfresco.platform.version>
+                <alfresco.share.version>6.1.0</alfresco.share.version>
                 <alfresco.platform.docker.image>alfresco/alfresco-content-repository</alfresco.platform.docker.image>
                 <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
             </properties>

From 517b20859ea61852511639597a4fe38cd34fe344 Mon Sep 17 00:00:00 2001
From: Jose Luis Osorno <joseluis.osorno@ixxus.com>
Date: Mon, 25 Mar 2019 16:20:41 +0100
Subject: [PATCH 2/3] Documentation - Update Alfresco versions

---
 docs/advanced-topics/switching-versions.md             | 5 ++---
 docs/advanced-topics/working-with-enterprise/README.md | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/advanced-topics/switching-versions.md b/docs/advanced-topics/switching-versions.md
index f6f0d24c..9d27c8db 100644
--- a/docs/advanced-topics/switching-versions.md
+++ b/docs/advanced-topics/switching-versions.md
@@ -15,10 +15,9 @@ to use.
 When editing `pom.xml` you will see a number of properties that define the Alfresco Content Services platform version and the Alfresco Share version, such as:
 
 ```
-<alfresco.platform.version>6.0.7-ga</alfresco.platform.version>
-<alfresco.share.version>6.0.c</alfresco.share.version>
+<alfresco.platform.version>6.1.2-ga</alfresco.platform.version>
+<alfresco.share.version>6.1.0-RC3</alfresco.share.version>
 ```
-**(confirmation required)**
 
 Before continuing, always remember to start from a newly generated SDK project before changing the version numbers. We do not recommend changing the versions 
 using developed customizations or source code.
diff --git a/docs/advanced-topics/working-with-enterprise/README.md b/docs/advanced-topics/working-with-enterprise/README.md
index e532c5b2..d894de7a 100644
--- a/docs/advanced-topics/working-with-enterprise/README.md
+++ b/docs/advanced-topics/working-with-enterprise/README.md
@@ -54,10 +54,9 @@ The configuration of the Enterprise version is straightforward when using the `p
 You'll need to update the following settings in the `pom.xml` file:
 
 ```
-<alfresco.platform.version>6.0.0.2</alfresco.platform.version>
-<alfresco.share.version>6.0</alfresco.share.version>
+<alfresco.platform.version>6.1.0</alfresco.platform.version>
+<alfresco.share.version>6.1.0</alfresco.share.version>
 ```
-**(confirmation required)**
 
 Making use of the Alfresco SDK 4.0 it is no longer required the configuration of the Alfresco Surf versions. The inclusion of the BOM and the custom Docker
 images will take care of that task automatically for you.

From 1d1e89a86d7bbdcb30a539711fcf4988aa20cbf0 Mon Sep 17 00:00:00 2001
From: Jose Luis Osorno <joseluis.osorno@ixxus.com>
Date: Mon, 25 Mar 2019 16:51:05 +0100
Subject: [PATCH 3/3] Archetypes - Remove unnecessary properties

---
 modules/alfresco-rad/pom.xml | 14 +++++++++++++-
 pom.xml                      |  5 -----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml
index 13cf2c64..dafa89d9 100644
--- a/modules/alfresco-rad/pom.xml
+++ b/modules/alfresco-rad/pom.xml
@@ -14,12 +14,23 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.alfresco</groupId>
+                <artifactId>${alfresco.bomDependency.artifactId}</artifactId>
+                <version>${alfresco.platform.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <!-- Access to org.alfresco.service.ServiceRegistry -->
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-repository</artifactId>
-            <version>${alfresco.community.default.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -35,6 +46,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
+            <scope>compile</scope>
         </dependency>
 
     </dependencies>
diff --git a/pom.xml b/pom.xml
index a9d4ae05..b43b3dbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,11 +140,6 @@
         <alfresco.platform.docker.image>alfresco/alfresco-content-repository-community</alfresco.platform.docker.image>
         <alfresco.share.docker.image>alfresco/alfresco-share</alfresco.share.docker.image>
 
-        <!-- The following version is needed for alfresco-rad -->
-        <alfresco.community.default.version>5.2.f</alfresco.community.default.version>
-        <alfresco.enterprise.default.version>5.2.0</alfresco.enterprise.default.version>
-        <alfresco.sdk.default.edition>community</alfresco.sdk.default.edition>
-
         <test.acs.endpoint.path />
 
         <scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>