From 3b2d8c11a1d1a0d4618b3d514fbd44ed743c8cc0 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 16 Oct 2017 10:37:43 +0100 Subject: [PATCH 1/5] [maven-release-plugin] prepare release acs-community-packaging-6.0.0-test --- docker/pom.xml | 2 +- pom.xml | 4 +- war/pom.xml | 2 +- zip/pom.xml | 369 ++++++++++++++++++++++++------------------------- 4 files changed, 188 insertions(+), 189 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index 2b7c6fa0f6..fad2241d0f 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-SNAPSHOT + 6.0.0-test ../pom.xml diff --git a/pom.xml b/pom.xml index 2d9a5fa25e..3545bcf298 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 acs-community-packaging Alfresco Content Services Community Packaging - 6.0.0-SNAPSHOT + 6.0.0-test pom @@ -21,7 +21,7 @@ scm:git:git@github.com:Alfresco/acs-community-packaging.git scm:git:git@github.com:Alfresco/acs-community-packaging.git https://github.com/Alfresco/acs-community-packaging - HEAD + acs-community-packaging-6.0.0-test diff --git a/war/pom.xml b/war/pom.xml index 58f62ea49a..31c4c64691 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-SNAPSHOT + 6.0.0-test ../pom.xml diff --git a/zip/pom.xml b/zip/pom.xml index be2030ba5b..b02b99014a 100644 --- a/zip/pom.xml +++ b/zip/pom.xml @@ -1,186 +1,185 @@ - - 4.0.0 - alfresco-content-services-community-distribution - jar - Alfresco Content Services Community WAR Installation - - - org.alfresco - acs-community-packaging - 6.0.0-SNAPSHOT - ../pom.xml - - - - - - org.alfresco - content-services-community - ${project.version} - war - - - org.alfresco - alfresco-server-root - war - - - - org.alfresco - alfresco-mmt - - - - - org.alfresco - alfresco-repository - - - org.alfresco - alfresco-data-model - - - org.alfresco - content-services-community - ${project.version} - classes - - - - - org.postgresql - postgresql - ${dependency.postgresql.version} - - - - - org.alfresco - alfresco-pdf-renderer - linux - tgz - - - org.alfresco - alfresco-pdf-renderer - win64 - tgz - - - - - - ${project.artifactId}-${project.version} - - - - src/main/resources - true - - - - - maven-dependency-plugin - - - - extract-keystore - generate-resources - - unpack - - - - - org.alfresco - alfresco-repository - alfresco/keystore/** - - - - - - - - extract-jlan-dll - generate-resources - - unpack - - - - - org.alfresco - alfresco-jlan-embed - windll - *.dll - - - - - - - - copy-resources - generate-resources - - copy - - - - - org.alfresco - alfresco-server-root - war - ${project.build.outputDirectory}/web-server/webapps - ROOT.war - - - - - - - - - - maven-assembly-plugin - - - make-assembly - package - - single - - - - - false - - src/assemblies/distribution.xml - - - - - - - maven-jar-plugin - - - create-assembly-descriptor - - jar - - - assembly - ${basedir}/src - - assemblies/* - - - - - - - + + 4.0.0 + alfresco-content-services-community-distribution + jar + Alfresco Content Services Community WAR Installation + + + org.alfresco + acs-community-packaging + 6.0.0-test + ../pom.xml + + + + + + org.alfresco + content-services-community + ${project.version} + war + + + org.alfresco + alfresco-server-root + war + + + + org.alfresco + alfresco-mmt + + + + + org.alfresco + alfresco-repository + + + org.alfresco + alfresco-data-model + + + org.alfresco + content-services-community + ${project.version} + classes + + + + + org.postgresql + postgresql + ${dependency.postgresql.version} + + + + + org.alfresco + alfresco-pdf-renderer + linux + tgz + + + org.alfresco + alfresco-pdf-renderer + win64 + tgz + + + + + + ${project.artifactId}-${project.version} + + + + src/main/resources + true + + + + + maven-dependency-plugin + + + + extract-keystore + generate-resources + + unpack + + + + + org.alfresco + alfresco-repository + alfresco/keystore/** + + + + + + + + extract-jlan-dll + generate-resources + + unpack + + + + + org.alfresco + alfresco-jlan-embed + windll + *.dll + + + + + + + + copy-resources + generate-resources + + copy + + + + + org.alfresco + alfresco-server-root + war + ${project.build.outputDirectory}/web-server/webapps + ROOT.war + + + + + + + + + + maven-assembly-plugin + + + make-assembly + package + + single + + + + + false + + src/assemblies/distribution.xml + + + + + + + maven-jar-plugin + + + create-assembly-descriptor + + jar + + + assembly + ${basedir}/src + + assemblies/* + + + + + + + \ No newline at end of file From 094eb18191db2624aedf8162a9d538c1347f9eb4 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Mon, 16 Oct 2017 10:37:49 +0100 Subject: [PATCH 2/5] [maven-release-plugin] prepare for next development iteration --- docker/pom.xml | 2 +- pom.xml | 4 ++-- war/pom.xml | 2 +- zip/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index fad2241d0f..2b7c6fa0f6 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-test + 6.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 3545bcf298..2d9a5fa25e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 acs-community-packaging Alfresco Content Services Community Packaging - 6.0.0-test + 6.0.0-SNAPSHOT pom @@ -21,7 +21,7 @@ scm:git:git@github.com:Alfresco/acs-community-packaging.git scm:git:git@github.com:Alfresco/acs-community-packaging.git https://github.com/Alfresco/acs-community-packaging - acs-community-packaging-6.0.0-test + HEAD diff --git a/war/pom.xml b/war/pom.xml index 31c4c64691..58f62ea49a 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-test + 6.0.0-SNAPSHOT ../pom.xml diff --git a/zip/pom.xml b/zip/pom.xml index b02b99014a..8348f4ecc9 100644 --- a/zip/pom.xml +++ b/zip/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-test + 6.0.0-SNAPSHOT ../pom.xml From 9a455709654b6b1886f3c1850d91ba8b63e4f1f6 Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 17 Oct 2017 15:30:49 +0100 Subject: [PATCH 3/5] [maven-release-plugin] prepare release acs-community-packaging-6.0.0-ea-test1 --- docker/pom.xml | 2 +- pom.xml | 4 ++-- war/pom.xml | 2 +- zip/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index 2b7c6fa0f6..6d19afc6c8 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-SNAPSHOT + 6.0.0-ea-test1 ../pom.xml diff --git a/pom.xml b/pom.xml index 2d9a5fa25e..1dde6d3552 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 acs-community-packaging Alfresco Content Services Community Packaging - 6.0.0-SNAPSHOT + 6.0.0-ea-test1 pom @@ -21,7 +21,7 @@ scm:git:git@github.com:Alfresco/acs-community-packaging.git scm:git:git@github.com:Alfresco/acs-community-packaging.git https://github.com/Alfresco/acs-community-packaging - HEAD + acs-community-packaging-6.0.0-ea-test1 diff --git a/war/pom.xml b/war/pom.xml index 58f62ea49a..6eedb7fc49 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-SNAPSHOT + 6.0.0-ea-test1 ../pom.xml diff --git a/zip/pom.xml b/zip/pom.xml index 8348f4ecc9..cb6ecbbd49 100644 --- a/zip/pom.xml +++ b/zip/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-SNAPSHOT + 6.0.0-ea-test1 ../pom.xml From 34c0758bd217208ae09a5ed6fde9ac1d6a416d9c Mon Sep 17 00:00:00 2001 From: alfresco-build Date: Tue, 17 Oct 2017 15:30:55 +0100 Subject: [PATCH 4/5] [maven-release-plugin] prepare for next development iteration --- docker/pom.xml | 2 +- pom.xml | 4 ++-- war/pom.xml | 2 +- zip/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index 6d19afc6c8..2b7c6fa0f6 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-ea-test1 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 1dde6d3552..2d9a5fa25e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 acs-community-packaging Alfresco Content Services Community Packaging - 6.0.0-ea-test1 + 6.0.0-SNAPSHOT pom @@ -21,7 +21,7 @@ scm:git:git@github.com:Alfresco/acs-community-packaging.git scm:git:git@github.com:Alfresco/acs-community-packaging.git https://github.com/Alfresco/acs-community-packaging - acs-community-packaging-6.0.0-ea-test1 + HEAD diff --git a/war/pom.xml b/war/pom.xml index 6eedb7fc49..58f62ea49a 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-ea-test1 + 6.0.0-SNAPSHOT ../pom.xml diff --git a/zip/pom.xml b/zip/pom.xml index cb6ecbbd49..8348f4ecc9 100644 --- a/zip/pom.xml +++ b/zip/pom.xml @@ -7,7 +7,7 @@ org.alfresco acs-community-packaging - 6.0.0-ea-test1 + 6.0.0-SNAPSHOT ../pom.xml From 124c5eb3b10922ffec14e23d210be4dbf5c8ee3f Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 9 Nov 2017 21:44:53 +0000 Subject: [PATCH 5/5] Pick up core 6.15, data-model 6.22, repository 6.10 & remote-api 6.6 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8286456bba..38c5d6d74e 100644 --- a/pom.xml +++ b/pom.xml @@ -40,11 +40,11 @@ Community - 6.8 - 6.3 + 6.10 + 6.6 2.2 - 6.14 - 6.21 + 6.15 + 6.22 6.0 1.0 6.3