From 30eb51ec636504983f921fdde9fce3adc8dc0bb3 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Thu, 10 Sep 2015 13:30:19 +0000 Subject: [PATCH 1/5] Create branch 5.1.N from HEAD r111853 identified as 5.1.1-SNAPSHOT git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@111862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc3c66c867..f1516b1f25 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ alfresco-parent org.alfresco - 5.1-SNAPSHOT + 5.1.1-SNAPSHOT ../../../pom.xml From 99ad4188402033b5b56e917d63e884db07315f00 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 9 Mar 2016 11:11:47 +0000 Subject: [PATCH 2/5] Surf repackaging to separate codebase (was only done on SHARE). - references to old groupId org.springframework.extensions.surf still needed to be changed to org.alfresco.surf git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f1516b1f25..903d22f927 100644 --- a/pom.xml +++ b/pom.xml @@ -185,12 +185,12 @@ - org.springframework.extensions.surf + org.alfresco.surf spring-surf ${project.version} - org.springframework.extensions.surf + org.alfresco.surf spring-surf-api ${project.version} From 1f282dd665c003a719174ad6c8ff353186e870b2 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 9 Mar 2016 19:16:58 +0000 Subject: [PATCH 3/5] Merged 5.1.0 (5.1.0.1) to 5.1.N (5.1.1) 123380 slanglois: Fix reference to Surf groupIds: previously released JLan still pulls the old one git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123395 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 903d22f927..d2fcd8b00e 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,12 @@ ${project.version} war + + ${alfresco.groupId} + alfresco-platform + ${project.version} + war + ${alfresco.groupId} @@ -165,12 +171,6 @@ provided - - ${alfresco.groupId} - alfresco-web-service-client - ${project.version} - provided - ${alfresco.groupId} alfresco-webeditor @@ -187,12 +187,12 @@ org.alfresco.surf spring-surf - ${project.version} + ${dependency.surf.version} org.alfresco.surf spring-surf-api - ${project.version} + ${dependency.surf.version} From 591e5d412ed13f993a1ac6537867e5e57c62cfa4 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 12 Mar 2016 14:02:36 +0000 Subject: [PATCH 4/5] Incremented version to 5.1.2 and schema to 9050 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d2fcd8b00e..54451751ec 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ alfresco-parent org.alfresco - 5.1.1-SNAPSHOT + 5.1.2-SNAPSHOT ../../../pom.xml From bf996334f72f9076bbc07021f289b59fd853c469 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 21 Jul 2016 09:16:45 +0000 Subject: [PATCH 5/5] Change version to 5.2.0-CLOUD44-SNAPSHOT - pom.xml files changed - version.properties is already 5.2.0 so does not need to change until the first HF. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.0-CLOUD44/root@128855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8ca75d52b..e4daed33ff 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ alfresco-parent org.alfresco - 5.2-SNAPSHOT + 5.2.0-CLOUD44-SNAPSHOT ../../../pom.xml