From 1c2f710e8d37c19e39dac6835fdc1c746b31aecf 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 cdecc4b000..c405d096b6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-packaging - 5.1-SNAPSHOT + 5.1.1-SNAPSHOT ../pom.xml alfresco-platform-community-distributionzip From 7699054e8a1572f1f1f751999b9df3756d222042 Mon Sep 17 00:00:00 2001 From: Natalia Smintanca Date: Thu, 19 Nov 2015 09:33:36 +0000 Subject: [PATCH 2/5] Merged HEAD (5.1) to 5.1.N (5.1.1) 117632 jphuynh: Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1) 117183 adavis: BDE-443 Check whether we can buy licenses for the GPL components we ship - Remove Pdf2Swf specific transformer config from transformers.properties and spring context.xml - Remove references to Pdf2Swf and swftools from License notes, pom files, admin ui, admin ui English property values (translations still exist) and some obvious unit tests. - Note: SWFTransformationOptions has been left as it is used in tests. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/licenses/notice.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/licenses/notice.txt b/src/main/resources/licenses/notice.txt index 9e6b4194f3..29bb76fa2e 100644 --- a/src/main/resources/licenses/notice.txt +++ b/src/main/resources/licenses/notice.txt @@ -200,7 +200,6 @@ ncurses http://www.gnu.org/software/ncurses/ libiconv http://www.gnu.org/software/libiconv/ libstdc++ http://gcc.gnu.org/libstdc++/ LibreOffice Portable http://portableapps.com/apps/office/libreoffice_portable -SWF Tools http://www.swftools.org/ === ICU License === From 5c2d87808855da029a46a6fa573e721c58d640dd Mon Sep 17 00:00:00 2001 From: Ramona Neamtu Date: Fri, 20 Nov 2015 10:18:44 +0000 Subject: [PATCH 3/5] Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE) 118083 rneamtu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4) 117710 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6) 117626 rneamtu: Merged NESS/4.1.N-2015-11-13 (4.1.11) to V4.1-BUG-FIX (4.1.11) 117543: MNT-15230 : Update Copyright year to 2016 - Updated year; renamed splash_2016.png 117912 rneamtu: MNT-15230 : Update Copyright year to 2016 - Modified extra properties files for V4.2.N git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@118172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- src/main/resources/licenses/notice.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/licenses/notice.txt b/src/main/resources/licenses/notice.txt index 29bb76fa2e..080f88dd72 100644 --- a/src/main/resources/licenses/notice.txt +++ b/src/main/resources/licenses/notice.txt @@ -1,4 +1,4 @@ -Copyright (c) 2005-2015 Alfresco Software, Ltd. and others. +Copyright (c) 2005-2016 Alfresco Software, Ltd. and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Alfresco agreement located at www.alfresco.com/legal/agreements/ or other commercial agreement between Alfresco Software, Ltd. ("Alfresco") and the user of this program. From defb26b9945584e990c8fef8466294e3302ca7ae 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 c405d096b6..804fd1eac7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-packaging - 5.1.1-SNAPSHOT + 5.1.2-SNAPSHOT ../pom.xml alfresco-platform-community-distributionzip From 20a385b35cafe22c93a07382f3fb5f00fcc96a90 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 607715f197..3df56be055 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-packaging - 5.2-SNAPSHOT + 5.2.0-CLOUD44-SNAPSHOT ../pom.xml alfresco-platform-community-distributionzip