From 22102ca16f3df9fc4f1e9776216c265fe696ba70 Mon Sep 17 00:00:00 2001 From: mindthegab Date: Mon, 5 Nov 2012 01:42:40 +0000 Subject: [PATCH 1/5] [maven-release-plugin] prepare for next development iteration git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@651 04253f4f-3451-0410-a141-5562f1e59037 --- archetypes/alfresco-allinone-archetype/pom.xml | 2 +- archetypes/alfresco-amp-archetype/pom.xml | 2 +- plugins/alfresco-maven-plugin/pom.xml | 2 +- pom.xml | 8 ++++---- poms/alfresco-sdk-parent/pom.xml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index eadce49c..fa4b67ad 100644 --- a/archetypes/alfresco-allinone-archetype/pom.xml +++ b/archetypes/alfresco-allinone-archetype/pom.xml @@ -11,7 +11,7 @@ org.alfresco.maven alfresco-lifecycle-aggregator - 1.0 + 1.1-SNAPSHOT ../../pom.xml diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index 685f8171..edf96d3c 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -12,7 +12,7 @@ org.alfresco.maven alfresco-lifecycle-aggregator - 1.0 + 1.1-SNAPSHOT ../../pom.xml diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 99d55bba..910a1505 100644 --- a/plugins/alfresco-maven-plugin/pom.xml +++ b/plugins/alfresco-maven-plugin/pom.xml @@ -8,7 +8,7 @@ org.alfresco.maven alfresco-lifecycle-aggregator - 1.0 + 1.1-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index b8ffa3a3..b33af120 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.alfresco.maven alfresco-lifecycle-aggregator - 1.0 + 1.1-SNAPSHOT Maven Alfresco SDK™ This aggregator Project builds all modules required for the Maven Alfresco SDK pom @@ -27,9 +27,9 @@ - scm:svn:https://maven-alfresco-archetypes.googlecode.com/svn/tags/alfresco-lifecycle-aggregator-1.0 - scm:svn:https://maven-alfresco-archetypes.googlecode.com/svn/tags/alfresco-lifecycle-aggregator-1.0 - https://maven-alfresco-archetypes.googlecode.com/svn/tags/alfresco-lifecycle-aggregator-1.0 + scm:svn:${scm.url.base}/trunk + scm:svn:${scm.url.base}/trunk + ${scm.url.base}/trunk diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 739a231d..7a720d18 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -12,7 +12,7 @@ pom - 1.0 + 1.1-SNAPSHOT @@ -108,7 +108,7 @@ ../../target/staging/poms/alfresco-sdk-parent - 1.0 + 1.1-SNAPSHOT 1.3.158 1.5 From 0f914216c1ac3ef069b569c34733b79dc6fa7336 Mon Sep 17 00:00:00 2001 From: mindthegab Date: Mon, 5 Nov 2012 01:45:21 +0000 Subject: [PATCH 2/5] [maven-release-plugin] rollback the release of alfresco-lifecycle-aggregator-1.0 git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@653 04253f4f-3451-0410-a141-5562f1e59037 --- .../alfresco-allinone-archetype/pom.xml | 36 +++++++++--------- archetypes/alfresco-amp-archetype/pom.xml | 38 +++++++++---------- plugins/alfresco-maven-plugin/pom.xml | 5 ++- pom.xml | 5 ++- poms/alfresco-sdk-parent/pom.xml | 7 ++-- 5 files changed, 47 insertions(+), 44 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index fa4b67ad..3f80f7da 100644 --- a/archetypes/alfresco-allinone-archetype/pom.xml +++ b/archetypes/alfresco-allinone-archetype/pom.xml @@ -1,18 +1,18 @@ - - - 4.0.0 - - org.alfresco.maven.archetype - alfresco-allinone-archetype - maven-archetype - All-in-One Archetype from Maven Alfresco SDK - Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for: Repository, AMP, Share, Solr, Web Quick Start and embedded Jetty run - - - org.alfresco.maven - alfresco-lifecycle-aggregator - 1.1-SNAPSHOT - ../../pom.xml - - - + + + 4.0.0 + + org.alfresco.maven.archetype + alfresco-allinone-archetype + maven-archetype + All-in-One Archetype from Maven Alfresco SDK + Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for: Repository, AMP, Share, Solr, Web Quick Start and embedded Jetty run + + + org.alfresco.maven + alfresco-lifecycle-aggregator + 1.0-SNAPSHOT + ../../pom.xml + + + diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index edf96d3c..bb41734c 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -1,19 +1,19 @@ - - - 4.0.0 - - org.alfresco.maven.archetype - alfresco-amp-archetype - - maven-archetype - AMP Archetype from Maven Alfresco SDK - Sample project with full support for lifecycle and rapid development of AMPs (Alfresco Module Packages) - - - org.alfresco.maven - alfresco-lifecycle-aggregator - 1.1-SNAPSHOT - ../../pom.xml - - - + + + 4.0.0 + + org.alfresco.maven.archetype + alfresco-amp-archetype + + maven-archetype + AMP Archetype from Maven Alfresco SDK + Sample project with full support for lifecycle and rapid development of AMPs (Alfresco Module Packages) + + + org.alfresco.maven + alfresco-lifecycle-aggregator + 1.0-SNAPSHOT + ../../pom.xml + + + diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 910a1505..28cfacf7 100644 --- a/plugins/alfresco-maven-plugin/pom.xml +++ b/plugins/alfresco-maven-plugin/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.alfresco.maven.plugin alfresco-maven-plugin @@ -8,7 +9,7 @@ org.alfresco.maven alfresco-lifecycle-aggregator - 1.1-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index b33af120..d9940e7e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,10 @@ - + 4.0.0 org.alfresco.maven alfresco-lifecycle-aggregator - 1.1-SNAPSHOT + 1.0-SNAPSHOT Maven Alfresco SDK™ This aggregator Project builds all modules required for the Maven Alfresco SDK pom diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 7a720d18..3b2262b4 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.alfresco.maven alfresco-sdk-parent @@ -12,7 +13,7 @@ pom - 1.1-SNAPSHOT + 1.0-SNAPSHOT @@ -108,7 +109,7 @@ ../../target/staging/poms/alfresco-sdk-parent - 1.1-SNAPSHOT + 1.0-SNAPSHOT 1.3.158 1.5 From 5c0fad94ac03204b9da0c3b0d97dec4122dbdb3f Mon Sep 17 00:00:00 2001 From: mindthegab Date: Mon, 5 Nov 2012 02:00:39 +0000 Subject: [PATCH 3/5] -- removed SDK parent git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@654 04253f4f-3451-0410-a141-5562f1e59037 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9940e7e..32882fff 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ plugins/alfresco-maven-plugin - poms/alfresco-sdk-parent + archetypes/alfresco-amp-archetype archetypes/alfresco-allinone-archetype From 2f3e4c4a18ab4bfacbe8111cc79dd947c51402ca Mon Sep 17 00:00:00 2001 From: mindthegab Date: Mon, 5 Nov 2012 02:15:16 +0000 Subject: [PATCH 4/5] -- added parent --> aggregator inheritance -- removed duplicated -- re-enabled aggregator level release git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@655 04253f4f-3451-0410-a141-5562f1e59037 --- pom.xml | 4 +-- poms/alfresco-sdk-parent/pom.xml | 56 +++++--------------------------- 2 files changed, 10 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index 32882fff..0bccbba7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.alfresco.maven alfresco-lifecycle-aggregator 1.0-SNAPSHOT - Maven Alfresco SDK™ + Maven Alfresco SDK This aggregator Project builds all modules required for the Maven Alfresco SDK pom @@ -79,7 +79,7 @@ plugins/alfresco-maven-plugin - + poms/alfresco-sdk-parent archetypes/alfresco-amp-archetype archetypes/alfresco-allinone-archetype diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index 3b2262b4..e1fc4cd5 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -2,7 +2,6 @@ 4.0.0 - org.alfresco.maven alfresco-sdk-parent Alfresco Maven SDK Parent POM @@ -12,20 +11,17 @@ pom + + + org.alfresco.maven + alfresco-lifecycle-aggregator + 1.0-SNAPSHOT + ../../pom.xml + + 1.0-SNAPSHOT - - - GNU Lesser General Public License v3.0 or later - http://www.gnu.org/licenses/lgpl-3.0-standalone.html - - - - - 3.0.3 - - 2.3.2 2.4.1 - 3.2 2.4 1.1.1 2.5 @@ -144,22 +139,6 @@ - - - - alfresco-releases - https://artifacts.alfresco.com/nexus/content/repositories/releases - - - alfresco snapshots repository - alfresco-snapshots - https://artifacts.alfresco.com/nexus/content/repositories/snapshots - - - alfresco-docs - dav:https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-lifecycle-aggregator/latest/poms/alfresco-sdk-parent/ - - ${project.artifactId} @@ -174,11 +153,6 @@ true - - org.apache.maven.plugins - maven-site-plugin - ${maven.site.version} - org.apache.maven.plugins maven-compiler-plugin @@ -249,11 +223,6 @@ maven-install-plugin ${maven.install.version} - - org.apache.maven.plugins - maven-release-plugin - ${maven.release.version} - org.apache.maven.plugins maven-jar-plugin @@ -291,15 +260,6 @@ ${app.filtering.enabled} - - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.2 - - - From 4d60a2defc20d72546afcd9d7a4a85ea11c1236a Mon Sep 17 00:00:00 2001 From: mindthegab Date: Mon, 5 Nov 2012 02:15:55 +0000 Subject: [PATCH 5/5] [maven-release-plugin] prepare release alfresco-lifecycle-aggregator-1.0 git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@656 04253f4f-3451-0410-a141-5562f1e59037 --- .../alfresco-allinone-archetype/pom.xml | 36 +++++++++--------- archetypes/alfresco-amp-archetype/pom.xml | 38 +++++++++---------- plugins/alfresco-maven-plugin/pom.xml | 5 +-- pom.xml | 11 +++--- poms/alfresco-sdk-parent/pom.xml | 9 ++--- 5 files changed, 48 insertions(+), 51 deletions(-) diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index 3f80f7da..eadce49c 100644 --- a/archetypes/alfresco-allinone-archetype/pom.xml +++ b/archetypes/alfresco-allinone-archetype/pom.xml @@ -1,18 +1,18 @@ - - - 4.0.0 - - org.alfresco.maven.archetype - alfresco-allinone-archetype - maven-archetype - All-in-One Archetype from Maven Alfresco SDK - Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for: Repository, AMP, Share, Solr, Web Quick Start and embedded Jetty run - - - org.alfresco.maven - alfresco-lifecycle-aggregator - 1.0-SNAPSHOT - ../../pom.xml - - - + + + 4.0.0 + + org.alfresco.maven.archetype + alfresco-allinone-archetype + maven-archetype + All-in-One Archetype from Maven Alfresco SDK + Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for: Repository, AMP, Share, Solr, Web Quick Start and embedded Jetty run + + + org.alfresco.maven + alfresco-lifecycle-aggregator + 1.0 + ../../pom.xml + + + diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml index bb41734c..685f8171 100644 --- a/archetypes/alfresco-amp-archetype/pom.xml +++ b/archetypes/alfresco-amp-archetype/pom.xml @@ -1,19 +1,19 @@ - - - 4.0.0 - - org.alfresco.maven.archetype - alfresco-amp-archetype - - maven-archetype - AMP Archetype from Maven Alfresco SDK - Sample project with full support for lifecycle and rapid development of AMPs (Alfresco Module Packages) - - - org.alfresco.maven - alfresco-lifecycle-aggregator - 1.0-SNAPSHOT - ../../pom.xml - - - + + + 4.0.0 + + org.alfresco.maven.archetype + alfresco-amp-archetype + + maven-archetype + AMP Archetype from Maven Alfresco SDK + Sample project with full support for lifecycle and rapid development of AMPs (Alfresco Module Packages) + + + org.alfresco.maven + alfresco-lifecycle-aggregator + 1.0 + ../../pom.xml + + + diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 28cfacf7..99d55bba 100644 --- a/plugins/alfresco-maven-plugin/pom.xml +++ b/plugins/alfresco-maven-plugin/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 org.alfresco.maven.plugin alfresco-maven-plugin @@ -9,7 +8,7 @@ org.alfresco.maven alfresco-lifecycle-aggregator - 1.0-SNAPSHOT + 1.0 ../../pom.xml diff --git a/pom.xml b/pom.xml index 0bccbba7..016fca49 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,9 @@ - + 4.0.0 org.alfresco.maven alfresco-lifecycle-aggregator - 1.0-SNAPSHOT + 1.0 Maven Alfresco SDK This aggregator Project builds all modules required for the Maven Alfresco SDK pom @@ -28,9 +27,9 @@ - scm:svn:${scm.url.base}/trunk - scm:svn:${scm.url.base}/trunk - ${scm.url.base}/trunk + scm:svn:https://maven-alfresco-archetypes.googlecode.com/svn/tags/alfresco-lifecycle-aggregator-1.0 + scm:svn:https://maven-alfresco-archetypes.googlecode.com/svn/tags/alfresco-lifecycle-aggregator-1.0 + https://maven-alfresco-archetypes.googlecode.com/svn/tags/alfresco-lifecycle-aggregator-1.0 diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index e1fc4cd5..39dcf6ba 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 alfresco-sdk-parent Alfresco Maven SDK Parent POM @@ -15,12 +14,12 @@ org.alfresco.maven alfresco-lifecycle-aggregator - 1.0-SNAPSHOT + 1.0 ../../pom.xml - 1.0-SNAPSHOT + 1.0 ../../target/staging/poms/alfresco-sdk-parent - 1.0-SNAPSHOT + 1.0 1.3.158 1.5