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: ``` -6.0.7-ga -6.0.c +6.1.2-ga +6.1.0-RC3 ``` -**(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: ``` -6.0.0.2 -6.0 +6.1.0 +6.1.0 ``` -**(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. 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 @@ ../../pom.xml + + + + org.alfresco + ${alfresco.bomDependency.artifactId} + ${alfresco.platform.version} + pom + import + + + + org.alfresco alfresco-repository - ${alfresco.community.default.version} provided @@ -35,6 +46,7 @@ junit junit 4.12 + compile diff --git a/pom.xml b/pom.xml index f00dcbfd..b43b3dbc 100644 --- a/pom.xml +++ b/pom.xml @@ -135,16 +135,11 @@ */*-enterprise*/* acs-community-packaging - 6.0.7-ga - 6.0.b + 6.1.2-ga + 6.1.0-RC3 alfresco/alfresco-content-repository-community alfresco/alfresco-share - - 5.2.f - 5.2.0 - community - https://github.com/Alfresco/alfresco-sdk @@ -298,6 +293,18 @@ + + + community-60-tests + + acs-community-packaging + 6.0.7-ga + 6.0.b + alfresco/alfresco-content-repository-community + alfresco/alfresco-share + + + enterprise-60-tests @@ -309,13 +316,14 @@ + enterprise-61-tests acs-packaging - 6.1.0-RC4 - 6.1.0-RC3 + 6.1.0 + 6.1.0 alfresco/alfresco-content-repository alfresco/alfresco-share