From 024857b8ee95b7181db432a820af5b06331fb6c3 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 10 Aug 2016 09:52:51 +0000 Subject: [PATCH 01/34] Merged 5.2.N (5.2.1) to trunk (5.2) 129413 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 129412 adavis: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 128754 slanglois: MNT-16391 Upgrade AOS Module to 1.1.3 in Full Installer git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@129414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 217246d6fa..5c827c17ee 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 3.0.3 - 1.1.2-SNAPSHOT + 1.1.3 5.1-20151118 From cc25898a6943424ef00a17efb337505549305800 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Huynh Date: Mon, 12 Sep 2016 12:24:52 +0000 Subject: [PATCH 02/34] BDE-790: Change Alfresco One installers final naming. Community keeps the date based naming convention. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@130561 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- enterprise-distribution/pom.xml | 2 +- enterprise-installer/pom.xml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml index 918910c78b..87942d86bd 100644 --- a/enterprise-distribution/pom.xml +++ b/enterprise-distribution/pom.xml @@ -60,7 +60,7 @@ - ${project.artifactId}-${installer.version.name} + ${project.artifactId}-${project.version} src/main/resources diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index 8f37a491fa..15adf6f5db 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -33,6 +33,12 @@ alfresco-one alfresco-one-distribution + + + ${project.version} From 8a7aca64b524595c2eeef5ff11a8b3641c929c8b Mon Sep 17 00:00:00 2001 From: Jean-Pierre Huynh Date: Mon, 12 Sep 2016 14:48:34 +0000 Subject: [PATCH 03/34] BDE-790: Change EAR final naming. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@130579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- ear/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ear/pom.xml b/ear/pom.xml index f56310e940..a068cd74e8 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -172,7 +172,7 @@ - ${project.artifactId}-${installer.version.name} + ${project.artifactId}-${project.version} From 1dfe3e2fc2f0e14a4958586ac4e55b2c0716c553 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Huynh Date: Mon, 12 Sep 2016 15:25:09 +0000 Subject: [PATCH 04/34] BDE-790: Fix EAR last mentions to install.version.name git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@130582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- ear/pom.xml | 2 +- ear/src/assembly/ear-distribution.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ear/pom.xml b/ear/pom.xml index a068cd74e8..71a437df42 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -275,7 +275,7 @@ src/assembly/myfaces-websphere.xml - myfaces1_1-websphere-shared-lib-${installer.version.name} + myfaces1_1-websphere-shared-lib-${project.version} false diff --git a/ear/src/assembly/ear-distribution.xml b/ear/src/assembly/ear-distribution.xml index 35732d8b91..6cd5bda5b8 100644 --- a/ear/src/assembly/ear-distribution.xml +++ b/ear/src/assembly/ear-distribution.xml @@ -26,11 +26,11 @@ - ${project.build.directory}/myfaces1_1-websphere-shared-lib-${installer.version.name}.zip + ${project.build.directory}/myfaces1_1-websphere-shared-lib-${project.version}.zip - ${project.build.directory}/alfresco-ear-distribution-${installer.version.name}.ear - alfresco-one-${installer.version.name}.ear + ${project.build.directory}/alfresco-ear-distribution-${project.version}.ear + alfresco-one-${project.version}.ear From 7fb3929212ab80bc3df6489a44d3ddc183ad4e07 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Fri, 30 Sep 2016 16:27:40 +0000 Subject: [PATCH 05/34] Merged 5.2.N (5.2.1) to trunk (5.2) 131124 amukha: ALF-21229: Installer: "View Readme File" option displays information-less file - Changed readme to point to the new community site. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@131125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- distribution/src/main/resources/README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/src/main/resources/README.txt b/distribution/src/main/resources/README.txt index 517e56f94d..7581560600 100644 --- a/distribution/src/main/resources/README.txt +++ b/distribution/src/main/resources/README.txt @@ -5,4 +5,4 @@ Contains: - Alfresco Platform: ${alfresco.platform.version} - Alfresco Share: ${alfresco.share.version} -See the Alfresco Wiki (https://wiki.alfresco.com) for release notes and detailed information on this release. +For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm From a3bc1f63b2eb6c44a366126623098d67b4fecf39 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 10 Nov 2016 15:32:39 +0000 Subject: [PATCH 06/34] Merged 5.2.N (5.2.1) to trunk (5.2) 131789 amukha: Merged 5.1.N (5.1.3) to 5.2.N (5.2.1) 131788 amukha: Merged 5.1.2 (5.1.2) to 5.1.N (5.1.3) 131783 slanglois: REPO-898 : Updated the AOSM version to the latest 1.1.4 in Full Installer git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@132648 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c827c17ee..73d6e6566c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 3.0.3 - 1.1.3 + 1.1.4 5.1-20151118 From 38dbf2020bfb551b047d7ca8801dce2d24e486cc Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 10 Nov 2016 15:34:52 +0000 Subject: [PATCH 07/34] Merged 5.2.N (5.2.1) to trunk (5.2) 131823 amukha: REPO-1260: Upgrade installer version of LibreOffice to 5.2.1 - Upgraded libreoffice to 5.2.1 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@132649 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73d6e6566c..cc2e44ad9a 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 7.0.59-alfresco-distribution 1.8.0_65 9.4.4-20151016 - 4.4.5-20151016 + 5.2.1-alfresco 8.64 6.9.1 1.0 From f16b48cfe0ef0c17ac39acbbe9b49357087cd043 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 10 Nov 2016 15:35:09 +0000 Subject: [PATCH 08/34] Merged 5.2.N (5.2.1) to trunk (5.2) 131865 amukha: REPO-1472 Security: ACE-5512 Java 8 multiple vulnerabilities REPO-1481: Update POM files - Change the Java version put into the full installer. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@132650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cc2e44ad9a..f2aa380407 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 5.1-20151118 7.0.59-alfresco-distribution - 1.8.0_65 + 1.8.0_111 9.4.4-20151016 5.2.1-alfresco 8.64 From 258d8fee40e0be08b29abb07e5ab49fa2ddc11f5 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 10 Nov 2016 15:35:21 +0000 Subject: [PATCH 09/34] Merged 5.2.N (5.2.1) to trunk (5.2) 132647 adavis: REPO-843 Upgrade our Servlet API usage to 3.0.1 (from 2.4 / 2.5) - Modified comments in jboss-deployment-structure.xml and weblogic-application.xml to indicate that the PLATFORM also has versions of these files. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@132651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../META-INF/jboss-deployment-structure.xml | 4 + .../META-INF/weblogic-application.xml | 83 ++++++++++++------- 2 files changed, 56 insertions(+), 31 deletions(-) diff --git a/ear/src/main/application/META-INF/jboss-deployment-structure.xml b/ear/src/main/application/META-INF/jboss-deployment-structure.xml index c9218b8cd7..655e7c208d 100644 --- a/ear/src/main/application/META-INF/jboss-deployment-structure.xml +++ b/ear/src/main/application/META-INF/jboss-deployment-structure.xml @@ -1,5 +1,9 @@ + diff --git a/ear/src/main/application/META-INF/weblogic-application.xml b/ear/src/main/application/META-INF/weblogic-application.xml index dd479dc6ab..62846f6922 100644 --- a/ear/src/main/application/META-INF/weblogic-application.xml +++ b/ear/src/main/application/META-INF/weblogic-application.xml @@ -1,6 +1,11 @@ - + + + repoclient @@ -15,31 +20,39 @@ antlr.* - com.bea.faces.* com.ctc.wstx.* + com.fasterxml.jackson.* com.google.common.* com.sun.codemodel.* - com.sun.faces.* + com.sun.istack.* com.sun.mail.* com.sun.tools.* com.sun.xml.bind.* - com.sun.xml.ws.* - com.sun.xml.ws.api.* - com.sun.xml.ws.developer.* - com.sun.xml.ws.server.* - com.sun.xml.ws.transport.* - com.sun.xml.ws.util.* - javax.faces.* + javax.annotation.* + javax.annotation.security.* javax.wsdl.* javax.wsdl.extensions.* javax.wsdl.factory.* javax.wsdl.xml.* + javax.inject.* + javax.jms.* + javax.mail.* + javax.mail.event.* + javax.mail.internet.* + javax.mail.search.* + javax.mail.util.* + javax.management.j2ee.* + javax.transaction.* + javax.transaction.xa.* + javax.xml.rpc.* + net.jcip.annotations.* net.sf.cglib.* org.antlr.runtime.* + org.aopalliance.aop.* + org.aopalliance.intercept.* org.apache.commons.* org.apache.oro.* org.apache.taglibs.* - org.apache.tools.* org.apache.xerces.* org.apache.xmlbeans.* org.apache.xmlcommons.* @@ -55,12 +68,10 @@ org.bouncycastle.util.* org.bouncycastle.voms.* org.bouncycastle.x509.* - org.codehaus.jackson.* + org.codehaus.jackson.* org.codehaus.stax2.* org.joda.time.* org.jvnet.fastinfoset.* - org.jvnet.mimepull.* - org.jvnet.staxex.* org.kohsuke.rngom.* org.mozilla.* org.objectweb.asm.* @@ -79,28 +90,38 @@ schemaorg_apache_xmlbeans.system.sXMLLANG.* schemaorg_apache_xmlbeans.system.sXMLSCHEMA.* schemaorg_apache_xmlbeans.system.sXMLTOOLS.* + + - javax.faces.* - com.sun.faces.* - com.bea.faces.* META-INF/services/javax.servlet.ServletContainerInitializer - META-INF/services/com.sun.tools.ws.api.wsdl.TWSDLExtensionHandler - META-INF/services/com.sun.tools.ws.processor.generator.GeneratorBase - META-INF/services/com.sun.tools.ws.processor.generator.GeneratorExtension - META-INF/services/com.sun.xml.ws.api.BindingIDFactory - META-INF/services/com.sun.xml.ws.api.client.ServiceInterceptorFactory - META-INF/services/com.sun.xml.ws.api.wsdl.parser.WSDLParserExtension - META-INF/services/com.sun.xml.ws.api.wsdl.writer.WSDLGeneratorExtension - META-INF/services/com.sun.xml.ws.spi.db.BindingContextFactory - META-INF/services/com.sun.xml.ws.spi.db.DatabindingProvider META-INF/services/javax.xml.bind.JAXBContext - META-INF/services/javax.xml.soap.MessageFactory - META-INF/services/javax.xml.soap.MetaFactory - META-INF/services/javax.xml.soap.SOAPConnectionFactory - META-INF/services/javax.xml.soap.SOAPElementFactory - META-INF/services/javax.xml.soap.SOAPFactory META-INF/services/javax.xml.ws.spi.Provider From 9639d9ff70bd9daac12858c47d2e28e1bcd5e37b Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 28 Nov 2016 21:05:31 +0000 Subject: [PATCH 10/34] Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) : 133250-133252 (to be merged later) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@133253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 From c92dee81880bb0be6f351bd5fd4c4c7fb31704cb Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 28 Nov 2016 21:07:56 +0000 Subject: [PATCH 11/34] Merged 5.2.N (5.2.1) to trunk (5.2) (RECORD ONLY) : 128024,128037,128096,128219,128336,128366,128436,128572 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@133254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 From 235ce4c5799fc9a3e33967f3cd65a0444a02e6ba Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 29 Nov 2016 10:15:17 +0000 Subject: [PATCH 12/34] Merged 5.2.0 (5.2.0) to trunk (5.2) (RECORD ONLY) : - 133265 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@133266 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 From cccf521fb0ac69bc121ddc4f26befb333a757d87 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Tue, 29 Nov 2016 16:55:50 +0000 Subject: [PATCH 13/34] Merged 5.2.0 (5.2.0) to trunk (5.2) (RECORD ONLY) : 133283 / 133281 (to be merged later) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@133284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 From 42a5b632a58fd3e389aac9d7e82d02f69b67ba24 Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Tue, 3 Jan 2017 10:54:51 +0000 Subject: [PATCH 14/34] Merged 5.2.0 (5.2.0) to HEAD (5.2) 133894: ACE-5717: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0) 133889 amukha: MNT-17283: Alfresco One 5.1.2 depends on unreleased version of AOS - Updated AOSM version. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@134030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2aa380407..c44489c3e5 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 3.0.3 - 1.1.4 + 1.1.5 5.1-20151118 From 562763bee12c6cdb2de2f24db87d1be728701d96 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 11 Jan 2017 12:36:11 +0000 Subject: [PATCH 15/34] Merged 5.2.0 (5.2.0) to trunk (5.2) (RECORD ONLY) : - 133259 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@134269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 From c8de49013b6dc4af93cdbe81740d5487cc9697ad Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 11 Jan 2017 15:35:03 +0000 Subject: [PATCH 16/34] Merged 5.2.0 (5.2.0) to HEAD (5.2) REPO-1710 Complete 5.2 branding items for Alfresco Community Edition - Deferred merges: 128252,132775,132846,133049,133250-133252,133265,133283 - Both branches are now in sync except for version numbers git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@134287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- distribution/pom.xml | 6 ++--- .../src/assembly/full-distribution.xml | 6 ++--- ear/pom.xml | 22 ++++++++++++------- ear/src/assembly/ear-distribution.xml | 8 +++---- enterprise-distribution/pom.xml | 10 ++++----- .../src/main/resources/README.txt | 8 +++---- enterprise-installer/pom.xml | 14 ++++++------ enterprise-war-for-ear/pom.xml | 7 ++++++ installer/pom.xml | 4 ++-- pom.xml | 2 +- 10 files changed, 50 insertions(+), 37 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 5d824b869a..2a24c927fe 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ alfresco-full-installation 5.2-SNAPSHOT - alfresco-community-distribution + alfresco-content-services-community-distribution jar Alfresco Full Distribution (Community Edition) @@ -47,7 +47,7 @@ org.alfresco - alfresco-share-distribution + alfresco-content-services-share-distribution ${alfresco.share.version} zip @@ -94,7 +94,7 @@ org.alfresco - alfresco-share-distribution + alfresco-content-services-share-distribution ${alfresco.share.version} zip diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml index a432329af8..ec4c83d42c 100644 --- a/distribution/src/assembly/full-distribution.xml +++ b/distribution/src/assembly/full-distribution.xml @@ -20,7 +20,7 @@ - ${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version} + ${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version} @@ -42,7 +42,7 @@ - ${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version} + ${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version} web-server/** @@ -51,7 +51,7 @@ - ${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples + ${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples web-server/shared/classes/alfresco/web-extension diff --git a/ear/pom.xml b/ear/pom.xml index 71a437df42..323b189e68 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -53,7 +53,7 @@ org.alfresco - alfresco-one-platform-distributionzip + alfresco-content-services-platform-distributionzip ${alfresco.platform.version} zip provided @@ -66,7 +66,7 @@ org.alfresco - alfresco-share-distribution + alfresco-content-services-share-distribution ${alfresco.share.version} zip provided @@ -145,10 +145,16 @@ jaxb-impl provided + + com.sun.xml.bind + jaxb-core + 2.2.11 + provided + javax.xml.bind jaxb-api - 2.1 + 2.2.12 provided @@ -222,9 +228,9 @@ unpack-dependencies - alfresco-one-platform-distributionzip + alfresco-content-services-platform-distributionzip true - alfresco-one-platform-distributionzip-${alfresco.platform.version}/solr4/,alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/webapps/,alfresco-one-platform-distributionzip-${alfresco.platform.version}/modules/ + alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/solr4/,alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/webapps/,alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/modules/ @@ -235,10 +241,10 @@ unpack-dependencies - alfresco-share-distribution + alfresco-content-services-share-distribution true * - alfresco-share-distribution-${alfresco.share.version}/web-extension-samples/ + alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples/ @@ -256,7 +262,7 @@ 1.0.1 - ${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/lib + ${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/lib diff --git a/ear/src/assembly/ear-distribution.xml b/ear/src/assembly/ear-distribution.xml index 6cd5bda5b8..e800040508 100644 --- a/ear/src/assembly/ear-distribution.xml +++ b/ear/src/assembly/ear-distribution.xml @@ -8,18 +8,18 @@ - ${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version} + ${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version} web-server/shared/** - ${project.build.directory}/dependency/alfresco-one-platform-distributionzip-${alfresco.platform.version}/web-server/shared/classes + ${project.build.directory}/dependency/alfresco-content-services-platform-distributionzip-${alfresco.platform.version}/web-server/shared/classes web-server/classpath - ${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples + ${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples web-server/classpath/alfresco/web-extension @@ -30,7 +30,7 @@ ${project.build.directory}/alfresco-ear-distribution-${project.version}.ear - alfresco-one-${project.version}.ear + alfresco-content-services-${project.version}.ear diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml index 87942d86bd..155a29d26c 100644 --- a/enterprise-distribution/pom.xml +++ b/enterprise-distribution/pom.xml @@ -6,7 +6,7 @@ alfresco-full-installation 5.2-SNAPSHOT - alfresco-one-distribution + alfresco-content-services-distribution jar Alfresco Full Distribution (Enterprise Edition) @@ -19,7 +19,7 @@ org.alfresco - alfresco-one-platform-distributionzip + alfresco-content-services-platform-distributionzip ${alfresco.platform.version} zip @@ -47,7 +47,7 @@ org.alfresco - alfresco-share-distribution + alfresco-content-services-share-distribution ${alfresco.share.version} zip @@ -81,7 +81,7 @@ org.alfresco - alfresco-one-platform-distributionzip + alfresco-content-services-platform-distributionzip ${alfresco.platform.version} zip @@ -94,7 +94,7 @@ org.alfresco - alfresco-share-distribution + alfresco-content-services-share-distribution ${alfresco.share.version} zip diff --git a/enterprise-distribution/src/main/resources/README.txt b/enterprise-distribution/src/main/resources/README.txt index 7091aa83ca..66e5741715 100644 --- a/enterprise-distribution/src/main/resources/README.txt +++ b/enterprise-distribution/src/main/resources/README.txt @@ -1,8 +1,8 @@ -Alfresco One (Build: ${installer.version.name}) -=============================== +Alfresco Content Services (Build: ${installer.version.name}) +============================================== Contains: - - Alfresco One Platform: ${alfresco.platform.version} - - Alfresco One Share: ${alfresco.share.version} + - Alfresco Content Services Platform: ${alfresco.platform.version} + - Alfresco Content Services Share: ${alfresco.share.version} See the Alfresco Support Portal (http://support.alfresco.com) for release notes and detailed information on this release. diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index 15adf6f5db..2571e99ad9 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -6,7 +6,7 @@ alfresco-full-installation 5.2-SNAPSHOT - alfresco-one-installer + alfresco-content-services-installer pom Alfresco Enterprise Full Installers @@ -17,7 +17,7 @@ ${binaries.folder}/build-classpath/license.xml project.version=${installer.version.name} - project.fullName='Alfresco One' + project.fullName='Alfresco Content Services' project.osxSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd-osx.p12 project.osxSigningPkcs12Password=${p12Password} project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12 @@ -31,8 +31,8 @@ - alfresco-one - alfresco-one-distribution + alfresco-content-services + alfresco-content-services-distribution org.alfresco - alfresco-community-installer + alfresco-content-services-community-installer ${project.version} pom @@ -73,13 +73,13 @@ org.alfresco - alfresco-one-installer-resources + alfresco-content-services-installer-resources ${alfresco.platform.version} ${project.build.directory}/classes org.alfresco - alfresco-one-distribution + alfresco-content-services-distribution ${project.version} zip ${project.build.directory}/distribution diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml index f4e7cd5b15..8f351422dc 100644 --- a/enterprise-war-for-ear/pom.xml +++ b/enterprise-war-for-ear/pom.xml @@ -50,6 +50,7 @@ + true org.alfresco @@ -67,6 +68,12 @@ amp + + + + true + + diff --git a/installer/pom.xml b/installer/pom.xml index 21c50b9c7e..db18687a89 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -6,7 +6,7 @@ alfresco-full-installation 5.2-SNAPSHOT - alfresco-community-installer + alfresco-content-services-community-installer pom Alfresco Community Full Installers @@ -302,7 +302,7 @@ org.alfresco - alfresco-community-distribution + alfresco-content-services-community-distribution ${project.version} zip ${project.build.directory}/distribution diff --git a/pom.xml b/pom.xml index c44489c3e5..b679dff34f 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ --> ${installer.build.timestamp}-${installer.build.number} - alfresco-community + alfresco-content-services-community ${alfresco.package.name}-distribution From fc0d45b94425729b36f6749dee7919cb8cde737c Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Thu, 12 Jan 2017 14:37:36 +0000 Subject: [PATCH 17/34] Merged 5.2.0 (5.2.0) to HEAD (5.2) 134298: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0) 134296: REPO-1710 Retain 'alfresco-community' for zip and installer file names git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/trunk@134299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- distribution/pom.xml | 2 +- enterprise-installer/pom.xml | 2 +- installer/pom.xml | 4 ++-- pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 2a24c927fe..adaae49354 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ alfresco-full-installation 5.2-SNAPSHOT - alfresco-content-services-community-distribution + alfresco-community-distribution jar Alfresco Full Distribution (Community Edition) diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index 2571e99ad9..56a9ec7092 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -45,7 +45,7 @@ org.alfresco - alfresco-content-services-community-installer + alfresco-community-installer ${project.version} pom diff --git a/installer/pom.xml b/installer/pom.xml index db18687a89..21c50b9c7e 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -6,7 +6,7 @@ alfresco-full-installation 5.2-SNAPSHOT - alfresco-content-services-community-installer + alfresco-community-installer pom Alfresco Community Full Installers @@ -302,7 +302,7 @@ org.alfresco - alfresco-content-services-community-distribution + alfresco-community-distribution ${project.version} zip ${project.build.directory}/distribution diff --git a/pom.xml b/pom.xml index b679dff34f..c44489c3e5 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ --> ${installer.build.timestamp}-${installer.build.number} - alfresco-content-services-community + alfresco-community ${alfresco.package.name}-distribution From ae3761b2edf695dd4d3d62bedd73f4ba304698a9 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Thu, 23 Mar 2017 17:04:03 +0000 Subject: [PATCH 18/34] MNT-17200: update ImageMagick to 7.0.5 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.2.N@136063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c44489c3e5..42dc500fed 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ 9.4.4-20151016 5.2.1-alfresco 8.64 - 6.9.1 + 7.0.5 1.0 From 3acb5c9cf4705c2d258ff8ef585ae0568a8223ec Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Wed, 24 May 2017 11:31:54 +0100 Subject: [PATCH 19/34] REPO-2485 Update version of common libs --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 42dc500fed..3246c35965 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 1.1.5 - 5.1-20151118 + 5.2-20170508 7.0.59-alfresco-distribution 1.8.0_111 9.4.4-20151016 From a86c4c1de3963269bc50a2aa02a32ede273e6bb6 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Wed, 24 May 2017 22:52:31 +0100 Subject: [PATCH 20/34] REPO-2483 Change ear artefact name --- ear/pom.xml | 2 +- ear/src/assembly/ear-distribution.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ear/pom.xml b/ear/pom.xml index 323b189e68..f98100a840 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -1,6 +1,6 @@ 4.0.0 - alfresco-ear-distribution + alfresco-content-services-ear-distribution Alfresco EAR Distribution org.alfresco diff --git a/ear/src/assembly/ear-distribution.xml b/ear/src/assembly/ear-distribution.xml index e800040508..7b6bde3e30 100644 --- a/ear/src/assembly/ear-distribution.xml +++ b/ear/src/assembly/ear-distribution.xml @@ -29,7 +29,7 @@ ${project.build.directory}/myfaces1_1-websphere-shared-lib-${project.version}.zip - ${project.build.directory}/alfresco-ear-distribution-${project.version}.ear + ${project.build.directory}/alfresco-content-services-ear-distribution-${project.version}.ear alfresco-content-services-${project.version}.ear From 502c1c3d57dd5c7db8b6d53e58080b41b4a2e92d Mon Sep 17 00:00:00 2001 From: Martin Muller Date: Tue, 30 May 2017 09:59:46 +0100 Subject: [PATCH 21/34] GOOGLEDOCS-394 googledocs upgrade to 3.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3246c35965..fba84565c1 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 5.2-SNAPSHOT - 3.0.3 + 3.0.4 1.1.5 From bade8c17fc05694e6734ae32c7bece3f0d333887 Mon Sep 17 00:00:00 2001 From: Stefan Kopf Date: Fri, 2 Jun 2017 12:48:26 +0200 Subject: [PATCH 22/34] Fix full-installer builds after adding the alfresco-pdf-renderer to the platform installer --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index fba84565c1..f7b1f0b8fe 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,7 @@ 8.64 7.0.5 1.0 + 1.0 ${maven.build.timestamp} From 97759203d1a989105e69f23adf9cd158f03c47f3 Mon Sep 17 00:00:00 2001 From: Stefan Kopf Date: Fri, 2 Jun 2017 16:41:55 +0200 Subject: [PATCH 23/34] Fix full-installer builds after adding the alfresco-pdf-renderer to the platform installer --- enterprise-installer/pom.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index 56a9ec7092..b02b5cfaee 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -49,6 +49,28 @@ ${project.version} pom + + + org.alfresco + alfresco-pdf-renderer + ${installer.alfresco-pdf-renderer.version} + linux + tgz + + + org.alfresco + alfresco-pdf-renderer + ${installer.alfresco-pdf-renderer.version} + osx + tgz + + + org.alfresco + alfresco-pdf-renderer + ${installer.alfresco-pdf-renderer.version} + win64 + tgz + From 06bf4f0ac6a6f570c7b913b597bc4b319771dd01 Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Mon, 12 Jun 2017 19:14:46 +0300 Subject: [PATCH 24/34] REPO-2352: Added .gitignore --- .gitignore | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..5cd20fa5aa --- /dev/null +++ b/.gitignore @@ -0,0 +1,34 @@ +*.class + +# Eclipse +.classpath +.settings +.project + +# Intellij +.idea/ +*.iml +*.iws + +# Mac +.DS_Store + +# Maven +target +*.log +*.log.* + +# Mobile Tools for Java (J2ME) + +.mtj +.tmp/ + +# Package Files # + +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml + +hs_err_pid* From d9bc8d27e642ae3a7c9eefb14e1e0448eeb91591 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Fri, 26 May 2017 15:07:31 +0100 Subject: [PATCH 25/34] REPO-2463 Disable win32 dependencies --- installer/pom.xml | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/installer/pom.xml b/installer/pom.xml index 21c50b9c7e..4bef7405b2 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -62,13 +62,6 @@ osx tgz - - org.apache.tomcat - tomcat - ${installer.tomcat.version} - win32 - tgz - org.apache.tomcat tomcat @@ -91,13 +84,6 @@ ${installer.postgresql.version} osx tgz - - - org.postgresql - postgresql-distribution - ${installer.postgresql.version} - win32 - tgz org.postgresql @@ -121,13 +107,6 @@ ${installer.java.version} osx tgz - - - com.oracle.java - jre - ${installer.java.version} - win32 - tgz com.oracle.java @@ -175,13 +154,6 @@ osx tgz - - com.ghostscript - ghostscript-distribution - ${installer.ghostscript.version} - win32 - tgz - com.ghostscript ghostscript-distribution @@ -205,13 +177,6 @@ osx tgz - - org.imagemagick - imagemagick-distribution - ${installer.imagemagick.version} - win32 - tgz - org.imagemagick imagemagick-distribution @@ -258,13 +223,6 @@ osx tgz - - org.alfresco - manager - ${installer.manager.version} - win32 - tgz - org.alfresco manager From 1657b8f5daefc012df3874d7cf7b6070915b6535 Mon Sep 17 00:00:00 2001 From: Martin Muller Date: Thu, 25 May 2017 11:45:53 +0100 Subject: [PATCH 26/34] REPO-2481 Updated AOS artifacts for installer to 1.1.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7b1f0b8fe..3abe4d64a6 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 3.0.4 - 1.1.5 + 1.1.6 5.2-20170508 From de9eacf9986d20420f3ad3b0023a22a7f8ce4a04 Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Sat, 17 Jun 2017 20:41:24 +0300 Subject: [PATCH 27/34] Fix *community* full-installer builds after adding the alfresco-pdf-renderer. --- enterprise-installer/pom.xml | 22 ------------------ installer/pom.xml | 44 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 44 deletions(-) diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index b02b5cfaee..56a9ec7092 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -49,28 +49,6 @@ ${project.version} pom - - - org.alfresco - alfresco-pdf-renderer - ${installer.alfresco-pdf-renderer.version} - linux - tgz - - - org.alfresco - alfresco-pdf-renderer - ${installer.alfresco-pdf-renderer.version} - osx - tgz - - - org.alfresco - alfresco-pdf-renderer - ${installer.alfresco-pdf-renderer.version} - win64 - tgz - diff --git a/installer/pom.xml b/installer/pom.xml index 4bef7405b2..f674cc6c3c 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -139,28 +139,28 @@ tgz - - - com.ghostscript - ghostscript-distribution - ${installer.ghostscript.version} - linux - tgz - - - com.ghostscript - ghostscript-distribution - ${installer.ghostscript.version} - osx - tgz - - - com.ghostscript - ghostscript-distribution - ${installer.ghostscript.version} - win64 - tgz - + + + org.alfresco + alfresco-pdf-renderer + ${installer.alfresco-pdf-renderer.version} + linux + tgz + + + org.alfresco + alfresco-pdf-renderer + ${installer.alfresco-pdf-renderer.version} + osx + tgz + + + org.alfresco + alfresco-pdf-renderer + ${installer.alfresco-pdf-renderer.version} + win64 + tgz + From ec959133283c09682715aa124731254894e6293f Mon Sep 17 00:00:00 2001 From: "NESS\\P3700526" Date: Mon, 26 Jun 2017 11:34:22 +0300 Subject: [PATCH 28/34] REPO-2535 : Community 201706: Stack upgrades - Upgrade alfresco common installer to version 2017/06/16 - Update to latest version of Tomcat(7.0.78), PostgreSQL(9.4.12), Java(1.8.0_131) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3abe4d64a6..2ee1207e01 100644 --- a/pom.xml +++ b/pom.xml @@ -25,10 +25,10 @@ 1.1.6 - 5.2-20170508 - 7.0.59-alfresco-distribution - 1.8.0_111 - 9.4.4-20151016 + 5.2-20170616 + 7.0.78-alfresco-distribution-20170616 + 1.8.0_131 + 9.4.12 5.2.1-alfresco 8.64 7.0.5 From a8a30ec6f51be0aa6ba6dfcd311fb7a8b6926db9 Mon Sep 17 00:00:00 2001 From: Nebil Kisa Date: Wed, 28 Jun 2017 16:58:49 +0100 Subject: [PATCH 29/34] Create tag for Alfresco Full Installer Community-201706 --- distribution/pom.xml | 2 +- ear/pom.xml | 2 +- enterprise-distribution/pom.xml | 2 +- enterprise-installer/pom.xml | 2 +- enterprise-war-for-ear/pom.xml | 2 +- installer/pom.xml | 2 +- pom.xml | 6 +++--- public-javadoc/pom.xml | 2 +- share-po-run/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index adaae49354..6861735cb0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 alfresco-community-distribution jar diff --git a/ear/pom.xml b/ear/pom.xml index f98100a840..b95dee7a97 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 pom diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml index 155a29d26c..5593d0af6b 100644 --- a/enterprise-distribution/pom.xml +++ b/enterprise-distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 alfresco-content-services-distribution jar diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index 56a9ec7092..3fdda7d38a 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 alfresco-content-services-installer pom diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml index 8f351422dc..702d0aaf78 100644 --- a/enterprise-war-for-ear/pom.xml +++ b/enterprise-war-for-ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 war diff --git a/installer/pom.xml b/installer/pom.xml index f674cc6c3c..285843bf94 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 alfresco-community-installer pom diff --git a/pom.xml b/pom.xml index 2ee1207e01..3ac731987a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,16 +7,16 @@ 6 alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 pom Alfresco Full Installation - 5.2-SNAPSHOT + 5.2.f - 5.2-SNAPSHOT + 5.2.g 3.0.4 diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index 56d7f01425..43a4351e29 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 pom diff --git a/share-po-run/pom.xml b/share-po-run/pom.xml index 1b122f9060..280497af94 100644 --- a/share-po-run/pom.xml +++ b/share-po-run/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Communit-201706y pom From d8cfcdd50f5488c57adb932e1696d73f8e7c67e3 Mon Sep 17 00:00:00 2001 From: Nebil Kisa Date: Wed, 28 Jun 2017 17:17:15 +0100 Subject: [PATCH 30/34] Revert "Create tag for Alfresco Full Installer Community-201706" This reverts commit a8a30ec6f51be0aa6ba6dfcd311fb7a8b6926db9. Reset to 5.2-SNAPSHOT --- distribution/pom.xml | 2 +- ear/pom.xml | 2 +- enterprise-distribution/pom.xml | 2 +- enterprise-installer/pom.xml | 2 +- enterprise-war-for-ear/pom.xml | 2 +- installer/pom.xml | 2 +- pom.xml | 6 +++--- public-javadoc/pom.xml | 2 +- share-po-run/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 6861735cb0..adaae49354 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT alfresco-community-distribution jar diff --git a/ear/pom.xml b/ear/pom.xml index b95dee7a97..f98100a840 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT pom diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml index 5593d0af6b..155a29d26c 100644 --- a/enterprise-distribution/pom.xml +++ b/enterprise-distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT alfresco-content-services-distribution jar diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index 3fdda7d38a..56a9ec7092 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT alfresco-content-services-installer pom diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml index 702d0aaf78..8f351422dc 100644 --- a/enterprise-war-for-ear/pom.xml +++ b/enterprise-war-for-ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT war diff --git a/installer/pom.xml b/installer/pom.xml index 285843bf94..f674cc6c3c 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT alfresco-community-installer pom diff --git a/pom.xml b/pom.xml index 3ac731987a..2ee1207e01 100644 --- a/pom.xml +++ b/pom.xml @@ -7,16 +7,16 @@ 6 alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT pom Alfresco Full Installation - 5.2.f + 5.2-SNAPSHOT - 5.2.g + 5.2-SNAPSHOT 3.0.4 diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index 43a4351e29..56d7f01425 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT pom diff --git a/share-po-run/pom.xml b/share-po-run/pom.xml index 280497af94..1b122f9060 100644 --- a/share-po-run/pom.xml +++ b/share-po-run/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Communit-201706y + 5.2-SNAPSHOT pom From 5ebe52500dcaf98cebfca09848f29fc4751292b3 Mon Sep 17 00:00:00 2001 From: Nebil Kisa Date: Thu, 29 Jun 2017 10:11:43 +0100 Subject: [PATCH 31/34] Create tag for Alfresco Full Installer Community-201706 --- distribution/pom.xml | 2 +- ear/pom.xml | 2 +- enterprise-distribution/pom.xml | 2 +- enterprise-installer/pom.xml | 2 +- enterprise-war-for-ear/pom.xml | 2 +- installer/pom.xml | 2 +- pom.xml | 6 +++--- public-javadoc/pom.xml | 2 +- share-po-run/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index adaae49354..6861735cb0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 alfresco-community-distribution jar diff --git a/ear/pom.xml b/ear/pom.xml index f98100a840..b95dee7a97 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 pom diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml index 155a29d26c..5593d0af6b 100644 --- a/enterprise-distribution/pom.xml +++ b/enterprise-distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 alfresco-content-services-distribution jar diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index 56a9ec7092..3fdda7d38a 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 alfresco-content-services-installer pom diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml index 8f351422dc..702d0aaf78 100644 --- a/enterprise-war-for-ear/pom.xml +++ b/enterprise-war-for-ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 war diff --git a/installer/pom.xml b/installer/pom.xml index f674cc6c3c..285843bf94 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 alfresco-community-installer pom diff --git a/pom.xml b/pom.xml index 2ee1207e01..7319c55ad9 100644 --- a/pom.xml +++ b/pom.xml @@ -7,16 +7,16 @@ 6 alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 pom Alfresco Full Installation - 5.2-SNAPSHOT + 5.2.g - 5.2-SNAPSHOT + 5.2.f 3.0.4 diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index 56d7f01425..43a4351e29 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 pom diff --git a/share-po-run/pom.xml b/share-po-run/pom.xml index 1b122f9060..c91c534270 100644 --- a/share-po-run/pom.xml +++ b/share-po-run/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201706 pom From 653c68280aa009e9a6387ade0d2e6680e122bdd1 Mon Sep 17 00:00:00 2001 From: Nebil Kisa Date: Thu, 29 Jun 2017 10:16:28 +0100 Subject: [PATCH 32/34] Revert "Create tag for Alfresco Full Installer Community-201706" This reverts commit 5ebe52500dcaf98cebfca09848f29fc4751292b3. Reset to 5.2-SNAPSHOT --- distribution/pom.xml | 2 +- ear/pom.xml | 2 +- enterprise-distribution/pom.xml | 2 +- enterprise-installer/pom.xml | 2 +- enterprise-war-for-ear/pom.xml | 2 +- installer/pom.xml | 2 +- pom.xml | 6 +++--- public-javadoc/pom.xml | 2 +- share-po-run/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 6861735cb0..adaae49354 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT alfresco-community-distribution jar diff --git a/ear/pom.xml b/ear/pom.xml index b95dee7a97..f98100a840 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT pom diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml index 5593d0af6b..155a29d26c 100644 --- a/enterprise-distribution/pom.xml +++ b/enterprise-distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT alfresco-content-services-distribution jar diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index 3fdda7d38a..56a9ec7092 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT alfresco-content-services-installer pom diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml index 702d0aaf78..8f351422dc 100644 --- a/enterprise-war-for-ear/pom.xml +++ b/enterprise-war-for-ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT war diff --git a/installer/pom.xml b/installer/pom.xml index 285843bf94..f674cc6c3c 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT alfresco-community-installer pom diff --git a/pom.xml b/pom.xml index 7319c55ad9..2ee1207e01 100644 --- a/pom.xml +++ b/pom.xml @@ -7,16 +7,16 @@ 6 alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT pom Alfresco Full Installation - 5.2.g + 5.2-SNAPSHOT - 5.2.f + 5.2-SNAPSHOT 3.0.4 diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index 43a4351e29..56d7f01425 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT pom diff --git a/share-po-run/pom.xml b/share-po-run/pom.xml index c91c534270..1b122f9060 100644 --- a/share-po-run/pom.xml +++ b/share-po-run/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201706 + 5.2-SNAPSHOT pom From 1ccff8704292ce4da6713b954ed12e769b6f38b8 Mon Sep 17 00:00:00 2001 From: Nebil Kisa Date: Tue, 11 Jul 2017 12:34:14 +0200 Subject: [PATCH 33/34] Create tag for Alfresco Full Installer Community-201707 --- distribution/pom.xml | 2 +- ear/pom.xml | 2 +- enterprise-distribution/pom.xml | 2 +- enterprise-installer/pom.xml | 2 +- enterprise-war-for-ear/pom.xml | 2 +- installer/pom.xml | 2 +- pom.xml | 6 +++--- public-javadoc/pom.xml | 2 +- share-po-run/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index adaae49354..39820fc54b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201707 alfresco-community-distribution jar diff --git a/ear/pom.xml b/ear/pom.xml index f98100a840..96d25f0fb0 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201707 pom diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml index 155a29d26c..66e8687089 100644 --- a/enterprise-distribution/pom.xml +++ b/enterprise-distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201707 alfresco-content-services-distribution jar diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index 56a9ec7092..68c3f1f1b7 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201707 alfresco-content-services-installer pom diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml index 8f351422dc..d26135ca52 100644 --- a/enterprise-war-for-ear/pom.xml +++ b/enterprise-war-for-ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201707 war diff --git a/installer/pom.xml b/installer/pom.xml index f674cc6c3c..94fa64b172 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201707 alfresco-community-installer pom diff --git a/pom.xml b/pom.xml index 2ee1207e01..e15ad3d16e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,16 +7,16 @@ 6 alfresco-full-installation - 5.2-SNAPSHOT + Community-201707 pom Alfresco Full Installation - 5.2-SNAPSHOT + 5.2.g - 5.2-SNAPSHOT + 5.2.f 3.0.4 diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index 56d7f01425..8d09c3400b 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201707 pom diff --git a/share-po-run/pom.xml b/share-po-run/pom.xml index 1b122f9060..84faa16deb 100644 --- a/share-po-run/pom.xml +++ b/share-po-run/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - 5.2-SNAPSHOT + Community-201707 pom From f29833b881552f9d1b174a76b4c2de0d6667c75d Mon Sep 17 00:00:00 2001 From: Nebil Kisa Date: Tue, 11 Jul 2017 12:36:28 +0200 Subject: [PATCH 34/34] Revert "Create tag for Alfresco Full Installer Community-201707" This reverts commit 1ccff8704292ce4da6713b954ed12e769b6f38b8. Revert back to state prior tag creation for next community release --- distribution/pom.xml | 2 +- ear/pom.xml | 2 +- enterprise-distribution/pom.xml | 2 +- enterprise-installer/pom.xml | 2 +- enterprise-war-for-ear/pom.xml | 2 +- installer/pom.xml | 2 +- pom.xml | 6 +++--- public-javadoc/pom.xml | 2 +- share-po-run/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index 39820fc54b..adaae49354 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201707 + 5.2-SNAPSHOT alfresco-community-distribution jar diff --git a/ear/pom.xml b/ear/pom.xml index 96d25f0fb0..f98100a840 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201707 + 5.2-SNAPSHOT pom diff --git a/enterprise-distribution/pom.xml b/enterprise-distribution/pom.xml index 66e8687089..155a29d26c 100644 --- a/enterprise-distribution/pom.xml +++ b/enterprise-distribution/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201707 + 5.2-SNAPSHOT alfresco-content-services-distribution jar diff --git a/enterprise-installer/pom.xml b/enterprise-installer/pom.xml index 68c3f1f1b7..56a9ec7092 100644 --- a/enterprise-installer/pom.xml +++ b/enterprise-installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201707 + 5.2-SNAPSHOT alfresco-content-services-installer pom diff --git a/enterprise-war-for-ear/pom.xml b/enterprise-war-for-ear/pom.xml index d26135ca52..8f351422dc 100644 --- a/enterprise-war-for-ear/pom.xml +++ b/enterprise-war-for-ear/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201707 + 5.2-SNAPSHOT war diff --git a/installer/pom.xml b/installer/pom.xml index 94fa64b172..f674cc6c3c 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -4,7 +4,7 @@ org.alfresco alfresco-full-installation - Community-201707 + 5.2-SNAPSHOT alfresco-community-installer pom diff --git a/pom.xml b/pom.xml index e15ad3d16e..2ee1207e01 100644 --- a/pom.xml +++ b/pom.xml @@ -7,16 +7,16 @@ 6 alfresco-full-installation - Community-201707 + 5.2-SNAPSHOT pom Alfresco Full Installation - 5.2.g + 5.2-SNAPSHOT - 5.2.f + 5.2-SNAPSHOT 3.0.4 diff --git a/public-javadoc/pom.xml b/public-javadoc/pom.xml index 8d09c3400b..56d7f01425 100644 --- a/public-javadoc/pom.xml +++ b/public-javadoc/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201707 + 5.2-SNAPSHOT pom diff --git a/share-po-run/pom.xml b/share-po-run/pom.xml index 84faa16deb..1b122f9060 100644 --- a/share-po-run/pom.xml +++ b/share-po-run/pom.xml @@ -5,7 +5,7 @@ org.alfresco alfresco-full-installation - Community-201707 + 5.2-SNAPSHOT pom