From e0fe0f017f26ec6b9c6c5c789b8e11b4785f26f2 Mon Sep 17 00:00:00 2001 From: Robert Scholte Date: Fri, 26 Aug 2016 19:39:16 +0000 Subject: [PATCH 1/4] [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1757912 13f79535-47bb-0310-9956-ffa450edef68 --- maven-plugin-annotations/pom.xml | 2 +- maven-plugin-plugin/pom.xml | 2 +- maven-plugin-tools-annotations/pom.xml | 2 +- maven-plugin-tools-api/pom.xml | 2 +- maven-plugin-tools-generators/pom.xml | 2 +- maven-plugin-tools-java/pom.xml | 2 +- maven-plugin-tools-javadoc/pom.xml | 2 +- maven-script/maven-plugin-tools-ant/pom.xml | 2 +- maven-script/maven-plugin-tools-beanshell/pom.xml | 2 +- maven-script/maven-plugin-tools-model/pom.xml | 2 +- maven-script/maven-script-ant/pom.xml | 2 +- maven-script/maven-script-beanshell/pom.xml | 2 +- maven-script/pom.xml | 2 +- pom.xml | 8 ++++---- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/maven-plugin-annotations/pom.xml b/maven-plugin-annotations/pom.xml index b57e5c6..da11552 100644 --- a/maven-plugin-annotations/pom.xml +++ b/maven-plugin-annotations/pom.xml @@ -23,7 +23,7 @@ maven-plugin-tools org.apache.maven.plugin-tools - 3.5 + 3.6-SNAPSHOT maven-plugin-annotations diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml index fa7dfb8..14832b9 100644 --- a/maven-plugin-plugin/pom.xml +++ b/maven-plugin-plugin/pom.xml @@ -23,7 +23,7 @@ maven-plugin-tools org.apache.maven.plugin-tools - 3.5 + 3.6-SNAPSHOT org.apache.maven.plugins diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml index 5385182..587c501 100644 --- a/maven-plugin-tools-annotations/pom.xml +++ b/maven-plugin-tools-annotations/pom.xml @@ -22,7 +22,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5 + 3.6-SNAPSHOT maven-plugin-tools-annotations diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml index 3e4d040..3114234 100644 --- a/maven-plugin-tools-api/pom.xml +++ b/maven-plugin-tools-api/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5 + 3.6-SNAPSHOT maven-plugin-tools-api diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml index cd25cde..8ca4031 100644 --- a/maven-plugin-tools-generators/pom.xml +++ b/maven-plugin-tools-generators/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5 + 3.6-SNAPSHOT maven-plugin-tools-generators diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml index 1caf0a1..97cd0fc 100644 --- a/maven-plugin-tools-java/pom.xml +++ b/maven-plugin-tools-java/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5 + 3.6-SNAPSHOT maven-plugin-tools-java diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml index 39bc6f7..ecbc882 100644 --- a/maven-plugin-tools-javadoc/pom.xml +++ b/maven-plugin-tools-javadoc/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5 + 3.6-SNAPSHOT maven-plugin-tools-javadoc diff --git a/maven-script/maven-plugin-tools-ant/pom.xml b/maven-script/maven-plugin-tools-ant/pom.xml index 4531460..2b02e90 100644 --- a/maven-script/maven-plugin-tools-ant/pom.xml +++ b/maven-script/maven-plugin-tools-ant/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-script - 3.5 + 3.6-SNAPSHOT maven-plugin-tools-ant diff --git a/maven-script/maven-plugin-tools-beanshell/pom.xml b/maven-script/maven-plugin-tools-beanshell/pom.xml index dcf8e29..a3adb9e 100644 --- a/maven-script/maven-plugin-tools-beanshell/pom.xml +++ b/maven-script/maven-plugin-tools-beanshell/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-script - 3.5 + 3.6-SNAPSHOT maven-plugin-tools-beanshell diff --git a/maven-script/maven-plugin-tools-model/pom.xml b/maven-script/maven-plugin-tools-model/pom.xml index 517de30..649deb9 100644 --- a/maven-script/maven-plugin-tools-model/pom.xml +++ b/maven-script/maven-plugin-tools-model/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-script - 3.5 + 3.6-SNAPSHOT maven-plugin-tools-model diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml index 9838f25..a8e673e 100644 --- a/maven-script/maven-script-ant/pom.xml +++ b/maven-script/maven-script-ant/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugin-tools maven-script - 3.5 + 3.6-SNAPSHOT maven-script-ant diff --git a/maven-script/maven-script-beanshell/pom.xml b/maven-script/maven-script-beanshell/pom.xml index e5aa7d0..c0c87b8 100644 --- a/maven-script/maven-script-beanshell/pom.xml +++ b/maven-script/maven-script-beanshell/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugin-tools maven-script - 3.5 + 3.6-SNAPSHOT maven-script-beanshell diff --git a/maven-script/pom.xml b/maven-script/pom.xml index be38151..b2b5f90 100644 --- a/maven-script/pom.xml +++ b/maven-script/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugin-tools maven-plugin-tools - 3.5 + 3.6-SNAPSHOT maven-script diff --git a/pom.xml b/pom.xml index b680df8..270c728 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5 + 3.6-SNAPSHOT pom Maven Plugin Tools @@ -74,9 +74,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-3.5 - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-3.5 - http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-3.5 + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk + http://svn.apache.org/viewvc/maven/plugin-tools/trunk jira From 3aaa8d275c24738e9195f179c8360d5100cb32f3 Mon Sep 17 00:00:00 2001 From: Robert Scholte Date: Fri, 26 Aug 2016 20:07:12 +0000 Subject: [PATCH 2/4] Rollback 3.5 release Add extra-enforcer-rules 1.0-beta-5 to be able to generate docs git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1757916 13f79535-47bb-0310-9956-ffa450edef68 --- maven-plugin-annotations/pom.xml | 2 +- maven-plugin-plugin/pom.xml | 2 +- maven-plugin-tools-annotations/pom.xml | 2 +- maven-plugin-tools-api/pom.xml | 2 +- maven-plugin-tools-generators/pom.xml | 2 +- maven-plugin-tools-java/pom.xml | 2 +- maven-plugin-tools-javadoc/pom.xml | 2 +- maven-script/maven-plugin-tools-ant/pom.xml | 2 +- maven-script/maven-plugin-tools-beanshell/pom.xml | 2 +- maven-script/maven-plugin-tools-model/pom.xml | 2 +- maven-script/maven-script-ant/pom.xml | 2 +- maven-script/maven-script-beanshell/pom.xml | 2 +- maven-script/pom.xml | 2 +- pom.xml | 14 +++++++++++++- 14 files changed, 26 insertions(+), 14 deletions(-) diff --git a/maven-plugin-annotations/pom.xml b/maven-plugin-annotations/pom.xml index da11552..64b986a 100644 --- a/maven-plugin-annotations/pom.xml +++ b/maven-plugin-annotations/pom.xml @@ -23,7 +23,7 @@ maven-plugin-tools org.apache.maven.plugin-tools - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-plugin-annotations diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml index 14832b9..9316d4e 100644 --- a/maven-plugin-plugin/pom.xml +++ b/maven-plugin-plugin/pom.xml @@ -23,7 +23,7 @@ maven-plugin-tools org.apache.maven.plugin-tools - 3.6-SNAPSHOT + 3.5-SNAPSHOT org.apache.maven.plugins diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml index 587c501..f58bc28 100644 --- a/maven-plugin-tools-annotations/pom.xml +++ b/maven-plugin-tools-annotations/pom.xml @@ -22,7 +22,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-plugin-tools-annotations diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml index 3114234..2e3e562 100644 --- a/maven-plugin-tools-api/pom.xml +++ b/maven-plugin-tools-api/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-plugin-tools-api diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml index 8ca4031..50f09b2 100644 --- a/maven-plugin-tools-generators/pom.xml +++ b/maven-plugin-tools-generators/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-plugin-tools-generators diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml index 97cd0fc..ed5ba7d 100644 --- a/maven-plugin-tools-java/pom.xml +++ b/maven-plugin-tools-java/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-plugin-tools-java diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml index ecbc882..e4e566c 100644 --- a/maven-plugin-tools-javadoc/pom.xml +++ b/maven-plugin-tools-javadoc/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-plugin-tools-javadoc diff --git a/maven-script/maven-plugin-tools-ant/pom.xml b/maven-script/maven-plugin-tools-ant/pom.xml index 2b02e90..ab94b34 100644 --- a/maven-script/maven-plugin-tools-ant/pom.xml +++ b/maven-script/maven-plugin-tools-ant/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-script - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-plugin-tools-ant diff --git a/maven-script/maven-plugin-tools-beanshell/pom.xml b/maven-script/maven-plugin-tools-beanshell/pom.xml index a3adb9e..ac2570b 100644 --- a/maven-script/maven-plugin-tools-beanshell/pom.xml +++ b/maven-script/maven-plugin-tools-beanshell/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-script - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-plugin-tools-beanshell diff --git a/maven-script/maven-plugin-tools-model/pom.xml b/maven-script/maven-plugin-tools-model/pom.xml index 649deb9..7d001b8 100644 --- a/maven-script/maven-plugin-tools-model/pom.xml +++ b/maven-script/maven-plugin-tools-model/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-script - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-plugin-tools-model diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml index a8e673e..c388ff8 100644 --- a/maven-script/maven-script-ant/pom.xml +++ b/maven-script/maven-script-ant/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugin-tools maven-script - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-script-ant diff --git a/maven-script/maven-script-beanshell/pom.xml b/maven-script/maven-script-beanshell/pom.xml index c0c87b8..7ad49ad 100644 --- a/maven-script/maven-script-beanshell/pom.xml +++ b/maven-script/maven-script-beanshell/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugin-tools maven-script - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-script-beanshell diff --git a/maven-script/pom.xml b/maven-script/pom.xml index b2b5f90..683dd63 100644 --- a/maven-script/pom.xml +++ b/maven-script/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugin-tools maven-plugin-tools - 3.6-SNAPSHOT + 3.5-SNAPSHOT maven-script diff --git a/pom.xml b/pom.xml index 270c728..ee194a5 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.6-SNAPSHOT + 3.5-SNAPSHOT pom Maven Plugin Tools @@ -284,6 +284,18 @@ + + + maven-enforcer-plugin + + + org.codehaus.mojo + extra-enforcer-rules + 1.0-beta-5 + + + + From 4ac5b187dcee82047f126f0d50afb5e66be317cf Mon Sep 17 00:00:00 2001 From: Robert Scholte Date: Fri, 26 Aug 2016 21:17:57 +0000 Subject: [PATCH 3/4] Upgrade skins which are compatible with maven-site-plugin 3.5 git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1757925 13f79535-47bb-0310-9956-ffa450edef68 --- maven-plugin-plugin/src/site/site.xml | 2 +- src/site/site.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-plugin-plugin/src/site/site.xml b/maven-plugin-plugin/src/site/site.xml index 4f35bea..d9402a8 100644 --- a/maven-plugin-plugin/src/site/site.xml +++ b/maven-plugin-plugin/src/site/site.xml @@ -35,7 +35,7 @@ under the License. org.apache.maven.skins maven-fluido-skin - 1.2.1 + 1.5 diff --git a/src/site/site.xml b/src/site/site.xml index fe92a33..ca647d8 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -33,7 +33,7 @@ under the License. org.apache.maven.skins maven-fluido-skin - 1.2.1 + 1.5 From 4bd90ea35fdf78cd96f6189e09c784ba8cd92dfd Mon Sep 17 00:00:00 2001 From: Robert Scholte Date: Fri, 26 Aug 2016 21:18:52 +0000 Subject: [PATCH 4/4] [maven-release-plugin] prepare release maven-plugin-tools-3.5 git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1757926 13f79535-47bb-0310-9956-ffa450edef68 --- maven-plugin-annotations/pom.xml | 2 +- maven-plugin-plugin/pom.xml | 2 +- maven-plugin-tools-annotations/pom.xml | 2 +- maven-plugin-tools-api/pom.xml | 2 +- maven-plugin-tools-generators/pom.xml | 2 +- maven-plugin-tools-java/pom.xml | 2 +- maven-plugin-tools-javadoc/pom.xml | 2 +- maven-script/maven-plugin-tools-ant/pom.xml | 2 +- maven-script/maven-plugin-tools-beanshell/pom.xml | 2 +- maven-script/maven-plugin-tools-model/pom.xml | 2 +- maven-script/maven-script-ant/pom.xml | 2 +- maven-script/maven-script-beanshell/pom.xml | 2 +- maven-script/pom.xml | 2 +- pom.xml | 8 ++++---- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/maven-plugin-annotations/pom.xml b/maven-plugin-annotations/pom.xml index 64b986a..b57e5c6 100644 --- a/maven-plugin-annotations/pom.xml +++ b/maven-plugin-annotations/pom.xml @@ -23,7 +23,7 @@ maven-plugin-tools org.apache.maven.plugin-tools - 3.5-SNAPSHOT + 3.5 maven-plugin-annotations diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml index 9316d4e..fa7dfb8 100644 --- a/maven-plugin-plugin/pom.xml +++ b/maven-plugin-plugin/pom.xml @@ -23,7 +23,7 @@ maven-plugin-tools org.apache.maven.plugin-tools - 3.5-SNAPSHOT + 3.5 org.apache.maven.plugins diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml index f58bc28..5385182 100644 --- a/maven-plugin-tools-annotations/pom.xml +++ b/maven-plugin-tools-annotations/pom.xml @@ -22,7 +22,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5-SNAPSHOT + 3.5 maven-plugin-tools-annotations diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml index 2e3e562..3e4d040 100644 --- a/maven-plugin-tools-api/pom.xml +++ b/maven-plugin-tools-api/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5-SNAPSHOT + 3.5 maven-plugin-tools-api diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml index 50f09b2..cd25cde 100644 --- a/maven-plugin-tools-generators/pom.xml +++ b/maven-plugin-tools-generators/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5-SNAPSHOT + 3.5 maven-plugin-tools-generators diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml index ed5ba7d..1caf0a1 100644 --- a/maven-plugin-tools-java/pom.xml +++ b/maven-plugin-tools-java/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5-SNAPSHOT + 3.5 maven-plugin-tools-java diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml index e4e566c..39bc6f7 100644 --- a/maven-plugin-tools-javadoc/pom.xml +++ b/maven-plugin-tools-javadoc/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5-SNAPSHOT + 3.5 maven-plugin-tools-javadoc diff --git a/maven-script/maven-plugin-tools-ant/pom.xml b/maven-script/maven-plugin-tools-ant/pom.xml index ab94b34..4531460 100644 --- a/maven-script/maven-plugin-tools-ant/pom.xml +++ b/maven-script/maven-plugin-tools-ant/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-script - 3.5-SNAPSHOT + 3.5 maven-plugin-tools-ant diff --git a/maven-script/maven-plugin-tools-beanshell/pom.xml b/maven-script/maven-plugin-tools-beanshell/pom.xml index ac2570b..dcf8e29 100644 --- a/maven-script/maven-plugin-tools-beanshell/pom.xml +++ b/maven-script/maven-plugin-tools-beanshell/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-script - 3.5-SNAPSHOT + 3.5 maven-plugin-tools-beanshell diff --git a/maven-script/maven-plugin-tools-model/pom.xml b/maven-script/maven-plugin-tools-model/pom.xml index 7d001b8..517de30 100644 --- a/maven-script/maven-plugin-tools-model/pom.xml +++ b/maven-script/maven-plugin-tools-model/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugin-tools maven-script - 3.5-SNAPSHOT + 3.5 maven-plugin-tools-model diff --git a/maven-script/maven-script-ant/pom.xml b/maven-script/maven-script-ant/pom.xml index c388ff8..9838f25 100644 --- a/maven-script/maven-script-ant/pom.xml +++ b/maven-script/maven-script-ant/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugin-tools maven-script - 3.5-SNAPSHOT + 3.5 maven-script-ant diff --git a/maven-script/maven-script-beanshell/pom.xml b/maven-script/maven-script-beanshell/pom.xml index 7ad49ad..e5aa7d0 100644 --- a/maven-script/maven-script-beanshell/pom.xml +++ b/maven-script/maven-script-beanshell/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugin-tools maven-script - 3.5-SNAPSHOT + 3.5 maven-script-beanshell diff --git a/maven-script/pom.xml b/maven-script/pom.xml index 683dd63..be38151 100644 --- a/maven-script/pom.xml +++ b/maven-script/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugin-tools maven-plugin-tools - 3.5-SNAPSHOT + 3.5 maven-script diff --git a/pom.xml b/pom.xml index ee194a5..e5e0d32 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.maven.plugin-tools maven-plugin-tools - 3.5-SNAPSHOT + 3.5 pom Maven Plugin Tools @@ -74,9 +74,9 @@ - scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk - scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk - http://svn.apache.org/viewvc/maven/plugin-tools/trunk + scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-3.5 + scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-3.5 + http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-3.5 jira