From 0851e8af5c0294c1bc66f229ea10ab68ef67a3c1 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Tue, 17 Jan 2012 19:37:00 +0000 Subject: [PATCH 1/4] [maven-release-plugin] prepare for next development iteration git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/appassembler@15744 52ab4f32-60fc-0310-b215-8acea882cd1b --- appassembler-booter/pom.xml | 2 +- appassembler-maven-plugin/pom.xml | 2 +- appassembler-model/pom.xml | 2 +- pom.xml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appassembler-booter/pom.xml b/appassembler-booter/pom.xml index d55b7413..0141b960 100644 --- a/appassembler-booter/pom.xml +++ b/appassembler-booter/pom.xml @@ -28,7 +28,7 @@ appassembler org.codehaus.mojo.appassembler - 1.2 + 1.3-SNAPSHOT appassembler-booter Appassembler :: Generic Bootstrapper diff --git a/appassembler-maven-plugin/pom.xml b/appassembler-maven-plugin/pom.xml index 898ce5ed..c0d3a14b 100644 --- a/appassembler-maven-plugin/pom.xml +++ b/appassembler-maven-plugin/pom.xml @@ -28,7 +28,7 @@ appassembler org.codehaus.mojo.appassembler - 1.2 + 1.3-SNAPSHOT org.codehaus.mojo appassembler-maven-plugin diff --git a/appassembler-model/pom.xml b/appassembler-model/pom.xml index 79bcd62e..fefaf275 100644 --- a/appassembler-model/pom.xml +++ b/appassembler-model/pom.xml @@ -28,7 +28,7 @@ appassembler org.codehaus.mojo.appassembler - 1.2 + 1.3-SNAPSHOT appassembler-model Appassembler :: Model diff --git a/pom.xml b/pom.xml index b236fec5..30a5d4d1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ appassembler pom org.codehaus.mojo.appassembler - 1.2 + 1.3-SNAPSHOT Appassembler 2006 @@ -109,9 +109,9 @@ appassembler-maven-plugin - scm:svn:http://svn.codehaus.org/mojo/tags/appassembler-1.2 - scm:svn:https://svn.codehaus.org/mojo/tags/appassembler-1.2 - http://fisheye.codehaus.org/browse/mojo/tags/appassembler-1.2 + scm:svn:http://svn.codehaus.org/mojo/trunk/mojo/appassembler + scm:svn:https://svn.codehaus.org/mojo/trunk/mojo/appassembler + http://fisheye.codehaus.org/browse/mojo/trunk/mojo/appassembler From 513c42873e11592fd1b82242e983819a1013cad6 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 19 Jan 2012 20:41:30 +0000 Subject: [PATCH 2/4] - Undone the revisions 15744:15741 svn merge -r 15744:15741 https://svn.codehaus.org/mojo/trunk/mojo/appassembler git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/appassembler@15749 52ab4f32-60fc-0310-b215-8acea882cd1b --- appassembler-booter/pom.xml | 2 +- appassembler-maven-plugin/pom.xml | 2 +- appassembler-model/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/appassembler-booter/pom.xml b/appassembler-booter/pom.xml index 0141b960..35bc9c6c 100644 --- a/appassembler-booter/pom.xml +++ b/appassembler-booter/pom.xml @@ -28,7 +28,7 @@ appassembler org.codehaus.mojo.appassembler - 1.3-SNAPSHOT + 1.2-SNAPSHOT appassembler-booter Appassembler :: Generic Bootstrapper diff --git a/appassembler-maven-plugin/pom.xml b/appassembler-maven-plugin/pom.xml index c0d3a14b..f01f327b 100644 --- a/appassembler-maven-plugin/pom.xml +++ b/appassembler-maven-plugin/pom.xml @@ -28,7 +28,7 @@ appassembler org.codehaus.mojo.appassembler - 1.3-SNAPSHOT + 1.2-SNAPSHOT org.codehaus.mojo appassembler-maven-plugin diff --git a/appassembler-model/pom.xml b/appassembler-model/pom.xml index fefaf275..2c2b250b 100644 --- a/appassembler-model/pom.xml +++ b/appassembler-model/pom.xml @@ -28,7 +28,7 @@ appassembler org.codehaus.mojo.appassembler - 1.3-SNAPSHOT + 1.2-SNAPSHOT appassembler-model Appassembler :: Model diff --git a/pom.xml b/pom.xml index 30a5d4d1..1995f796 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ appassembler pom org.codehaus.mojo.appassembler - 1.3-SNAPSHOT + 1.2-SNAPSHOT Appassembler 2006 From 2b86c3d919d57b4481b5be0040e39710e8166d03 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 19 Jan 2012 20:44:33 +0000 Subject: [PATCH 3/4] - Undone the revisions 15739 [MAPPASM-138] svn merge -c -15739 https://svn.codehaus.org/mojo/trunk/mojo/appassembler git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/appassembler@15750 52ab4f32-60fc-0310-b215-8acea882cd1b --- appassembler-maven-plugin/src/site/site.xml | 5 ----- src/site/site.xml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/appassembler-maven-plugin/src/site/site.xml b/appassembler-maven-plugin/src/site/site.xml index d2a9ddd3..ca94a714 100644 --- a/appassembler-maven-plugin/src/site/site.xml +++ b/appassembler-maven-plugin/src/site/site.xml @@ -26,11 +26,6 @@ --> - - org.apache.maven.skins - maven-fluido-skin - 1.0 - diff --git a/src/site/site.xml b/src/site/site.xml index 0d82164d..2972b452 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -26,11 +26,6 @@ --> - - org.apache.maven.skins - maven-fluido-skin - 1.0 - From 94d631e685db48536f68c38019ac77b588b9c938 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 19 Jan 2012 20:56:07 +0000 Subject: [PATCH 4/4] [maven-release-plugin] prepare release appassembler-1.2 git-svn-id: file:///home/tiste/MOJOHAUS-TO-GIT/SVN-MOJO-WIP/trunk/mojo/appassembler@15752 52ab4f32-60fc-0310-b215-8acea882cd1b --- appassembler-booter/pom.xml | 2 +- appassembler-maven-plugin/pom.xml | 2 +- appassembler-model/pom.xml | 2 +- pom.xml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appassembler-booter/pom.xml b/appassembler-booter/pom.xml index 35bc9c6c..d55b7413 100644 --- a/appassembler-booter/pom.xml +++ b/appassembler-booter/pom.xml @@ -28,7 +28,7 @@ appassembler org.codehaus.mojo.appassembler - 1.2-SNAPSHOT + 1.2 appassembler-booter Appassembler :: Generic Bootstrapper diff --git a/appassembler-maven-plugin/pom.xml b/appassembler-maven-plugin/pom.xml index f01f327b..898ce5ed 100644 --- a/appassembler-maven-plugin/pom.xml +++ b/appassembler-maven-plugin/pom.xml @@ -28,7 +28,7 @@ appassembler org.codehaus.mojo.appassembler - 1.2-SNAPSHOT + 1.2 org.codehaus.mojo appassembler-maven-plugin diff --git a/appassembler-model/pom.xml b/appassembler-model/pom.xml index 2c2b250b..79bcd62e 100644 --- a/appassembler-model/pom.xml +++ b/appassembler-model/pom.xml @@ -28,7 +28,7 @@ appassembler org.codehaus.mojo.appassembler - 1.2-SNAPSHOT + 1.2 appassembler-model Appassembler :: Model diff --git a/pom.xml b/pom.xml index 1995f796..b236fec5 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ appassembler pom org.codehaus.mojo.appassembler - 1.2-SNAPSHOT + 1.2 Appassembler 2006 @@ -109,9 +109,9 @@ appassembler-maven-plugin - scm:svn:http://svn.codehaus.org/mojo/trunk/mojo/appassembler - scm:svn:https://svn.codehaus.org/mojo/trunk/mojo/appassembler - http://fisheye.codehaus.org/browse/mojo/trunk/mojo/appassembler + scm:svn:http://svn.codehaus.org/mojo/tags/appassembler-1.2 + scm:svn:https://svn.codehaus.org/mojo/tags/appassembler-1.2 + http://fisheye.codehaus.org/browse/mojo/tags/appassembler-1.2