svn commit: r693209 - /maven/enforcer/trunk/pom.xml
Author: brianf Date: Mon Sep 8 12:23:45 2008 New Revision: 693209 URL: http://svn.apache.org/viewvc?rev=693209view=rev Log: use new parent in preparation for release Modified: maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=693209r1=693208r2=693209view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Mon Sep 8 12:23:45 2008 @@ -22,7 +22,7 @@ parent artifactIdmaven-parent/artifactId groupIdorg.apache.maven/groupId -version9-SNAPSHOT/version +version9/version relativePath../pom/maven/pom.xml/relativePath /parent groupIdorg.apache.maven.enforcer/groupId
svn commit: r693234 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Mon Sep 8 13:11:36 2008 New Revision: 693234 URL: http://svn.apache.org/viewvc?rev=693234view=rev Log: reverting release Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=693234r1=693233r2=693234view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Sep 8 13:11:36 2008 @@ -31,7 +31,7 @@ groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId - version10-SNAPSHOT/version + version9-SNAPSHOT/version packagingpom/packaging nameApache Maven/name
svn commit: r693235 - /maven/pom/tags/maven-parent-9/
Author: brianf Date: Mon Sep 8 13:12:16 2008 New Revision: 693235 URL: http://svn.apache.org/viewvc?rev=693235view=rev Log: Removed file/folder Removed: maven/pom/tags/maven-parent-9/
svn commit: r693237 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Mon Sep 8 13:19:13 2008 New Revision: 693237 URL: http://svn.apache.org/viewvc?rev=693237view=rev Log: removed clirr config (see embedded comment) and enforcer version Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=693237r1=693236r2=693237view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Sep 8 13:19:13 2008 @@ -577,11 +577,12 @@ artifactIdmaven-deploy-plugin/artifactId version2.3/version /plugin -plugin +!--plugin +Uncomment after alpha-4 is released...we have check or egg here doing the release that introduces the rule that is needed. groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId - version1.0-SNAPSHOT/version -/plugin + version1.0-alpha-4/version +/plugin-- plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-docck-plugin/artifactId @@ -758,7 +759,9 @@ /activation build plugins - plugin + + !--plugin + Clirr needs to be more flexble before we can force this everywhere. New releases that don't have previous artifacts to compare cause Clirr to blow up. And Clirr needs to be smart enough to only look at the previous release artifact so we can make this work during snapshot builds, otherwise it just blows up when you try to do a release. groupIdorg.codehaus.mojo/groupId artifactIdclirr-maven-plugin/artifactId executions @@ -770,7 +773,7 @@ /goals /execution /executions - /plugin + /plugin-- plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-pmd-plugin/artifactId
svn commit: r693238 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Mon Sep 8 13:19:57 2008 New Revision: 693238 URL: http://svn.apache.org/viewvc?rev=693238view=rev Log: [maven-release-plugin] prepare release maven-parent-9 Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=693238r1=693237r2=693238view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Sep 8 13:19:57 2008 @@ -31,7 +31,7 @@ groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId - version9-SNAPSHOT/version + version9/version packagingpom/packaging nameApache Maven/name @@ -491,9 +491,9 @@ /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven/developerConnection -urlhttp://svn.apache.org/viewvc/maven/pom/trunk/maven/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-9/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-9/developerConnection +urlhttp://svn.apache.org/viewvc/maven/pom/tags/maven-parent-9/url /scm ciManagement systemHudson/system
svn commit: r693239 - in /maven/pom/tags/maven-parent-9: ./ pom.xml
Author: brianf Date: Mon Sep 8 13:20:02 2008 New Revision: 693239 URL: http://svn.apache.org/viewvc?rev=693239view=rev Log: [maven-release-plugin] copy for tag maven-parent-9 Added: maven/pom/tags/maven-parent-9/ - copied from r693197, maven/pom/trunk/maven/ maven/pom/tags/maven-parent-9/pom.xml - copied unchanged from r693238, maven/pom/trunk/maven/pom.xml
svn commit: r693240 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Mon Sep 8 13:20:06 2008 New Revision: 693240 URL: http://svn.apache.org/viewvc?rev=693240view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=693240r1=693239r2=693240view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Sep 8 13:20:06 2008 @@ -31,7 +31,7 @@ groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId - version9/version + version10-SNAPSHOT/version packagingpom/packaging nameApache Maven/name @@ -491,9 +491,9 @@ /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-9/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-9/developerConnection -urlhttp://svn.apache.org/viewvc/maven/pom/tags/maven-parent-9/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven/developerConnection +urlhttp://svn.apache.org/viewvc/maven/pom/trunk/maven/url /scm ciManagement systemHudson/system
svn commit: r693242 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Mon Sep 8 13:23:03 2008 New Revision: 693242 URL: http://svn.apache.org/viewvc?rev=693242view=rev Log: rollback Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=693242r1=693241r2=693242view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Sep 8 13:23:03 2008 @@ -31,7 +31,7 @@ groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId - version10-SNAPSHOT/version + version9-SNAPSHOT/version packagingpom/packaging nameApache Maven/name
svn commit: r693244 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Mon Sep 8 13:24:30 2008 New Revision: 693244 URL: http://svn.apache.org/viewvc?rev=693244view=rev Log: removed the rest of clirr Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=693244r1=693243r2=693244view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Sep 8 13:24:30 2008 @@ -899,11 +899,11 @@ /reportSet /reportSets /plugin - plugin + !--plugin groupIdorg.codehaus.mojo/groupId artifactIdclirr-maven-plugin/artifactId version2.2.2/version - /plugin + /plugin-- /plugins /reporting /profile @@ -964,7 +964,7 @@ /execution /executions /plugin - plugin + !--plugin groupIdorg.codehaus.mojo/groupId artifactIdclirr-maven-plugin/artifactId executions @@ -976,7 +976,7 @@ /goals /execution /executions - /plugin + /plugin-- /plugins /build /profile
svn commit: r693245 - /maven/pom/tags/maven-parent-9/
Author: brianf Date: Mon Sep 8 13:25:09 2008 New Revision: 693245 URL: http://svn.apache.org/viewvc?rev=693245view=rev Log: Removed file/folder Removed: maven/pom/tags/maven-parent-9/
svn commit: r693248 - in /maven/enforcer/tags/enforcer-1: ./ pom.xml
Author: brianf Date: Mon Sep 8 13:26:36 2008 New Revision: 693248 URL: http://svn.apache.org/viewvc?rev=693248view=rev Log: [maven-release-plugin] copy for tag enforcer-1 Added: maven/enforcer/tags/enforcer-1/ - copied from r693195, maven/enforcer/trunk/ maven/enforcer/tags/enforcer-1/pom.xml - copied unchanged from r693209, maven/enforcer/trunk/pom.xml
svn commit: r693249 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Mon Sep 8 13:26:43 2008 New Revision: 693249 URL: http://svn.apache.org/viewvc?rev=693249view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=693249r1=693248r2=693249view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Mon Sep 8 13:26:43 2008 @@ -23,11 +23,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version /parent artifactIdenforcer-api/artifactId packagingjar/packaging - version1.0-alpha-4-SNAPSHOT/version + version1.0-alpha-5-SNAPSHOT/version nameEnforcer API/name description This component provides the generic interfaces needed to implement custom rules for the maven-enforcer-plugin. Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=693249r1=693248r2=693249view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Sep 8 13:26:43 2008 @@ -23,11 +23,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version /parent artifactIdenforcer-rules/artifactId packagingjar/packaging - version1.0-alpha-4-SNAPSHOT/version + version1.0-alpha-5-SNAPSHOT/version nameEnforcer Rules/name descriptionThis component contains the standard Enforcer Rules/description build Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=693249r1=693248r2=693249view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Mon Sep 8 13:26:43 2008 @@ -23,14 +23,14 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1-SNAPSHOT/version +version2-SNAPSHOT/version /parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name descriptionThe Loving Iron Fist of Maven/description - version1.0-alpha-4-SNAPSHOT/version + version1.0-alpha-5-SNAPSHOT/version urlhttp://maven.apache.org/plugins/maven-enforcer-plugin//url issueManagement systemJIRA/system Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=693249r1=693248r2=693249view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Mon Sep 8 13:26:43 2008 @@ -29,7 +29,7 @@ artifactIdenforcer/artifactId packagingpom/packaging nameEnforcer/name - version1-SNAPSHOT/version + version2-SNAPSHOT/version descriptionEnforcer is a build rule execution framework./description urlhttp://maven.apache.org/enforcer/url prerequisites
svn commit: r693251 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Mon Sep 8 13:29:39 2008 New Revision: 693251 URL: http://svn.apache.org/viewvc?rev=693251view=rev Log: rollback Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=693251r1=693250r2=693251view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Mon Sep 8 13:29:39 2008 @@ -23,11 +23,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version2-SNAPSHOT/version +version1-SNAPSHOT/version /parent artifactIdenforcer-api/artifactId packagingjar/packaging - version1.0-alpha-5-SNAPSHOT/version + version1.0-alpha-4-SNAPSHOT/version nameEnforcer API/name description This component provides the generic interfaces needed to implement custom rules for the maven-enforcer-plugin. Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=693251r1=693250r2=693251view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Sep 8 13:29:39 2008 @@ -23,11 +23,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version2-SNAPSHOT/version +version1-SNAPSHOT/version /parent artifactIdenforcer-rules/artifactId packagingjar/packaging - version1.0-alpha-5-SNAPSHOT/version + version1.0-alpha-4-SNAPSHOT/version nameEnforcer Rules/name descriptionThis component contains the standard Enforcer Rules/description build Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=693251r1=693250r2=693251view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Mon Sep 8 13:29:39 2008 @@ -23,14 +23,14 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version2-SNAPSHOT/version +version1-SNAPSHOT/version /parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name descriptionThe Loving Iron Fist of Maven/description - version1.0-alpha-5-SNAPSHOT/version + version1.0-alpha-4-SNAPSHOT/version urlhttp://maven.apache.org/plugins/maven-enforcer-plugin//url issueManagement systemJIRA/system Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=693251r1=693250r2=693251view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Mon Sep 8 13:29:39 2008 @@ -29,7 +29,7 @@ artifactIdenforcer/artifactId packagingpom/packaging nameEnforcer/name - version2-SNAPSHOT/version + version1-SNAPSHOT/version descriptionEnforcer is a build rule execution framework./description urlhttp://maven.apache.org/enforcer/url prerequisites
svn commit: r693253 - /maven/enforcer/tags/enforcer-1/
Author: brianf Date: Mon Sep 8 13:30:10 2008 New Revision: 693253 URL: http://svn.apache.org/viewvc?rev=693253view=rev Log: Removed file/folder Removed: maven/enforcer/tags/enforcer-1/
svn commit: r693255 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Mon Sep 8 13:32:33 2008 New Revision: 693255 URL: http://svn.apache.org/viewvc?rev=693255view=rev Log: [maven-release-plugin] prepare release enforcer-1.0-alpha-4 Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=693255r1=693254r2=693255view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Mon Sep 8 13:32:33 2008 @@ -23,11 +23,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1-SNAPSHOT/version +version1/version /parent artifactIdenforcer-api/artifactId packagingjar/packaging - version1.0-alpha-4-SNAPSHOT/version + version1.0-alpha-4/version nameEnforcer API/name description This component provides the generic interfaces needed to implement custom rules for the maven-enforcer-plugin. Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=693255r1=693254r2=693255view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Sep 8 13:32:33 2008 @@ -23,11 +23,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1-SNAPSHOT/version +version1/version /parent artifactIdenforcer-rules/artifactId packagingjar/packaging - version1.0-alpha-4-SNAPSHOT/version + version1.0-alpha-4/version nameEnforcer Rules/name descriptionThis component contains the standard Enforcer Rules/description build Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=693255r1=693254r2=693255view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Mon Sep 8 13:32:33 2008 @@ -23,14 +23,14 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1-SNAPSHOT/version +version1/version /parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name descriptionThe Loving Iron Fist of Maven/description - version1.0-alpha-4-SNAPSHOT/version + version1.0-alpha-4/version urlhttp://maven.apache.org/plugins/maven-enforcer-plugin//url issueManagement systemJIRA/system Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=693255r1=693254r2=693255view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Mon Sep 8 13:32:33 2008 @@ -29,7 +29,7 @@ artifactIdenforcer/artifactId packagingpom/packaging nameEnforcer/name - version1-SNAPSHOT/version + version1/version descriptionEnforcer is a build rule execution framework./description urlhttp://maven.apache.org/enforcer/url prerequisites @@ -107,9 +107,9 @@ /mailingList /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk//developerConnection -urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0-alpha-4/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0-alpha-4/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/tags/enforcer-1.0-alpha-4/url /scm properties api.version1.0-alpha-4-SNAPSHOT/api.version @@ -186,17 +186,17 @@ dependency groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer-api/artifactId -version${api.version}/version +version1.0-alpha-4/version /dependency dependency groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer-rules/artifactId -version${rules.version}/version +version1.0-alpha-4/version /dependency dependency groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer-rules/artifactId -version${rules.version}/version +version1.0-alpha-4/version classifiertests/classifier
svn commit: r693257 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Mon Sep 8 13:32:44 2008 New Revision: 693257 URL: http://svn.apache.org/viewvc?rev=693257view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=693257r1=693256r2=693257view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Mon Sep 8 13:32:44 2008 @@ -23,11 +23,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1/version +version2-SNAPSHOT/version /parent artifactIdenforcer-api/artifactId packagingjar/packaging - version1.0-alpha-4/version + version1.0-alpha-5-SNAPSHOT/version nameEnforcer API/name description This component provides the generic interfaces needed to implement custom rules for the maven-enforcer-plugin. Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=693257r1=693256r2=693257view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Mon Sep 8 13:32:44 2008 @@ -23,11 +23,11 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1/version +version2-SNAPSHOT/version /parent artifactIdenforcer-rules/artifactId packagingjar/packaging - version1.0-alpha-4/version + version1.0-alpha-5-SNAPSHOT/version nameEnforcer Rules/name descriptionThis component contains the standard Enforcer Rules/description build Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=693257r1=693256r2=693257view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Mon Sep 8 13:32:44 2008 @@ -23,14 +23,14 @@ parent groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer/artifactId -version1/version +version2-SNAPSHOT/version /parent groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name descriptionThe Loving Iron Fist of Maven/description - version1.0-alpha-4/version + version1.0-alpha-5-SNAPSHOT/version urlhttp://maven.apache.org/plugins/maven-enforcer-plugin//url issueManagement systemJIRA/system Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=693257r1=693256r2=693257view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Mon Sep 8 13:32:44 2008 @@ -29,7 +29,7 @@ artifactIdenforcer/artifactId packagingpom/packaging nameEnforcer/name - version1/version + version2-SNAPSHOT/version descriptionEnforcer is a build rule execution framework./description urlhttp://maven.apache.org/enforcer/url prerequisites @@ -107,9 +107,9 @@ /mailingList /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0-alpha-4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/tags/enforcer-1.0-alpha-4/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/tags/enforcer-1.0-alpha-4/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/enforcer/trunk//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/enforcer/trunk//developerConnection +urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk/url /scm properties api.version1.0-alpha-4-SNAPSHOT/api.version @@ -186,17 +186,17 @@ dependency groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer-api/artifactId -version1.0-alpha-4/version +version1.0-alpha-5-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer-rules/artifactId -version1.0-alpha-4/version +version1.0-alpha-5-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven.enforcer/groupId artifactIdenforcer-rules/artifactId -version1.0-alpha-4/version +version1.0-alpha-5-SNAPSHOT/version classifiertests
svn commit: r693258 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Mon Sep 8 13:33:31 2008 New Revision: 693258 URL: http://svn.apache.org/viewvc?rev=693258view=rev Log: [maven-release-plugin] prepare release maven-parent-9 Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=693258r1=693257r2=693258view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Sep 8 13:33:31 2008 @@ -31,7 +31,7 @@ groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId - version9-SNAPSHOT/version + version9/version packagingpom/packaging nameApache Maven/name @@ -491,9 +491,9 @@ /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven/developerConnection -urlhttp://svn.apache.org/viewvc/maven/pom/trunk/maven/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-9/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-9/developerConnection +urlhttp://svn.apache.org/viewvc/maven/pom/tags/maven-parent-9/url /scm ciManagement systemHudson/system
svn commit: r693260 - /maven/pom/trunk/maven/pom.xml
Author: brianf Date: Mon Sep 8 13:33:39 2008 New Revision: 693260 URL: http://svn.apache.org/viewvc?rev=693260view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=693260r1=693259r2=693260view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Mon Sep 8 13:33:39 2008 @@ -31,7 +31,7 @@ groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId - version9/version + version10-SNAPSHOT/version packagingpom/packaging nameApache Maven/name @@ -491,9 +491,9 @@ /mailingLists scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-9/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/maven-parent-9/developerConnection -urlhttp://svn.apache.org/viewvc/maven/pom/tags/maven-parent-9/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/pom/trunk/maven/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/pom/trunk/maven/developerConnection +urlhttp://svn.apache.org/viewvc/maven/pom/trunk/maven/url /scm ciManagement systemHudson/system
svn commit: r693256 - in /maven/enforcer/tags/enforcer-1.0-alpha-4: ./ enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Mon Sep 8 13:32:39 2008 New Revision: 693256 URL: http://svn.apache.org/viewvc?rev=693256view=rev Log: [maven-release-plugin] copy for tag enforcer-1.0-alpha-4 Added: maven/enforcer/tags/enforcer-1.0-alpha-4/ - copied from r693195, maven/enforcer/trunk/ maven/enforcer/tags/enforcer-1.0-alpha-4/enforcer-api/pom.xml - copied unchanged from r693255, maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/tags/enforcer-1.0-alpha-4/enforcer-rules/pom.xml - copied unchanged from r693255, maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/tags/enforcer-1.0-alpha-4/maven-enforcer-plugin/pom.xml - copied unchanged from r693255, maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/tags/enforcer-1.0-alpha-4/pom.xml - copied unchanged from r693255, maven/enforcer/trunk/pom.xml
svn commit: r692507 - /maven/site/trunk/src/site/apt/repository-management.apt
Author: brianf Date: Fri Sep 5 11:31:50 2008 New Revision: 692507 URL: http://svn.apache.org/viewvc?rev=692507view=rev Log: add matrix to the site. Modified: maven/site/trunk/src/site/apt/repository-management.apt Modified: maven/site/trunk/src/site/apt/repository-management.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/repository-management.apt?rev=692507r1=692506r2=692507view=diff == --- maven/site/trunk/src/site/apt/repository-management.apt (original) +++ maven/site/trunk/src/site/apt/repository-management.apt Fri Sep 5 11:31:50 2008 @@ -112,5 +112,7 @@ * {{{http://docs.codehaus.org/display/MAVENUSER/Maven+Concepts+Repositories}Maven Concepts Repositories}} from Maven wiki + *{{{http://docs.codehaus.org/display/MAVENUSER/Maven+Repository+Manager+Feature+Matrix} Continuously updated Feature matrix.}} Superceeds original matrix in the blog below. + * {{{http://blogs.exist.com/oching/2007/11/05/the-hype-about-repository-managers/}The Hype About Repository Managers}} by Deng Ching
svn commit: r692175 - in /maven/enforcer/trunk: enforcer-api/pom.xml enforcer-rules/pom.xml maven-enforcer-plugin/pom.xml pom.xml
Author: brianf Date: Thu Sep 4 10:58:15 2008 New Revision: 692175 URL: http://svn.apache.org/viewvc?rev=692175view=rev Log: prepare for release of alpha-4 Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=692175r1=692174r2=692175view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Thu Sep 4 10:58:15 2008 @@ -27,7 +27,7 @@ /parent artifactIdenforcer-api/artifactId packagingjar/packaging - version1.0-SNAPSHOT/version + version1.0-alpha-4-SNAPSHOT/version nameEnforcer API/name description This component provides the generic interfaces needed to implement custom rules for the maven-enforcer-plugin. Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=692175r1=692174r2=692175view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Thu Sep 4 10:58:15 2008 @@ -27,7 +27,7 @@ /parent artifactIdenforcer-rules/artifactId packagingjar/packaging - version1.0-SNAPSHOT/version + version1.0-alpha-4-SNAPSHOT/version nameEnforcer Rules/name descriptionThis component contains the standard Enforcer Rules/description build Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=692175r1=692174r2=692175view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Thu Sep 4 10:58:15 2008 @@ -30,7 +30,7 @@ packagingmaven-plugin/packaging nameMaven Enforcer Plugin/name descriptionThe Loving Iron Fist of Maven/description - version1.0-SNAPSHOT/version + version1.0-alpha-4-SNAPSHOT/version urlhttp://maven.apache.org/plugins/maven-enforcer-plugin//url issueManagement systemJIRA/system Modified: maven/enforcer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/pom.xml?rev=692175r1=692174r2=692175view=diff == --- maven/enforcer/trunk/pom.xml (original) +++ maven/enforcer/trunk/pom.xml Thu Sep 4 10:58:15 2008 @@ -39,7 +39,7 @@ systemjira/system urlhttp://jira.codehaus.org/browse/MENFORCER/url /issueManagement - inceptionYear2006/inceptionYear + inceptionYear2007/inceptionYear licenses license nameApache License 2.0/name @@ -112,9 +112,9 @@ urlhttp://svn.apache.org/viewcvs.cgi/maven/enforcer/trunk/url /scm properties -api.version1.0-SNAPSHOT/api.version -rules.version1.0-SNAPSHOT/rules.version -maven.version2.0.6/maven.version +api.version1.0-alpha-4-SNAPSHOT/api.version +rules.version1.0-alpha-4-SNAPSHOT/rules.version +maven.version2.0.9/maven.version /properties build resources
svn commit: r692192 - in /maven/enforcer/trunk/enforcer-api: pom.xml src/custom-rule-sample/pom.xml src/custom-rule-sample/usage-pom.xml src/main/assembly/ src/main/assembly/custom-rule-sample.xml src
Author: brianf Date: Thu Sep 4 12:02:44 2008 New Revision: 692192 URL: http://svn.apache.org/viewvc?rev=692192view=rev Log: update the sample and make the zip generated during the site build Added: maven/enforcer/trunk/enforcer-api/src/main/assembly/ maven/enforcer/trunk/enforcer-api/src/main/assembly/custom-rule-sample.xml Removed: maven/enforcer/trunk/enforcer-api/src/site/resources/ Modified: maven/enforcer/trunk/enforcer-api/pom.xml maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml maven/enforcer/trunk/enforcer-api/src/site/apt/writing-a-custom-rule.apt Modified: maven/enforcer/trunk/enforcer-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?rev=692192r1=692191r2=692192view=diff == --- maven/enforcer/trunk/enforcer-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Thu Sep 4 12:02:44 2008 @@ -52,6 +52,28 @@ /execution /executions /plugin + plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-assembly-plugin/artifactId + version2.2-beta-2/version + executions + execution + idcustom-rule/id + phasepre-site/phase + goals + goalsingle/goal + /goals +configuration + finalNamecustom-rule/finalName + outputDirectorytarget/site/outputDirectory + descriptors + descriptorsrc/main/assembly/custom-rule-sample.xml/descriptor + /descriptors + appendAssemblyIdfalse/appendAssemblyId +/configuration + /execution + /executions + /plugin /plugins /build dependencies Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml?rev=692192r1=692191r2=692192view=diff == --- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml Thu Sep 4 12:02:44 2008 @@ -8,8 +8,8 @@ nameMy Custom Rule/name descriptionThis is my custom rule./description properties - api.version1.0-SNAPSHOT/api.version - maven.version2.0.6/maven.version + api.version1.0-alpha-4/api.version + maven.version2.0.9/maven.version /properties build /build Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml?rev=692192r1=692191r2=692192view=diff == --- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml Thu Sep 4 12:02:44 2008 @@ -9,7 +9,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId -version1.0-SNAPSHOT/version +version1.0-alpha-4/version dependencies dependency groupIdcustom-rule/groupId Added: maven/enforcer/trunk/enforcer-api/src/main/assembly/custom-rule-sample.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/main/assembly/custom-rule-sample.xml?rev=692192view=auto == --- maven/enforcer/trunk/enforcer-api/src/main/assembly/custom-rule-sample.xml (added) +++ maven/enforcer/trunk/enforcer-api/src/main/assembly/custom-rule-sample.xml Thu Sep 4 12:02:44 2008 @@ -0,0 +1,13 @@ +assembly + idsample/id + includeBaseDirectoryfalse/includeBaseDirectory + formats +formatzip/format + /formats + fileSets +fileSet + directorysrc/custom-rule-sample/directory + outputDirectory/custom-rule-sample/outputDirectory +/fileSet + /fileSets +/assembly \ No newline at end of file Modified: maven/enforcer/trunk/enforcer-api/src/site/apt/writing-a-custom-rule.apt URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/site/apt/writing-a-custom-rule.apt?rev=692192r1=692191r2=692192view=diff == --- maven/enforcer/trunk/enforcer-api/src/site/apt/writing-a-custom-rule.apt (original) +++ maven/enforcer/trunk/enforcer-api/src/site/apt/writing-a-custom-rule.apt Thu Sep 4 12:02:44 2008 @@ -43,8
svn commit: r691751 - /maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
Author: brianf Date: Wed Sep 3 12:55:51 2008 New Revision: 691751 URL: http://svn.apache.org/viewvc?rev=691751view=rev Log: added some tests to probe MENFORCER-50 Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java?rev=691751r1=691750r2=691751view=diff == --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java Wed Sep 3 12:55:51 2008 @@ -79,6 +79,11 @@ assertTrue( AbstractVersionEnforcer.containsVersion( VersionRange.createFromVersionSpec( [1.5.0,) ), version ) ); assertTrue( AbstractVersionEnforcer.containsVersion( VersionRange.createFromVersionSpec( [1.5,1.6) ), version ) ); +//MENFORCER-50 +version = new DefaultArtifactVersion (2.1.0-M1-RC12); +assertTrue( AbstractVersionEnforcer.containsVersion( VersionRange.createFromVersionSpec( [2.1.0-M1-RC12,) ), version ) ); +assertFalse( AbstractVersionEnforcer.containsVersion( VersionRange.createFromVersionSpec( [2.1.0-M1,) ), version ) ); + } /**
[fusionpro] Field Rule question
Is it possible to write a rule that will use a field to determine which calculation to perform on another field and put the result in a third field? Ex. if Field(Letter) = A Field(result) = Field(Number) * 3 else Field(Result) = Field(Number) * 2 What I'm trying to do is automatically calculate the values page_height__ page_width__ for resizing an ad, based on one dimension so that it stays proportional. I want to also allow them to choose which dimension is used. If the height needs to be x, the width will get calculated and vice versa. +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- FusionPro 5.0 Now Available! Variable text on a curve and soft drop-shadows for variable text LIMITED TIME upgrade offer of $299 per license for current customers: http://fusionpro.printable.com/store/upgrade New licenses available for $599 each at: http://fusionpro.printable.com/store/ All FusionPro 5.0 customers to receive FusionPro 5.1 with Adobe Acrobat 8 and InDesign CS3 support when released for FREE. +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- -- Users of FusionPro Desktop have unlimited free email support. Contact Printable Support at [EMAIL PROTECTED] -- View FusionPro Knowledge Base, FusionPro Samples at www.printable.com/vdp/desktop.htm -- You are currently subscribed to fusionpro as: [EMAIL PROTECTED] To unsubscribe send a blank email to [EMAIL PROTECTED] -- -- Note: All e-mail sent to or from this address will be received or otherwise recorded by the e-mail recipients of this forum. It is subject to archival, monitoring or review by, and/or disclosure to someone other than the recipient. Our privacy policy is posted on www.printplanet.com --
svn commit: r683721 - /maven/shared/trunk/pom.xml
Author: brianf Date: Thu Aug 7 14:30:10 2008 New Revision: 683721 URL: http://svn.apache.org/viewvc?rev=683721view=rev Log: add model to the reactor Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=683721r1=683720r2=683721view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Thu Aug 7 14:30:10 2008 @@ -70,6 +70,7 @@ modulemaven-shared-monitor/module modulemaven-verifier/module modulemaven-web-ui-tests/module +modluemaven-shared-model/modlue /modules scm
svn commit: r683722 - /maven/shared/trunk/pom.xml
Author: brianf Date: Thu Aug 7 14:31:43 2008 New Revision: 683722 URL: http://svn.apache.org/viewvc?rev=683722view=rev Log: (empty) Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=683722r1=683721r2=683722view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Thu Aug 7 14:31:43 2008 @@ -70,7 +70,11 @@ modulemaven-shared-monitor/module modulemaven-verifier/module modulemaven-web-ui-tests/module -modluemaven-shared-model/modlue +!-- + Uses jdk 1.5 +modluemaven-shared-model/modlue + +-- /modules scm
svn commit: r683030 - in /maven/enforcer/trunk/enforcer-rules: ./ src/it/requirePlugins1/ src/it/requirePluginsReports/ src/it/requirePluginsUnchecked/ src/main/java/org/apache/maven/plugins/enforcer/
Author: brianf Date: Tue Aug 5 16:19:53 2008 New Revision: 683030 URL: http://svn.apache.org/viewvc?rev=683030view=rev Log: workaround for site report plugins tripping up the check. Added: maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/ (props changed) - copied from r677494, maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/ maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/goals.txt - copied unchanged from r683029, maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/goals.txt maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/pom.xml - copied, changed from r683029, maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/pom.xml maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/validate.groovy - copied unchanged from r683029, maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/validate.groovy maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/PluginWrapper.java Modified: maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/ (props changed) maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/ (props changed) maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=683030r1=683029r2=683030view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Tue Aug 5 16:19:53 2008 @@ -55,7 +55,7 @@ /execution /executions /plugin - !-- plugin + !--plugin groupIdorg.codehaus.mojo/groupId artifactIdshitty-maven-plugin/artifactId version1.0-alpha-2/version @@ -71,7 +71,7 @@ /configuration /execution /executions - /plugin-- + /plugin-- /plugins /build dependencies Propchange: maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/ -- --- svn:ignore (added) +++ svn:ignore Tue Aug 5 16:19:53 2008 @@ -0,0 +1,2 @@ +target +build.log Propchange: maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/ -- --- svn:ignore (added) +++ svn:ignore Tue Aug 5 16:19:53 2008 @@ -0,0 +1 @@ +build.log Copied: maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/pom.xml (from r683029, maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/pom.xml) URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/pom.xml?p2=maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/pom.xmlp1=maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/pom.xmlr1=683029r2=683030rev=683030view=diff == --- maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsReports/pom.xml Tue Aug 5 16:19:53 2008 @@ -1,60 +1,413 @@ -?xml version=1.0 encoding=UTF-8?project - +?xml version=1.0? + +project xmlns=http://maven.apache.org/POM/4.0.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion - groupIdorg.apache.maven.enforcer.its/groupId - artifactIdrequirePluginsUnchecked/artifactId + groupIdnet.sf.logdistiller/groupId + artifactIdlogdistiller/artifactId packagingjar/packaging - versiontesting/version - - + + nameLogDistiller/name + version0.10-SNAPSHOT/version + description +LogDistiller is a logfile merge and sort tool. +Log content is classified according to rules configured in an XML file. +Classification results go into reports, which are published: +simply stored in a file, sent by mail, or even added to a news feed. + /description + urlhttp://logdistiller.sf.net//url + inceptionYear2004/inceptionYear + developers +developer + idhboutemy/id + nameHervé Boutemy/name + email[EMAIL PROTECTED]/email + timezone+1/timezone +/developer + /developers + scm +connectionscm:cvs:pserver:[EMAIL PROTECTED]:/cvsroot/logdistiller:logdistiller/connection +developerConnectionscm:cvs:ext:[EMAIL PROTECTED]:/cvsroot/logdistiller:logdistiller/developerConnection + urlhttp
svn commit: r683054 - in /maven/enforcer/trunk/enforcer-rules/src: main/java/org/apache/maven/plugins/enforcer/ site/apt/ test/java/org/apache/maven/plugins/enforcer/
Author: brianf Date: Tue Aug 5 17:13:22 2008 New Revision: 683054 URL: http://svn.apache.org/viewvc?rev=683054view=rev Log: MENFORCER-37: optionally enforce that the parent is not a snapshot. Adapted from patch by Nick Stolwijk Added: maven/enforcer/trunk/enforcer-rules/src/site/apt/requireReleaseVersion.apt Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java maven/enforcer/trunk/enforcer-rules/src/site/apt/requireReleaseDeps.apt maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java?rev=683054r1=683053r2=683054view=diff == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java Tue Aug 5 17:13:22 2008 @@ -48,24 +48,24 @@ public boolean onlyWhenRelease = false; /** + * Allows this rule to fail when the parent is defined as a snapshot. + * + * @parameter + */ +public boolean failWhenParentIsSnapshot = true; + +/** * Override parent to allow optional ignore of this rule. */ public void execute( EnforcerRuleHelper helper ) throws EnforcerRuleException { boolean callSuper; +MavenProject project = null; if ( onlyWhenRelease ) { // get the project -MavenProject project = null; -try -{ -project = (MavenProject) helper.evaluate( ${project} ); -} -catch ( ExpressionEvaluationException eee ) -{ -throw new EnforcerRuleException( Unable to retrieve the MavenProject: , eee ); -} +project = getProject( helper ); // only call super if this project is a release callSuper = !project.getArtifact().isSnapshot(); @@ -76,16 +76,46 @@ } if ( callSuper ) { -super.execute(helper); +super.execute( helper ); +if ( failWhenParentIsSnapshot ) +{ +if ( project == null ) +{ +project = getProject( helper ); +} +Artifact parentArtifact = project.getParentArtifact(); +if ( parentArtifact != null parentArtifact.isSnapshot() ) +{ +throw new EnforcerRuleException( Parent Cannot be a snapshot: + parentArtifact.getId() ); +} +} } } /** - * Checks the set of dependencies to see if any snapshots are included. + * @param helper + * @return + * @throws EnforcerRuleException + */ +private MavenProject getProject( EnforcerRuleHelper helper ) +throws EnforcerRuleException +{ +try +{ +return (MavenProject) helper.evaluate( ${project} ); +} +catch ( ExpressionEvaluationException eee ) +{ +throw new EnforcerRuleException( Unable to retrieve the MavenProject: , eee ); +} +} + +/** + * Checks the set of dependencies to see if any snapshots are included * - * @param dependencies the dependencies to check + * @param dependencies the dependencies * @param log the log - * @return a set containing snapshot artifacts found + * @return the sets the * @throws EnforcerRuleException the enforcer rule exception */ protected Set checkDependencies( Set dependencies, Log log ) @@ -93,10 +123,10 @@ { Set foundExcludes = new HashSet(); -Iterator dependencyIter = dependencies.iterator(); -while ( dependencyIter.hasNext() ) +Iterator DependencyIter = dependencies.iterator(); +while ( DependencyIter.hasNext() ) { -Artifact artifact = (Artifact) dependencyIter.next(); +Artifact artifact = (Artifact) DependencyIter.next(); if ( artifact.isSnapshot() ) { @@ -106,4 +136,24 @@ return foundExcludes; } + +public boolean isOnlyWhenRelease() +{ +return onlyWhenRelease; +} + +public void setOnlyWhenRelease( boolean onlyWhenRelease
svn commit: r683063 - in /maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer: MockProject.java TestNoSnapshots.java TestRequireReleaseVersion.java
Author: brianf Date: Tue Aug 5 17:30:49 2008 New Revision: 683063 URL: http://svn.apache.org/viewvc?rev=683063view=rev Log: couple of test fixes Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java?rev=683063r1=683062r2=683063view=diff == --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java Tue Aug 5 17:30:49 2008 @@ -1490,7 +1490,13 @@ */ public Artifact getParentArtifact() { -return null; +if (parent !=null) +{ +return parent.getArtifact(); +} +else +return null; + } /* Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java?rev=683063r1=683062r2=683063view=diff == --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java Tue Aug 5 17:30:49 2008 @@ -76,6 +76,8 @@ MockProject parent = new MockProject(); parent.setArtifact( factory.getSnapshotArtifact() ); project.setParent( parent ); +project.setArtifacts( null ); +project.setDependencyArtifacts( null ); helper = EnforcerTestUtils.getHelper(project); rule.setFailWhenParentIsSnapshot( true ); Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java?rev=683063r1=683062r2=683063view=diff == --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java Tue Aug 5 17:30:49 2008 @@ -58,6 +58,8 @@ project.setArtifact( factory.getSnapshotArtifact() ); TestEnforcerRuleUtils.execute( rule, helper, true ); + +project.setArtifact( factory.getReleaseArtifact() ); MockProject parent = new MockProject(); parent.setArtifact( factory.getSnapshotArtifact() );
svn commit: r683072 - in /maven/enforcer/trunk: enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ enforcer-rules/src/site/apt/ maven-enforcer-plugin/src/site/apt/
Author: brianf Date: Tue Aug 5 18:09:24 2008 New Revision: 683072 URL: http://svn.apache.org/viewvc?rev=683072view=rev Log: updated site docs Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java - copied, changed from r683029, maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileSize.java maven/enforcer/trunk/enforcer-rules/src/site/apt/alwaysFail.apt maven/enforcer/trunk/enforcer-rules/src/site/apt/alwaysPass.apt maven/enforcer/trunk/enforcer-rules/src/site/apt/requireFilesDontExist.apt maven/enforcer/trunk/enforcer-rules/src/site/apt/requireFilesExist.apt maven/enforcer/trunk/enforcer-rules/src/site/apt/requireFilesSize.apt Removed: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileSize.java Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt maven/enforcer/trunk/enforcer-rules/src/site/apt/requireReleaseVersion.apt maven/enforcer/trunk/maven-enforcer-plugin/src/site/apt/index.apt Copied: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java (from r683029, maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileSize.java) URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java?p2=maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.javap1=maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileSize.javar1=683029r2=683072rev=683072view=diff == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileSize.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java Tue Aug 5 18:09:24 2008 @@ -33,7 +33,7 @@ * @author brianf * @author Roman Stumm */ -public class RequireFileSize +public class RequireFilesSize extends AbstractRequireFiles { Added: maven/enforcer/trunk/enforcer-rules/src/site/apt/alwaysFail.apt URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/alwaysFail.apt?rev=683072view=auto == --- maven/enforcer/trunk/enforcer-rules/src/site/apt/alwaysFail.apt (added) +++ maven/enforcer/trunk/enforcer-rules/src/site/apt/alwaysFail.apt Tue Aug 5 18:09:24 2008 @@ -0,0 +1,61 @@ +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you under the Apache License, Version 2.0 (the +~~ License); you may not use this file except in compliance +~~ with the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, +~~ software distributed under the License is distributed on an +~~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +~~ KIND, either express or implied. See the License for the +~~ specific language governing permissions and limitations +~~ under the License. + + -- + Always Fail + -- + Brian Fox + -- + August 2008 + -- + +Always Fail + + This rule will always fail. It is useful for testing proper plugin configuration. + + + Sample Plugin Configuration: + ++---+ +project + [...] + build +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-enforcer-plugin/artifactId +version1.0/version +executions + execution +idenforce/id +goals + goalenforce/goal +/goals +configuration + rules +AlwaysFail/ + /rules + failtrue/fail +/configuration + /execution +/executions + /plugin +/plugins + /build + [...] +/project ++---+ Added: maven/enforcer/trunk/enforcer-rules/src/site/apt/alwaysPass.apt URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/site/apt/alwaysPass.apt?rev=683072view=auto == --- maven/enforcer/trunk/enforcer-rules/src/site/apt/alwaysPass.apt (added) +++ maven/enforcer/trunk/enforcer-rules/src/site/apt/alwaysPass.apt Tue Aug 5 18:09:24 2008 @@ -0,0 +1,61 @@ +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information
[fusionpro] In Line Graphic Rule question
I am creating a business card template for use in a PrintOne store. I would like the user to be able to upload their picture and have it appear next to their name and title (right aligned). If they don't want to upload a picture I want the name title to align to the right and take up the space where the picture would have been. Can the In Line Graphic Rule be used to accomplish this? If so, I'm not sure what to set as the search path for the graphic since it will be variable. Let me know how or if this can be done. Thanks +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- FusionPro 5.0 Now Available! Variable text on a curve and soft drop-shadows for variable text LIMITED TIME upgrade offer of $299 per license for current customers: http://fusionpro.printable.com/store/upgrade New licenses available for $599 each at: http://fusionpro.printable.com/store/ All FusionPro 5.0 customers to receive FusionPro 5.1 with Adobe Acrobat 8 and InDesign CS3 support when released for FREE. +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- -- Users of FusionPro Desktop have unlimited free email support. Contact Printable Support at [EMAIL PROTECTED] -- View FusionPro Knowledge Base, FusionPro Samples at www.printable.com/vdp/desktop.htm -- You are currently subscribed to fusionpro as: [EMAIL PROTECTED] To unsubscribe send a blank email to [EMAIL PROTECTED] -- -- Note: All e-mail sent to or from this address will be received or otherwise recorded by the e-mail recipients of this forum. It is subject to archival, monitoring or review by, and/or disclosure to someone other than the recipient. Our privacy policy is posted on www.printplanet.com --
svn commit: r677494 - in /maven/enforcer/trunk/enforcer-rules/src: it/requirePlugins1/ it/requirePluginsUnchecked/ main/java/org/apache/maven/plugins/enforcer/ site/apt/ test/java/org/apache/maven/plu
Author: brianf Date: Wed Jul 16 20:25:54 2008 New Revision: 677494 URL: http://svn.apache.org/viewvc?rev=677494view=rev Log: allow some plugins to be skipped in the check (make it easier to use an snapshot of the enforcer) Added: maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/ - copied from r677480, maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/ Modified: maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/pom.xml maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/pom.xml maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java maven/enforcer/trunk/enforcer-rules/src/site/apt/requirePluginVersions.apt maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java Modified: maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/pom.xml?rev=677494r1=677493r2=677494view=diff == --- maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/pom.xml Wed Jul 16 20:25:54 2008 @@ -24,6 +24,7 @@ version1.0-SNAPSHOT/version executions execution +idenforce/id goals goalenforce/goal /goals Modified: maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/pom.xml?rev=677494r1=677480r2=677494view=diff == --- maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/src/it/requirePluginsUnchecked/pom.xml Wed Jul 16 20:25:54 2008 @@ -2,7 +2,7 @@ modelVersion4.0.0/modelVersion groupIdorg.apache.maven.enforcer.its/groupId - artifactIdrequirePlugins1/artifactId + artifactIdrequirePluginsUnchecked/artifactId packagingjar/packaging versiontesting/version @@ -29,7 +29,12 @@ /goals configuration rules - requirePluginVersionsphasessite/phases/requirePluginVersions +requirePluginVersions + phasessite/phases + unCheckedPlugins + unCheckedPluginorg.apache.maven.plugins:maven-enforcer-plugin/unCheckedPlugin + /unCheckedPlugins +/requirePluginVersions /rules /configuration !-- dependencies Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java?rev=677494r1=677493r2=677494view=diff == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java Wed Jul 16 20:25:54 2008 @@ -21,6 +21,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -70,7 +71,7 @@ // TODO: Auto-generated Javadoc /** - * This rule will enforce that all plugins specified in the poms have a version declared. + * This rule will enforce that all plugins specified in the poms have a version declared. * * @author a href=mailto:[EMAIL PROTECTED]Brian Fox/a * @version $Id$ @@ -104,6 +105,12 @@ */ public List additionalPlugins; +/** + * Plugins to skip for version enforcement. The plugins should be specified in the form: + * codegroup:artifactId/code. + */ +public List unCheckedPlugins; + /** The plugin manager. */ private PluginManager pluginManager; @@ -167,6 +174,9 @@ allPlugins = addAdditionalPlugins( allPlugins, additionalPlugins ); allPlugins.addAll( getProfilePlugins( project ) ); +// pull out any we should skip +allPlugins = (Set) removeUncheckedPlugins( unCheckedPlugins, allPlugins ); + // there's nothing to do here if ( allPlugins.isEmpty() ) { @@ -299,6 +309,28 @@ } /** + * Remove the plugins that the user doesn't want to check. + * + * @param uncheckedPlugins + * @param plugins + * @return + * @throws MojoExecutionException + */ +public
svn commit: r676691 - /maven/components/branches/maven-2.0.10-RC/README.txt
Author: brianf Date: Mon Jul 14 12:01:14 2008 New Revision: 676691 URL: http://svn.apache.org/viewvc?rev=676691view=rev Log: test commit Modified: maven/components/branches/maven-2.0.10-RC/README.txt Modified: maven/components/branches/maven-2.0.10-RC/README.txt URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/README.txt?rev=676691r1=676690r2=676691view=diff == --- maven/components/branches/maven-2.0.10-RC/README.txt (original) +++ maven/components/branches/maven-2.0.10-RC/README.txt Mon Jul 14 12:01:14 2008 @@ -1,7 +1,7 @@ --- Bootstrapping Maven --- - + Set the environment variable M2_HOME pointing to the dir where you want Maven2 installed. NOTE: presently, the directory {M2_HOME}/bin must be in your path:
svn commit: r673737 - /maven/enforcer/trunk/enforcer-rules/pom.xml
Author: brianf Date: Thu Jul 3 09:39:57 2008 New Revision: 673737 URL: http://svn.apache.org/viewvc?rev=673737view=rev Log: remove ITs for now. Modified: maven/enforcer/trunk/enforcer-rules/pom.xml Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=673737r1=673736r2=673737view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Thu Jul 3 09:39:57 2008 @@ -55,7 +55,7 @@ /execution /executions /plugin - plugin + !-- plugin groupIdorg.codehaus.mojo/groupId artifactIdshitty-maven-plugin/artifactId version1.0-alpha-2/version @@ -71,7 +71,7 @@ /configuration /execution /executions - /plugin + /plugin-- /plugins /build dependencies
svn commit: r670791 - /maven/plugins/trunk/maven-dependency-plugin/src/main/resources/META-INF/plexus/components.xml
Author: brianf Date: Mon Jun 23 16:39:49 2008 New Revision: 670791 URL: http://svn.apache.org/viewvc?rev=670791view=rev Log: added esb and nar unarchiver support Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/resources/META-INF/plexus/components.xml Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/resources/META-INF/plexus/components.xml?rev=670791r1=670790r2=670791view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/resources/META-INF/plexus/components.xml Mon Jun 23 16:39:49 2008 @@ -7,6 +7,19 @@ !-- there is no implementaion of SWCUnArchiver, but ZipUnArchive will do the job -- implementationorg.codehaus.plexus.archiver.zip.ZipUnArchiver/implementation instantiation-strategyper-lookup/instantiation-strategy -/component +/component +component + roleorg.codehaus.plexus.archiver.UnArchiver/role + role-hintnar/role-hint + !-- there is no implementaion of NARUnArchiver, but ZipUnArchive will do the job -- + implementationorg.codehaus.plexus.archiver.zip.ZipUnArchiver/implementation + instantiation-strategyper-lookup/instantiation-strategy +/component +component + roleorg.codehaus.plexus.archiver.UnArchiver/role + role-hintesb/role-hint + implementationorg.codehaus.plexus.archiver.zip.ZipUnArchiver/implementation + instantiation-strategyper-lookup/instantiation-strategy +/component /components /component-set
svn commit: r664426 - in /maven/enforcer/trunk/enforcer-rules: pom.xml src/it/ src/it/requirePlugins1/ src/it/requirePlugins1/goals.txt src/it/requirePlugins1/pom.xml src/it/requirePlugins1/validate.g
Author: brianf Date: Sat Jun 7 19:21:40 2008 New Revision: 664426 URL: http://svn.apache.org/viewvc?rev=664426view=rev Log: start of ITs to find the site plugin issue Added: maven/enforcer/trunk/enforcer-rules/src/it/ maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/ maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/goals.txt maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/pom.xml maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/validate.groovy Modified: maven/enforcer/trunk/enforcer-rules/pom.xml Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=664426r1=664425r2=664426view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Sat Jun 7 19:21:40 2008 @@ -55,6 +55,23 @@ /execution /executions /plugin + plugin +groupIdorg.codehaus.mojo/groupId +artifactIdshitty-maven-plugin/artifactId +version1.0-alpha-2/version +executions + execution +goals + goalclean/goal + goalinstall/goal + goaltest/goal +/goals +configuration + parallelfalse/parallel +/configuration + /execution +/executions + /plugin /plugins /build dependencies Added: maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/goals.txt URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/goals.txt?rev=664426view=auto == --- maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/goals.txt (added) +++ maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/goals.txt Sat Jun 7 19:21:40 2008 @@ -0,0 +1 @@ +site \ No newline at end of file Added: maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/pom.xml?rev=664426view=auto == --- maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/pom.xml (added) +++ maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/pom.xml Sat Jun 7 19:21:40 2008 @@ -0,0 +1,55 @@ +?xml version=1.0 encoding=UTF-8?project + + modelVersion4.0.0/modelVersion + groupIdorg.apache.maven.enforcer.its/groupId + artifactIdrequirePlugins1/artifactId + packagingjar/packaging + versiontesting/version + + + build +pluginManagement + plugins +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-site-plugin/artifactId + version2.0-beta-6/version +/plugin + /plugins +/pluginManagement +plugins + plugin +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-enforcer-plugin/artifactId +version1.0-SNAPSHOT/version +executions + execution +goals + goalenforce/goal +/goals +configuration + rules + requirePluginVersionsphasessite/phases/requirePluginVersions + /rules +/configuration + !-- dependencies + dependency +groupIdorg.apache.maven.enforcer/groupId +artifactIdenforcer-rules/artifactId +versiontesting/version + /dependency +/dependencies-- + /execution +/executions + /plugin +/plugins +/build +reporting + plugins +plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-checkstyle-plugin/artifactId +/plugin + /plugins +/reporting + /project \ No newline at end of file Added: maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/validate.groovy URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/it/requirePlugins1/validate.groovy?rev=664426view=auto == (empty)
svn commit: r661551 - /maven/components/branches/maven-2.0.x/apache-maven/src/conf/settings.xml
Author: brianf Date: Thu May 29 19:05:39 2008 New Revision: 661551 URL: http://svn.apache.org/viewvc?rev=661551view=rev Log: add schema to settings Modified: maven/components/branches/maven-2.0.x/apache-maven/src/conf/settings.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/src/conf/settings.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/src/conf/settings.xml?rev=661551r1=661550r2=661551view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/src/conf/settings.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/src/conf/settings.xml Thu May 29 19:05:39 2008 @@ -41,7 +41,10 @@ | values (values used when the setting is not specified) are provided. | |-- -settings +settings xmlns=http://maven.apache.org/settings/1.0.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/setrings/1.0.0 + http://maven.apache.org/xsd/settings-1.0.0.xsd; !-- localRepository | The path to the local repository maven will use to store artifacts. |
svn commit: r661552 - /maven/components/trunk/maven-distribution/src/conf/settings.xml
Author: brianf Date: Thu May 29 19:05:59 2008 New Revision: 661552 URL: http://svn.apache.org/viewvc?rev=661552view=rev Log: add schema to settings Modified: maven/components/trunk/maven-distribution/src/conf/settings.xml Modified: maven/components/trunk/maven-distribution/src/conf/settings.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/src/conf/settings.xml?rev=661552r1=661551r2=661552view=diff == --- maven/components/trunk/maven-distribution/src/conf/settings.xml (original) +++ maven/components/trunk/maven-distribution/src/conf/settings.xml Thu May 29 19:05:59 2008 @@ -41,7 +41,10 @@ | values (values used when the setting is not specified) are provided. | |-- -settings +settings xmlns=http://maven.apache.org/settings/1.0.0; + xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation=http://maven.apache.org/setrings/1.0.0 + http://maven.apache.org/xsd/settings-1.0.0.xsd; !-- localRepository | The path to the local repository maven will use to store artifacts. |
svn commit: r660948 - in /maven/components/branches/maven-2.0.x: apache-maven/ build.xml maven-core-it-runner/pom.xml maven-distribution/ pom.xml
Author: brianf Date: Wed May 28 06:37:25 2008 New Revision: 660948 URL: http://svn.apache.org/viewvc?rev=660948view=rev Log: put the 2.0.9 structure back in place so that the deployed binaries have the correct apache-maven-2.0.x-bin name we need to distribute. Added: maven/components/branches/maven-2.0.x/apache-maven/ - copied from r660942, maven/components/branches/maven-2.0.x/maven-distribution/ Removed: maven/components/branches/maven-2.0.x/maven-distribution/ Modified: maven/components/branches/maven-2.0.x/build.xml maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/build.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/build.xml?rev=660948r1=660947r2=660948view=diff == --- maven/components/branches/maven-2.0.x/build.xml (original) +++ maven/components/branches/maven-2.0.x/build.xml Wed May 28 06:37:25 2008 @@ -153,7 +153,7 @@ The new Maven distribution was created as part of the MAVEN-COMPILE step, above. This goal just validates the presence of that distribution. /echo -property name=maven.assembly location=maven-distribution/target/${maven.home.basename.expected}-bin.zip/ +property name=maven.assembly location=apache-maven/target/${maven.home.basename.expected}-bin.zip/ condition property=build.failed not available file=${maven.assembly}/ Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml?rev=660948r1=660947r2=660948view=diff == --- maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml Wed May 28 06:37:25 2008 @@ -53,7 +53,7 @@ artifactItems artifactItem groupIdorg.apache.maven/groupId -artifactIdmaven-distribution/artifactId +artifactIdapache-maven/artifactId version${project.version}/version classifierbin/classifier typetar.gz/type Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=660948r1=660947r2=660948view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Wed May 28 06:37:25 2008 @@ -225,7 +225,7 @@ modulemaven-script/module modulemaven-settings/module modulemaven-toolchain/module -modulemaven-distribution/module +moduleapache-maven/module /modules properties
svn commit: r661176 - /maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSize.java
Author: brianf Date: Wed May 28 18:54:37 2008 New Revision: 661176 URL: http://svn.apache.org/viewvc?rev=661176view=rev Log: MENFORCER-46 turned mojo donation from Roman Stumm into a rule Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSize.java Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSize.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSize.java?rev=661176view=auto == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSize.java (added) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSize.java Wed May 28 18:54:37 2008 @@ -0,0 +1,116 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.plugins.enforcer; + +import java.io.File; + +import org.apache.maven.enforcer.rule.api.EnforcerRule; +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; + +/** + * Rule to validate the main artifact is within certain size constraints. + * + * @author brianf + * @author Roman Stumm + */ +public class RequireSize +extends AbstractStandardEnforcerRule +{ +/** + * the max size allowed + */ +long maxsize = 1; + +/** + * the max size allowed + */ +long minsize = 0; + +/** + * the artifact file to check + */ +File artifact; + +public void execute( EnforcerRuleHelper helper ) +throws EnforcerRuleException +{ +// if the artifact is already defined, use that. Otherwise get the main artifact. +if ( artifact == null ) +{ +try +{ +MavenProject project = (MavenProject) helper.evaluate( ${project} ); + +artifact = project.getArtifact().getFile(); +} +catch ( ExpressionEvaluationException e ) +{ +throw new EnforcerRuleException( Unable to retrieve the project., e ); +} +} + +// check the file now +if ( artifact.exists() ) +{ +long length = artifact.length(); +if ( length minsize ) +{ +throw new EnforcerRuleException( artifact + size ( + length + ) too small. Min. is + minsize ); +} +else if ( length maxsize ) +{ +throw new EnforcerRuleException( artifact + size ( + length + ) too large. Max. is + maxsize ); +} +else +{ + +helper.getLog().debug( + artifact + +size ( + + length + + ) is OK ( + + ( minsize == maxsize || minsize == 0 ? ( max. + maxsize ) : ( between + + minsize + and + maxsize ) ) + byte). ); + +} +} +else +{ +throw new EnforcerRuleException( artifact + does not exist! ); +} +} + +public String getCacheId() +{ +return 0; +} + +public boolean isCacheable() +{ +return false; +} + +public boolean isResultValid( EnforcerRule cachedRule ) +{ +return false; +} +}
svn commit: r661177 - in /maven/enforcer/trunk/enforcer-rules/src: main/java/org/apache/maven/plugins/enforcer/ main/java/org/apache/maven/plugins/enforcer/utils/ test/java/org/apache/maven/plugins/en
Author: brianf Date: Wed May 28 18:55:11 2008 New Revision: 661177 URL: http://svn.apache.org/viewvc?rev=661177view=rev Log: update the license headers with jAutoDoc Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DefaultEnforcementRuleHelper.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EnforcerExpressionEvaluator.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/NoSnapshots.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockPathTranslator.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockPlexusContainer.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockRuntimeInformation.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireOS.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/MockEnforcerExpressionEvaluator.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestMockEnforcerExpressionEvaluator.java Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java?rev=661177r1=661176r2
svn commit: r661183 - /maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java
Author: brianf Date: Wed May 28 19:26:57 2008 New Revision: 661183 URL: http://svn.apache.org/viewvc?rev=661183view=rev Log: new abstract class to eliminate redundant methods for rules that aren't cacheable Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java?rev=661183view=auto == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java (added) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java Wed May 28 19:26:57 2008 @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.plugins.enforcer; + +import org.apache.maven.enforcer.rule.api.EnforcerRule; + +/** + * The Class AbstractNonCacheableEnforcerRule. This is to be used by rules + * that don't need caching...it saves implementing a bunch of methods. + * + * @author brianf + */ +abstract public class AbstractNonCacheableEnforcerRule +extends AbstractStandardEnforcerRule +{ + +/* + * (non-Javadoc) + * + * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId() + */ +public String getCacheId() +{ +return 0; +} + +/* + * (non-Javadoc) + * + * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable() + */ +public boolean isCacheable() +{ +return false; +} + +/* + * (non-Javadoc) + * + * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule) + */ +public boolean isResultValid( EnforcerRule cachedRule ) +{ +return false; +} + +}
svn commit: r661185 - in /maven/enforcer/trunk/enforcer-rules/src: main/java/org/apache/maven/plugins/enforcer/ test/java/org/apache/maven/plugins/enforcer/
Author: brianf Date: Wed May 28 19:27:54 2008 New Revision: 661185 URL: http://svn.apache.org/viewvc?rev=661185view=rev Log: MENFORCER-38 new rules from Ben Lidgey - Always Fail and Always Pass Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysFail.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysPass.java Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java?rev=661185view=auto == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java (added) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java Wed May 28 19:27:54 2008 @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.plugins.enforcer; + +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; + +/** + * Always fail. This rule is useful for testing the Enforcer configuration, or to always fail the build if a particular + * profile is enabled. + * @author Ben Lidgey + */ +public class AlwaysFail +extends AbstractNonCacheableEnforcerRule +{ + +/** + * [EMAIL PROTECTED] + */ +public void execute( EnforcerRuleHelper helper ) +throws EnforcerRuleException +{ +throw new EnforcerRuleException( Always fails! ); +} +} Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java?rev=661185view=auto == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java (added) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java Wed May 28 19:27:54 2008 @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.plugins.enforcer; + +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; +import org.apache.maven.plugin.logging.Log; + +/** + * Always pass. This rule is useful for testing the Enforcer configuration. + * @author Ben Lidgey + */ +public class AlwaysPass +extends AbstractNonCacheableEnforcerRule +{ + +/** + * [EMAIL PROTECTED] + */ +public void execute( EnforcerRuleHelper helper ) +throws EnforcerRuleException +{ +final Log log = helper.getLog(); +log.info( Always pass! ); +} + +} Added: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAlwaysFail.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer
svn commit: r661187 - in /maven/enforcer/trunk/enforcer-rules/src: main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java
Author: brianf Date: Wed May 28 19:46:40 2008 New Revision: 661187 URL: http://svn.apache.org/viewvc?rev=661187view=rev Log: MENFORCER-43 patch from Jacob Robertson to make the snapshots rule able to be applied when the main artifact is a release only. Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java?rev=661187r1=661186r2=661187view=diff == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java Wed May 28 19:46:40 2008 @@ -24,7 +24,10 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.plugin.logging.Log; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; // TODO: Auto-generated Javadoc /** @@ -38,7 +41,47 @@ { /** - * Checks the set of dependencies to see if any snapshots are included. + * Allows this rule to execute only when this project is a release. + * + * @parameter + */ +public boolean onlyWhenRelease = false; + +/** + * Override parent to allow optional ignore of this rule. + */ +public void execute( EnforcerRuleHelper helper ) +throws EnforcerRuleException +{ + boolean callSuper; + if ( onlyWhenRelease ) + { +// get the project +MavenProject project = null; +try +{ +project = (MavenProject) helper.evaluate( ${project} ); +} +catch ( ExpressionEvaluationException eee ) +{ +throw new EnforcerRuleException( Unable to retrieve the MavenProject: , eee ); +} + +// only call super if this project is a release +callSuper = !project.getArtifact().isSnapshot(); + } + else + { + callSuper = true; + } + if ( callSuper ) + { + super.execute(helper); + } +} + +/** + * Checks the set of dependencies to see if any snapshots are included * * @param dependencies the dependencies * @param log the log Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java?rev=661187r1=661186r2=661187view=diff == --- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java Wed May 28 19:46:40 2008 @@ -58,7 +58,20 @@ TestEnforcerRuleUtils.execute( rule, helper, true ); -} +// test onlyWhenRelease in each case + +project.setArtifact( factory.getSnapshotArtifact() ); + +TestEnforcerRuleUtils.execute( rule, helper, true ); + +rule.onlyWhenRelease = true; + +TestEnforcerRuleUtils.execute( rule, helper, false ); + +project.setArtifact( factory.getReleaseArtifact() ); + +TestEnforcerRuleUtils.execute( rule, helper, true ); +} /** * Test id.
svn commit: r661191 - /maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/
Author: brianf Date: Wed May 28 19:54:15 2008 New Revision: 661191 URL: http://svn.apache.org/viewvc?rev=661191view=rev Log: convert the non-cacheable rules to use the new abstract class Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java?rev=661191r1=661190r2=661191view=diff == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java Wed May 28 19:54:15 2008 @@ -37,7 +37,7 @@ * @version $Id$ */ public abstract class AbstractBanDependencies -extends AbstractStandardEnforcerRule +extends AbstractNonCacheableEnforcerRule { /** Specify if transitive dependencies should be searched (default) or only look at direct dependencies. */ @@ -47,7 +47,6 @@ * Execute the rule. * * @param helper the helper - * * @throws EnforcerRuleException the enforcer rule exception */ public void execute( EnforcerRuleHelper helper ) @@ -105,9 +104,7 @@ * * @param dependencies the dependencies * @param log the log - * * @return the sets the - * * @throws EnforcerRuleException the enforcer rule exception */ abstract protected Set checkDependencies( Set dependencies, Log log ) @@ -153,35 +150,4 @@ this.searchTransitive = theSearchTransitive; } -/* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId() - */ -public String getCacheId() -{ -return 0; -} - -/* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable() - */ -public boolean isCacheable() -{ -// dependencies change per project, therefore they must always be rerun. -return false; -} - -/* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule) - */ -public boolean isResultValid( EnforcerRule theCachedRule ) -{ -// dependencies change per project, therefore they must always be rerun. -return false; -} } Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java?rev=661191r1=661190r2=661191view=diff == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java Wed May 28 19:54:15 2008 @@ -18,7 +18,6 @@ */ package org.apache.maven.plugins.enforcer; -import org.apache.maven.enforcer.rule.api.EnforcerRule; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.plugin.logging.Log; @@ -35,7 +34,7 @@ * @author hugonnem Rule for Maven Enforcer using Beanshell to evaluate a conditional expression */ public class EvaluateBeanshell -extends AbstractStandardEnforcerRule +extends AbstractNonCacheableEnforcerRule { /** Beanshell interpreter. */ @@ -96,35 +95,4 @@ } return evaluation.booleanValue(); } - -/* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId() - */ -public String getCacheId() -{ -return + this.condition.hashCode(); -} - -/* - * (non-Javadoc) - * - * @see
svn commit: r661195 - in /maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer: RequireFileSize.java RequireSize.java
Author: brianf Date: Wed May 28 20:07:20 2008 New Revision: 661195 URL: http://svn.apache.org/viewvc?rev=661195view=rev Log: renamed the rule and refactored it to work like the other file rules and take an array of files to check. Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileSize.java Removed: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSize.java Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileSize.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileSize.java?rev=661195view=auto == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileSize.java (added) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileSize.java Wed May 28 20:07:20 2008 @@ -0,0 +1,147 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.maven.plugins.enforcer; + +import java.io.File; + +import org.apache.maven.enforcer.rule.api.EnforcerRule; +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; + +/** + * Rule to validate the main artifact is within certain size constraints. + * + * @author brianf + * @author Roman Stumm + */ +public class RequireFileSize +extends AbstractRequireFiles +{ + +/** the max size allowed. */ +long maxsize = 1; + +/** the max size allowed. */ +long minsize = 0; + +/** The error msg. */ +private String errorMsg; + +/** The log. */ +private Log log; + +/* + * (non-Javadoc) + * + * @see org.apache.maven.enforcer.rule.api.EnforcerRule#execute(org.apache.maven.enforcer.rule.api.EnforcerRuleHelper) + */ +public void execute( EnforcerRuleHelper helper ) +throws EnforcerRuleException +{ +// if the file is already defined, use that. Otherwise get the main artifact. +if ( files.length == 0 ) +{ +try +{ +MavenProject project = (MavenProject) helper.evaluate( ${project} ); + +files[0] = project.getArtifact().getFile(); + +this.log = helper.getLog(); + +super.execute( helper ); +} +catch ( ExpressionEvaluationException e ) +{ +throw new EnforcerRuleException( Unable to retrieve the project., e ); +} +} + +} + +/* + * (non-Javadoc) + * + * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable() + */ +public boolean isCacheable() +{ +return false; +} + +/* + * (non-Javadoc) + * + * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule) + */ +public boolean isResultValid( EnforcerRule cachedRule ) +{ +return false; +} + +/* (non-Javadoc) + * @see org.apache.maven.plugins.enforcer.AbstractRequireFiles#checkFile(java.io.File) + */ +boolean checkFile( File file ) +{ +// check the file now +if ( file.exists() ) +{ +long length = file.length(); +if ( length minsize ) +{ +this.errorMsg = ( file + size ( + length + ) too small. Min. is + minsize ); +return false; +} +else if ( length maxsize ) +{ +this.errorMsg = ( file + size ( + length + ) too large. Max. is + maxsize ); +return false; +} +else +{ + +this.log.debug( file + + size ( + +length + +) is OK
svn commit: r656046 - in /maven/site/trunk/src/site/apt: community.apt guides/introduction/introduction-to-repositories.apt
Author: brianf Date: Tue May 13 15:58:26 2008 New Revision: 656046 URL: http://svn.apache.org/viewvc?rev=656046view=rev Log: updated urls Modified: maven/site/trunk/src/site/apt/community.apt maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt Modified: maven/site/trunk/src/site/apt/community.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/community.apt?rev=656046r1=656045r2=656046view=diff == --- maven/site/trunk/src/site/apt/community.apt (original) +++ maven/site/trunk/src/site/apt/community.apt Tue May 13 15:58:26 2008 @@ -43,7 +43,7 @@ The best thing that a user can do is to set up their own remote repository mirror containing the projects needed. There are several tools to make this simpler, such as - {{{http://proximity.abstracthorizon.org/}Proximity}} or {{{http://maven.apache.org/archiva/}Archiva}}. This + {{{http://nexus.sonatype.org/}Nexus}} or {{{http://maven.apache.org/archiva/}Archiva}}. This reduces strain on the Maven central repository, and allows new users to get acquainted with Maven easier and quicker. This is especially important for power-users and corporations. The incentive behind this is, controlling your own servers can give you desired level of security and Modified: maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt?rev=656046r1=656045r2=656046view=diff == --- maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt (original) +++ maven/site/trunk/src/site/apt/guides/introduction/introduction-to-repositories.apt Tue May 13 15:58:26 2008 @@ -4,7 +4,7 @@ Jason van Zyl Brian Fox -- - 10 April 2007 + 13 May 2008 -- Introduction to Repositories @@ -137,7 +137,7 @@ required artifacts there using the same layout as in a remote repository such as {{{http://repo1.maven.org/maven2/}repo1.maven.org}}. It is not recommended that you scrape or rsync:// a full copy of central as there is a large amount - of data there. You can use a program such as {{{http://maven.apache.org/archiva/}Archiva}}, {{{http://proximity.abstracthorizon.org}Proximity}} or {{{http://maven-proxy.codehaus.org/}Maven Proxy}} + of data there. You can use a program such as {{{http://archiva.apache.org/}Archiva}}, {{{http://nexus.sonatype.org}Nexus Maven Repository Manager}} or {{{http://maven-proxy.codehaus.org/}Maven Proxy}} running on your internal repository's server, to download from the internet as required and then hold the artifacts in your internal repository for faster downloading later. @@ -192,4 +192,4 @@ * {{{http://www.pdark.de/dsmp/}DSMP (Dead Simple Maven Proxy)}} - * {{{http://proximity.abstracthorizon.org/}Proximity}} + * {{{http://nexus.sonatype.org/}Nexus Maven Repository Manager}}
svn commit: r653481 - in /maven/components/trunk: ./ maven-core/ maven-distribution/ maven-embedder-integration-tests/ maven-embedder/ maven-plugin-api/ maven-profile/ maven-project/ maven-toolchain/
Author: brianf Date: Mon May 5 06:46:40 2008 New Revision: 653481 URL: http://svn.apache.org/viewvc?rev=653481view=rev Log: clean up the poms and move versions to dependencyManagement Issue id: c Modified: maven/components/trunk/maven-core/pom.xml maven/components/trunk/maven-distribution/ (props changed) maven/components/trunk/maven-distribution/pom.xml maven/components/trunk/maven-embedder-integration-tests/pom.xml maven/components/trunk/maven-embedder/pom.xml maven/components/trunk/maven-plugin-api/pom.xml maven/components/trunk/maven-profile/pom.xml maven/components/trunk/maven-project/ (props changed) maven/components/trunk/maven-project/pom.xml maven/components/trunk/maven-toolchain/pom.xml maven/components/trunk/pom.xml Modified: maven/components/trunk/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/pom.xml?rev=653481r1=653480r2=653481view=diff == --- maven/components/trunk/maven-core/pom.xml (original) +++ maven/components/trunk/maven-core/pom.xml Mon May 5 06:46:40 2008 @@ -34,73 +34,48 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-workspace/artifactId - version2.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-lifecycle/artifactId - version2.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-reporting-api/artifactId - version2.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-profile/artifactId - version2.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-model/artifactId - version2.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven.artifact/groupId artifactIdmaven-artifact/artifactId /dependency dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-plugin-api/artifactId +/dependency +dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-container-default/artifactId /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-project/artifactId - version2.1-SNAPSHOT/version /dependency dependency groupIdcommons-cli/groupId artifactIdcommons-cli/artifactId - version1.0/version - exclusions -exclusion - artifactIdcommons-lang/artifactId - groupIdcommons-lang/groupId -/exclusion -exclusion - artifactIdcommons-logging/artifactId - groupIdcommons-logging/groupId -/exclusion - /exclusions -/dependency -dependency - groupIdorg.apache.maven/groupId - artifactIdmaven-plugin-api/artifactId - version2.1-SNAPSHOT/version /dependency - dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-interactivity-api/artifactId - version1.0-alpha-6/version - exclusions -exclusion - groupIdorg.codehaus.plexus/groupId - artifactIdplexus-component-api/artifactId -/exclusion - /exclusions /dependency + dependency groupIdorg.codehaus.plexus/groupId artifactIdplexus-utils/artifactId @@ -112,13 +87,11 @@ dependency groupIdorg.apache.maven.wagon/groupId artifactIdwagon-file/artifactId - version1.0-beta-2/version scopetest/scope /dependency dependency groupIdeasymock/groupId artifactIdeasymock/artifactId - version1.2_Java1.3/version scopetest/scope /dependency dependency @@ -132,7 +105,6 @@ dependency groupIdaspectj/groupId artifactIdaspectjrt/artifactId - version1.5.3/version /dependency /dependencies build Propchange: maven/components/trunk/maven-distribution/ -- --- svn:ignore (added) +++ svn:ignore Mon May 5 06:46:40 2008 @@ -0,0 +1 @@ +target Modified: maven/components/trunk/maven-distribution/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-distribution/pom.xml?rev=653481r1=653480r2=653481view=diff == --- maven/components/trunk/maven-distribution/pom.xml (original) +++ maven/components/trunk/maven-distribution/pom.xml Mon May 5 06:46:40 2008 @@ -33,22 +33,18 @@ dependency groupIdorg.apache.maven/groupId artifactIdmaven-embedder/artifactId - version2.1-SNAPSHOT/version /dependency dependency groupIdorg.apache.maven/groupId artifactIdmaven-core/artifactId - version2.1-SNAPSHOT/version /dependency dependency
svn commit: r647251 - /maven/shared/trunk/maven-common-artifact-filters/
Author: brianf Date: Fri Apr 11 11:09:39 2008 New Revision: 647251 URL: http://svn.apache.org/viewvc?rev=647251view=rev Log: ignore eclipse stuff Modified: maven/shared/trunk/maven-common-artifact-filters/ (props changed) Propchange: maven/shared/trunk/maven-common-artifact-filters/ -- --- svn:ignore (original) +++ svn:ignore Fri Apr 11 11:09:39 2008 @@ -7,3 +7,4 @@ *.iws *.iml .settings +target-eclipse
svn commit: r647315 - in /maven/shared/trunk: maven-ant/ maven-app-configuration/ maven-archiver/ maven-common-artifact-filters/ maven-dependency-analyzer/ maven-dependency-tree/ maven-downloader/ mav
Author: brianf Date: Fri Apr 11 14:22:12 2008 New Revision: 647315 URL: http://svn.apache.org/viewvc?rev=647315view=rev Log: use the latest released parent Modified: maven/shared/trunk/maven-ant/pom.xml maven/shared/trunk/maven-app-configuration/pom.xml maven/shared/trunk/maven-archiver/pom.xml maven/shared/trunk/maven-common-artifact-filters/pom.xml maven/shared/trunk/maven-dependency-analyzer/pom.xml maven/shared/trunk/maven-dependency-tree/pom.xml maven/shared/trunk/maven-downloader/pom.xml maven/shared/trunk/maven-osgi/ (props changed) maven/shared/trunk/maven-osgi/pom.xml maven/shared/trunk/maven-reporting-impl/pom.xml maven/shared/trunk/maven-repository-builder/pom.xml maven/shared/trunk/maven-script/pom.xml maven/shared/trunk/maven-shared-io/pom.xml maven/shared/trunk/maven-shared-monitor/pom.xml maven/shared/trunk/maven-verifier/pom.xml maven/shared/trunk/maven-web-ui-tests/pom.xml Modified: maven/shared/trunk/maven-ant/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-ant/pom.xml?rev=647315r1=647314r2=647315view=diff == --- maven/shared/trunk/maven-ant/pom.xml (original) +++ maven/shared/trunk/maven-ant/pom.xml Fri Apr 11 14:22:12 2008 @@ -2,7 +2,7 @@ parent artifactIdmaven-shared-components/artifactId groupIdorg.apache.maven.shared/groupId -version7/version +version9/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-ant/artifactId Modified: maven/shared/trunk/maven-app-configuration/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-app-configuration/pom.xml?rev=647315r1=647314r2=647315view=diff == --- maven/shared/trunk/maven-app-configuration/pom.xml (original) +++ maven/shared/trunk/maven-app-configuration/pom.xml Fri Apr 11 14:22:12 2008 @@ -3,7 +3,7 @@ parent artifactIdmaven-shared-components/artifactId groupIdorg.apache.maven.shared/groupId -version7/version +version9/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-app-configuration/artifactId Modified: maven/shared/trunk/maven-archiver/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=647315r1=647314r2=647315view=diff == --- maven/shared/trunk/maven-archiver/pom.xml (original) +++ maven/shared/trunk/maven-archiver/pom.xml Fri Apr 11 14:22:12 2008 @@ -21,7 +21,7 @@ parent groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId -version8/version +version9/version /parent modelVersion4.0.0/modelVersion groupIdorg.apache.maven/groupId Modified: maven/shared/trunk/maven-common-artifact-filters/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/pom.xml?rev=647315r1=647314r2=647315view=diff == --- maven/shared/trunk/maven-common-artifact-filters/pom.xml (original) +++ maven/shared/trunk/maven-common-artifact-filters/pom.xml Fri Apr 11 14:22:12 2008 @@ -2,7 +2,7 @@ parent artifactIdmaven-shared-components/artifactId groupIdorg.apache.maven.shared/groupId -version8/version +version9/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-common-artifact-filters/artifactId Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=647315r1=647314r2=647315view=diff == --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Fri Apr 11 14:22:12 2008 @@ -23,7 +23,7 @@ groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId -version8/version +version9/version /parent modelVersion4.0.0/modelVersion Modified: maven/shared/trunk/maven-dependency-tree/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/pom.xml?rev=647315r1=647314r2=647315view=diff == --- maven/shared/trunk/maven-dependency-tree/pom.xml (original) +++ maven/shared/trunk/maven-dependency-tree/pom.xml Fri Apr 11 14:22:12 2008 @@ -22,7 +22,7 @@ parent groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId -version8/version +version9/version /parent modelVersion4.0.0/modelVersion Modified: maven/shared/trunk/maven-downloader/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-downloader/pom.xml?rev=647315r1=647314r2=647315view=diff
svn commit: r647318 - /maven/release/trunk/pom.xml
Author: brianf Date: Fri Apr 11 14:27:13 2008 New Revision: 647318 URL: http://svn.apache.org/viewvc?rev=647318view=rev Log: use the latest released parent Modified: maven/release/trunk/pom.xml Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=647318r1=647317r2=647318view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Fri Apr 11 14:27:13 2008 @@ -23,7 +23,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version7/version +version8/version relativePath../pom/maven/pom.xml/relativePath /parent groupIdorg.apache.maven.release/groupId
svn commit: r646646 - in /maven/site/trunk: ./ src/site/apt/ src/site/apt/guides/introduction/ src/site/apt/guides/mini/ src/site/xdoc/
Author: brianf Date: Wed Apr 9 21:54:44 2008 New Revision: 646646 URL: http://svn.apache.org/viewvc?rev=646646view=rev Log: changes to site for 2.0.9 release Added: maven/site/trunk/src/site/apt/release-notes-older.apt.vm - copied, changed from r646482, maven/site/trunk/src/site/apt/release-notes.apt.vm Modified: maven/site/trunk/pom.xml maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt maven/site/trunk/src/site/apt/release-notes.apt.vm maven/site/trunk/src/site/apt/repository-management.apt maven/site/trunk/src/site/apt/settings.apt maven/site/trunk/src/site/xdoc/index.xml.vm Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=646646r1=646645r2=646646view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Wed Apr 9 21:54:44 2008 @@ -35,7 +35,7 @@ nameMaven Site/name properties -currentVersion2.0.8/currentVersion +currentVersion2.0.9/currentVersion /properties issueManagement Modified: maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt?rev=646646r1=646645r2=646646view=diff == --- maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt (original) +++ maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt Wed Apr 9 21:54:44 2008 @@ -411,7 +411,7 @@ ** {Importing Dependencies} - The features defined in this section are only available in maven 2.0.9 or later. + The features defined in this section are only available in Maven 2.0.9 or later. This means that poms declaring the import scope will not be parseable by earlier versions of Maven. Weigh this information carefully before deciding to use it. If you do use it, we suggest you use the enforcer plugin to require a minimum Maven version of 2.0.9. We currently do not recommend using this for projects that get deployed to Central. The examples in the previous section describe how to specify managed dependencies through inheritence. However, in larger projects it may be impossible to accomplish this since a project can only inherit from a single parent. Modified: maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt?rev=646646r1=646645r2=646646view=diff == --- maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-mirror-settings.apt Wed Apr 9 21:54:44 2008 @@ -2,8 +2,9 @@ Guide to Mirror Settings -- Jason van Zyl + Brian Fox -- - 12 October 2005 + 8 April 2008 -- Using Mirrors for Repositories @@ -142,6 +143,54 @@ /settings +-+ +Advanced Mirror specification + + A single mirror can handle multiple repositories when used in conjunction with a repository manager. + + The syntax as of Maven 2.0.9: + + * \* matches all repo ids. + + * external:\* matches all repos except those using localhost or file based repositories. This is used in conjunction with a repository manager when you want to exclude redirecting repositories that are defined for Integration Testing. + + * multiple repos may be specified using , as the delimiter + + * ! may be used in conjunction with one of the above wildcards to exclude a repo id. + + The order is not important from left to right as the wildcards defer to further processing and explicit includes or excludes stop the processing. Additionally, the mirror list will now be ordered using a LinkedHashMap instead of HashMap such that the user may influence match order by changing the order of the definitions in the settings.xml + + Examples: + + * \* = everything + + * external:\* = everything not on the localhost and not file based. + + * repo,repo1 = repo or repo1 + + * \*,!repo1 = everything except repo1 + + Note: This feature is only available in Maven 2.0.9+. + ++-+ +settings + . + mirrors +mirror + idinternal-repository/id + nameMaven Repository Manager running on repo.mycompany.com/name + urlhttp://repo.mycompany.com/proxy/url + mirrorOfexternal:*,!foo/mirrorOf +/mirror +mirror + idfoo-repository/id + nameFoo/name + urlhttp://repo.mycompany.com/foo/url + mirrorOffoo/mirrorOf +/mirror + /mirrors + . +/settings ++-+ FTP access Copied: maven/site/trunk/src/site/apt
svn commit: r645583 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Mon Apr 7 09:03:15 2008 New Revision: 645583 URL: http://svn.apache.org/viewvc?rev=645583view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=645583r1=645582r2=645583view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Mon Apr 7 09:03:15 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9/version +version2.0.10-SNAPSHOT/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=645583r1=645582r2=645583view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Mon Apr 7 09:03:15 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9/version +version2.0.10-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=645583r1=645582r2=645583view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Mon Apr 7 09:03:15 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9/version +version2.0.10-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=645583r1=645582r2=645583view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Mon Apr 7 09:03:15 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9/version +version2.0.10-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=645583r1=645582r2=645583view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven
svn commit: r645582 - in /maven/components/tags/maven-2.0.9: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monit
Author: brianf Date: Mon Apr 7 09:02:54 2008 New Revision: 645582 URL: http://svn.apache.org/viewvc?rev=645582view=rev Log: [maven-release-plugin] copy for tag maven-2.0.9 Added: maven/components/tags/maven-2.0.9/ - copied from r645577, maven/components/branches/maven-2.0.x/ maven/components/tags/maven-2.0.9/apache-maven/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/tags/maven-2.0.9/maven-artifact-manager/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/tags/maven-2.0.9/maven-artifact-test/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/tags/maven-2.0.9/maven-artifact/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/tags/maven-2.0.9/maven-core/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/tags/maven-2.0.9/maven-error-diagnostics/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.0.9/maven-model/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/tags/maven-2.0.9/maven-monitor/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/tags/maven-2.0.9/maven-plugin-api/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/tags/maven-2.0.9/maven-plugin-descriptor/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.0.9/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.0.9/maven-plugin-registry/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/tags/maven-2.0.9/maven-profile/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/tags/maven-2.0.9/maven-project/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/tags/maven-2.0.9/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.0.9/maven-reporting/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/tags/maven-2.0.9/maven-repository-metadata/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/tags/maven-2.0.9/maven-script/maven-script-ant/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.0.9/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.0.9/maven-script/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/tags/maven-2.0.9/maven-settings/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/tags/maven-2.0.9/maven-toolchain/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/tags/maven-2.0.9/pom.xml - copied unchanged from r645581, maven/components/branches/maven-2.0.x/pom.xml
svn commit: r645581 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Mon Apr 7 09:02:16 2008 New Revision: 645581 URL: http://svn.apache.org/viewvc?rev=645581view=rev Log: [maven-release-plugin] prepare release maven-2.0.9 Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=645581r1=645580r2=645581view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Mon Apr 7 09:02:16 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC9-SNAPSHOT/version +version2.0.9/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=645581r1=645580r2=645581view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Mon Apr 7 09:02:16 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC9-SNAPSHOT/version +version2.0.9/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=645581r1=645580r2=645581view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Mon Apr 7 09:02:16 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC9-SNAPSHOT/version +version2.0.9/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=645581r1=645580r2=645581view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Mon Apr 7 09:02:16 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC9-SNAPSHOT/version +version2.0.9/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=645581r1=645580r2=645581view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven
svn commit: r645642 - in /maven/components/branches/maven-2.0.x: maven-core-it-runner/pom.xml pom.xml
Author: brianf Date: Mon Apr 7 11:38:32 2008 New Revision: 645642 URL: http://svn.apache.org/viewvc?rev=645642view=rev Log: bump these to .10-snap Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml?rev=645642r1=645641r2=645642view=diff == --- maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml Mon Apr 7 11:38:32 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC9-SNAPSHOT/version +version2.0.10-SNAPSHOT/version /parent artifactIdmaven-core-it-runner/artifactId nameIntegration Test Executor/name Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=645642r1=645641r2=645642view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Mon Apr 7 11:38:32 2008 @@ -242,7 +242,7 @@ /dependencies properties -mavenVersion2.0.9/mavenVersion +mavenVersion2.0.10-SNAPSHOT/mavenVersion !-- Can't use. bootstrap-mini isn't smart enough: wagonVersion1.0-beta-2/wagonVersion -- /properties
svn commit: r644390 - in /maven/components/branches/maven-2.0.x: maven-core-it-runner/pom.xml pom.xml
Author: brianf Date: Thu Apr 3 09:16:48 2008 New Revision: 644390 URL: http://svn.apache.org/viewvc?rev=644390view=rev Log: bump these versions Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml?rev=644390r1=644389r2=644390view=diff == --- maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml Thu Apr 3 09:16:48 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC7-SNAPSHOT/version +version2.0.9-RC8-SNAPSHOT/version /parent artifactIdmaven-core-it-runner/artifactId nameIntegration Test Executor/name Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=644390r1=644389r2=644390view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Thu Apr 3 09:16:48 2008 @@ -242,7 +242,7 @@ /dependencies properties -mavenVersion2.0.9-RC7/mavenVersion +mavenVersion2.0.9-RC8-SNAPSHOT/mavenVersion !-- Can't use. bootstrap-mini isn't smart enough: wagonVersion1.0-beta-2/wagonVersion -- /properties
svn commit: r644449 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Thu Apr 3 12:27:45 2008 New Revision: 69 URL: http://svn.apache.org/viewvc?rev=69view=rev Log: [maven-release-plugin] prepare release maven-2.0.9-RC8 Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=69r1=68r2=69view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Thu Apr 3 12:27:45 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC8-SNAPSHOT/version +version2.0.9-RC8/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=69r1=68r2=69view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Thu Apr 3 12:27:45 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC8-SNAPSHOT/version +version2.0.9-RC8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=69r1=68r2=69view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Thu Apr 3 12:27:45 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC8-SNAPSHOT/version +version2.0.9-RC8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=69r1=68r2=69view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Thu Apr 3 12:27:45 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC8-SNAPSHOT/version +version2.0.9-RC8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=69r1=68r2=69view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r644450 - in /maven/components/tags/maven-2.0.9-RC8: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Thu Apr 3 12:28:03 2008 New Revision: 644450 URL: http://svn.apache.org/viewvc?rev=644450view=rev Log: [maven-release-plugin] copy for tag maven-2.0.9-RC8 Added: maven/components/tags/maven-2.0.9-RC8/ - copied from r644439, maven/components/branches/maven-2.0.x/ maven/components/tags/maven-2.0.9-RC8/apache-maven/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-artifact-manager/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-artifact-test/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-artifact/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-core/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-error-diagnostics/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-model/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-monitor/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-plugin-api/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-plugin-descriptor/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-plugin-registry/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-profile/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-project/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-reporting/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-repository-metadata/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-script/maven-script-ant/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-script/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-settings/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/tags/maven-2.0.9-RC8/maven-toolchain/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/tags/maven-2.0.9-RC8/pom.xml - copied unchanged from r69, maven/components/branches/maven-2.0.x/pom.xml
svn commit: r644451 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Thu Apr 3 12:28:15 2008 New Revision: 644451 URL: http://svn.apache.org/viewvc?rev=644451view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=644451r1=644450r2=644451view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Thu Apr 3 12:28:15 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC8/version +version2.0.9-RC9-SNAPSHOT/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=644451r1=644450r2=644451view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Thu Apr 3 12:28:15 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC8/version +version2.0.9-RC9-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=644451r1=644450r2=644451view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Thu Apr 3 12:28:15 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC8/version +version2.0.9-RC9-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=644451r1=644450r2=644451view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Thu Apr 3 12:28:15 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC8/version +version2.0.9-RC9-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=644451r1=644450r2=644451view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r644458 - in /maven/components/branches/maven-2.0.x: maven-core-it-runner/pom.xml pom.xml
Author: brianf Date: Thu Apr 3 12:40:53 2008 New Revision: 644458 URL: http://svn.apache.org/viewvc?rev=644458view=rev Log: bump these versions Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml?rev=644458r1=644457r2=644458view=diff == --- maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml Thu Apr 3 12:40:53 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC8-SNAPSHOT/version +version2.0.9-RC9-SNAPSHOT/version /parent artifactIdmaven-core-it-runner/artifactId nameIntegration Test Executor/name Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=644458r1=644457r2=644458view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Thu Apr 3 12:40:53 2008 @@ -242,7 +242,7 @@ /dependencies properties -mavenVersion2.0.9-RC8/mavenVersion +mavenVersion2.0.9-RC9-SNAPSHOT/mavenVersion !-- Can't use. bootstrap-mini isn't smart enough: wagonVersion1.0-beta-2/wagonVersion -- /properties
svn commit: r644048 - in /maven/components/tags/maven-2.0.9-RC7: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Wed Apr 2 13:48:10 2008 New Revision: 644048 URL: http://svn.apache.org/viewvc?rev=644048view=rev Log: [maven-release-plugin] copy for tag maven-2.0.9-RC7 Added: maven/components/tags/maven-2.0.9-RC7/ - copied from r644037, maven/components/branches/maven-2.0.x/ maven/components/tags/maven-2.0.9-RC7/apache-maven/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-artifact-manager/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-artifact-test/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-artifact/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-core/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-error-diagnostics/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-model/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-monitor/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-plugin-api/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-plugin-descriptor/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-plugin-registry/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-profile/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-project/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-reporting/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-repository-metadata/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-script/maven-script-ant/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-script/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-settings/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/tags/maven-2.0.9-RC7/maven-toolchain/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/tags/maven-2.0.9-RC7/pom.xml - copied unchanged from r644047, maven/components/branches/maven-2.0.x/pom.xml
svn commit: r644047 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Wed Apr 2 13:47:55 2008 New Revision: 644047 URL: http://svn.apache.org/viewvc?rev=644047view=rev Log: [maven-release-plugin] prepare release maven-2.0.9-RC7 Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=644047r1=644046r2=644047view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Wed Apr 2 13:47:55 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC7-SNAPSHOT/version +version2.0.9-RC7/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=644047r1=644046r2=644047view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Wed Apr 2 13:47:55 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC7-SNAPSHOT/version +version2.0.9-RC7/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=644047r1=644046r2=644047view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Wed Apr 2 13:47:55 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC7-SNAPSHOT/version +version2.0.9-RC7/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=644047r1=644046r2=644047view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Wed Apr 2 13:47:55 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC7-SNAPSHOT/version +version2.0.9-RC7/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=644047r1=644046r2=644047view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r644049 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Wed Apr 2 13:48:29 2008 New Revision: 644049 URL: http://svn.apache.org/viewvc?rev=644049view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=644049r1=644048r2=644049view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Wed Apr 2 13:48:29 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC7/version +version2.0.9-RC8-SNAPSHOT/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=644049r1=644048r2=644049view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Wed Apr 2 13:48:29 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC7/version +version2.0.9-RC8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=644049r1=644048r2=644049view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Wed Apr 2 13:48:29 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC7/version +version2.0.9-RC8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=644049r1=644048r2=644049view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Wed Apr 2 13:48:29 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC7/version +version2.0.9-RC8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=644049r1=644048r2=644049view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r643575 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Tue Apr 1 14:12:33 2008 New Revision: 643575 URL: http://svn.apache.org/viewvc?rev=643575view=rev Log: [maven-release-plugin] prepare release maven-2.0.9-RC6 Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=643575r1=643574r2=643575view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Tue Apr 1 14:12:33 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC6-SNAPSHOT/version +version2.0.9-RC6/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=643575r1=643574r2=643575view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Tue Apr 1 14:12:33 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC6-SNAPSHOT/version +version2.0.9-RC6/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=643575r1=643574r2=643575view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Tue Apr 1 14:12:33 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC6-SNAPSHOT/version +version2.0.9-RC6/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=643575r1=643574r2=643575view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Tue Apr 1 14:12:33 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC6-SNAPSHOT/version +version2.0.9-RC6/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=643575r1=643574r2=643575view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r643576 - in /maven/components/tags/maven-2.0.9-RC6: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Tue Apr 1 14:13:06 2008 New Revision: 643576 URL: http://svn.apache.org/viewvc?rev=643576view=rev Log: [maven-release-plugin] copy for tag maven-2.0.9-RC6 Added: maven/components/tags/maven-2.0.9-RC6/ - copied from r643559, maven/components/branches/maven-2.0.x/ maven/components/tags/maven-2.0.9-RC6/apache-maven/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-artifact-manager/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-artifact-test/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-artifact/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-core/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-error-diagnostics/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-model/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-monitor/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-plugin-api/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-plugin-descriptor/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-plugin-registry/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-profile/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-project/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-reporting/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-repository-metadata/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-script/maven-script-ant/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-script/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-settings/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/tags/maven-2.0.9-RC6/maven-toolchain/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/tags/maven-2.0.9-RC6/pom.xml - copied unchanged from r643575, maven/components/branches/maven-2.0.x/pom.xml
svn commit: r643577 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Tue Apr 1 14:13:29 2008 New Revision: 643577 URL: http://svn.apache.org/viewvc?rev=643577view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=643577r1=643576r2=643577view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Tue Apr 1 14:13:29 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC6/version +version2.0.9-RC7-SNAPSHOT/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=643577r1=643576r2=643577view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Tue Apr 1 14:13:29 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC6/version +version2.0.9-RC7-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=643577r1=643576r2=643577view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Tue Apr 1 14:13:29 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC6/version +version2.0.9-RC7-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=643577r1=643576r2=643577view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Tue Apr 1 14:13:29 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC6/version +version2.0.9-RC7-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=643577r1=643576r2=643577view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r642374 - /maven/archetype/trunk/pom.xml
Author: brianf Date: Fri Mar 28 13:51:57 2008 New Revision: 642374 URL: http://svn.apache.org/viewvc?rev=642374view=rev Log: use latest parent Modified: maven/archetype/trunk/pom.xml Modified: maven/archetype/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=642374r1=642373r2=642374view=diff == --- maven/archetype/trunk/pom.xml (original) +++ maven/archetype/trunk/pom.xml Fri Mar 28 13:51:57 2008 @@ -4,7 +4,7 @@ parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version7/version +version8/version relativePath../pom/maven/pom.xml/relativePath /parent
svn commit: r642464 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Fri Mar 28 18:01:54 2008 New Revision: 642464 URL: http://svn.apache.org/viewvc?rev=642464view=rev Log: [maven-release-plugin] prepare release maven-2.0.9-RC5 Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=642464r1=642463r2=642464view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Fri Mar 28 18:01:54 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC5-SNAPSHOT/version +version2.0.9-RC5/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=642464r1=642463r2=642464view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Fri Mar 28 18:01:54 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC5-SNAPSHOT/version +version2.0.9-RC5/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=642464r1=642463r2=642464view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Fri Mar 28 18:01:54 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC5-SNAPSHOT/version +version2.0.9-RC5/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=642464r1=642463r2=642464view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Fri Mar 28 18:01:54 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC5-SNAPSHOT/version +version2.0.9-RC5/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=642464r1=642463r2=642464view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r642465 - in /maven/components/tags/maven-2.0.9-RC5: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Fri Mar 28 18:02:12 2008 New Revision: 642465 URL: http://svn.apache.org/viewvc?rev=642465view=rev Log: [maven-release-plugin] copy for tag maven-2.0.9-RC5 Added: maven/components/tags/maven-2.0.9-RC5/ - copied from r642463, maven/components/branches/maven-2.0.x/ maven/components/tags/maven-2.0.9-RC5/apache-maven/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-artifact-manager/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-artifact-test/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-artifact/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-core/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-error-diagnostics/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-model/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-monitor/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-plugin-api/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-plugin-descriptor/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-plugin-registry/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-profile/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-project/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-reporting/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-repository-metadata/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-script/maven-script-ant/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-script/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-settings/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/tags/maven-2.0.9-RC5/maven-toolchain/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/tags/maven-2.0.9-RC5/pom.xml - copied unchanged from r642464, maven/components/branches/maven-2.0.x/pom.xml
svn commit: r642466 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Fri Mar 28 18:02:34 2008 New Revision: 642466 URL: http://svn.apache.org/viewvc?rev=642466view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=642466r1=642465r2=642466view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Fri Mar 28 18:02:34 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC5/version +version2.0.9-RC6-SNAPSHOT/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=642466r1=642465r2=642466view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Fri Mar 28 18:02:34 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC5/version +version2.0.9-RC6-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=642466r1=642465r2=642466view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Fri Mar 28 18:02:34 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC5/version +version2.0.9-RC6-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=642466r1=642465r2=642466view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Fri Mar 28 18:02:34 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC5/version +version2.0.9-RC6-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=642466r1=642465r2=642466view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r641968 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java
Author: brianf Date: Thu Mar 27 13:16:13 2008 New Revision: 641968 URL: http://svn.apache.org/viewvc?rev=641968view=rev Log: MDEP-157 MDEP-139 patch from Frank Cornelis to fix output formatting Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java?rev=641968r1=641967r2=641968view=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyMojo.java Thu Mar 27 13:16:13 2008 @@ -226,8 +226,8 @@ try { getLog().info( -Unpacking + file.getPath() + to\n + location.getPath() -+ \nwith Includes + includes + and excludes: + excludes ); +Unpacking + file.getPath() + to\n + location.getPath() ++ \n with Includes + includes + and excludes: + excludes ); location.mkdirs();
svn commit: r641999 - /maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java
Author: brianf Date: Thu Mar 27 15:06:54 2008 New Revision: 641999 URL: http://svn.apache.org/viewvc?rev=641999view=rev Log: added method to validate certain text in a log Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Modified: maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=641999r1=641998r2=641999view=diff == --- maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java (original) +++ maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/Verifier.java Thu Mar 27 15:06:54 2008 @@ -229,6 +229,33 @@ } } +/** + * Throws an exception if the text is not present in the log. + * @param text + * @throws VerificationException + */ +public void verifyTextInLog( String text ) +throws VerificationException +{ +List lines; +lines = loadFile( getBasedir(), LOG_FILENAME, false ); + +boolean result = false; +for ( Iterator i = lines.iterator(); i.hasNext(); ) +{ +String line = (String) i.next(); +if ( line.indexOf( text ) = 0) +{ +result = true; +break; +} +} +if (!result) +{ +throw new VerificationException( Text not found in log: + text ); +} +} + public Properties loadProperties( String filename ) throws VerificationException {
svn commit: r642001 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java
Author: brianf Date: Thu Mar 27 15:09:24 2008 New Revision: 642001 URL: http://svn.apache.org/viewvc?rev=642001view=rev Log: added minimum version Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java?rev=642001r1=642000r2=642001view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3428PluginDescriptorArtifactsIncompleteTest.java Thu Mar 27 15:09:24 2008 @@ -1,5 +1,6 @@ package org.apache.maven.integrationtests; +import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.it.Verifier; import org.apache.maven.it.util.ResourceExtractor; @@ -12,6 +13,11 @@ public class MavenITmng3428PluginDescriptorArtifactsIncompleteTest extends AbstractMavenIntegrationTestCase { +public MavenITmng3428PluginDescriptorArtifactsIncompleteTest() +throws InvalidVersionSpecificationException +{ +super( (2.0.8,) ); // 2.0.8+ +} public void testitMNG3428 () throws Exception {
svn commit: r642048 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Thu Mar 27 17:46:54 2008 New Revision: 642048 URL: http://svn.apache.org/viewvc?rev=642048view=rev Log: [maven-release-plugin] prepare release maven-2.0.9-RC4 Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=642048r1=642047r2=642048view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Thu Mar 27 17:46:54 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC4-SNAPSHOT/version +version2.0.9-RC4/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=642048r1=642047r2=642048view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Thu Mar 27 17:46:54 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC4-SNAPSHOT/version +version2.0.9-RC4/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=642048r1=642047r2=642048view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Thu Mar 27 17:46:54 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC4-SNAPSHOT/version +version2.0.9-RC4/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=642048r1=642047r2=642048view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Thu Mar 27 17:46:54 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC4-SNAPSHOT/version +version2.0.9-RC4/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=642048r1=642047r2=642048view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r642049 - in /maven/components/tags/maven-2.0.9-RC4: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Thu Mar 27 17:47:17 2008 New Revision: 642049 URL: http://svn.apache.org/viewvc?rev=642049view=rev Log: [maven-release-plugin] copy for tag maven-2.0.9-RC4 Added: maven/components/tags/maven-2.0.9-RC4/ - copied from r642040, maven/components/branches/maven-2.0.x/ maven/components/tags/maven-2.0.9-RC4/apache-maven/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-artifact-manager/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-artifact-test/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-artifact/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-core/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-error-diagnostics/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-model/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-monitor/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-plugin-api/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-plugin-descriptor/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-plugin-registry/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-profile/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-project/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-reporting/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-repository-metadata/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-script/maven-script-ant/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-script/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-settings/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/tags/maven-2.0.9-RC4/maven-toolchain/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/tags/maven-2.0.9-RC4/pom.xml - copied unchanged from r642048, maven/components/branches/maven-2.0.x/pom.xml
svn commit: r642050 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Thu Mar 27 17:47:49 2008 New Revision: 642050 URL: http://svn.apache.org/viewvc?rev=642050view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=642050r1=642049r2=642050view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Thu Mar 27 17:47:49 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC4/version +version2.0.9-RC5-SNAPSHOT/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=642050r1=642049r2=642050view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Thu Mar 27 17:47:49 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC4/version +version2.0.9-RC5-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=642050r1=642049r2=642050view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Thu Mar 27 17:47:49 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC4/version +version2.0.9-RC5-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=642050r1=642049r2=642050view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Thu Mar 27 17:47:49 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC4/version +version2.0.9-RC5-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=642050r1=642049r2=642050view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r642052 - in /maven/components/branches/maven-2.0.x: maven-core-it-runner/pom.xml pom.xml
Author: brianf Date: Thu Mar 27 17:48:48 2008 New Revision: 642052 URL: http://svn.apache.org/viewvc?rev=642052view=rev Log: bump these too Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml?rev=642052r1=642051r2=642052view=diff == --- maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml Thu Mar 27 17:48:48 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC4-SNAPSHOT/version +version2.0.9-RC5-SNAPSHOT/version /parent artifactIdmaven-core-it-runner/artifactId nameIntegration Test Executor/name Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=642052r1=642051r2=642052view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Thu Mar 27 17:48:48 2008 @@ -242,7 +242,7 @@ /dependencies properties -mavenVersion2.0.9-RC4/mavenVersion +mavenVersion2.0.9-RC5/mavenVersion !-- Can't use. bootstrap-mini isn't smart enough: wagonVersion1.0-beta-2/wagonVersion -- /properties
svn commit: r641327 - in /maven/shared/branches: maven-reporting-impl-2.0.4.1-dev/ maven-reporting-impl-2.0.4.x/
Author: brianf Date: Wed Mar 26 07:36:01 2008 New Revision: 641327 URL: http://svn.apache.org/viewvc?rev=641327view=rev Log: Renamed remotely Added: maven/shared/branches/maven-reporting-impl-2.0.4.x/ - copied from r641326, maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/ Removed: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/
svn commit: r641420 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Author: brianf Date: Wed Mar 26 10:27:48 2008 New Revision: 641420 URL: http://svn.apache.org/viewvc?rev=641420view=rev Log: take IT20 out since it's testing beanshell which isn't in the core anymore. Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=641420r1=641419r2=641420view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Wed Mar 26 10:27:48 2008 @@ -183,7 +183,7 @@ suite.addTestSuite( MavenIT0023Test.class ); suite.addTestSuite( MavenIT0022Test.class ); suite.addTestSuite( MavenIT0021Test.class ); -suite.addTestSuite( MavenIT0020Test.class ); + suite.addTestSuite( MavenIT0019Test.class ); suite.addTestSuite( MavenIT0017Test.class ); @@ -220,6 +220,9 @@ *in the repo. It should be redone using fake artifacts. */ //suite.addTestSuite( MavenIT0018Test.class ); + +//this test is flakey on windows and isn't a test of the core. + suite.addTestSuite( MavenIT0020Test.class ); // suite.addTestSuite(MavenIT0091Test.class); // suite.addTestSuite(MavenIT0106Test.class);
svn commit: r641419 - /maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Author: brianf Date: Wed Mar 26 10:25:26 2008 New Revision: 641419 URL: http://svn.apache.org/viewvc?rev=641419view=rev Log: use beta-2 of the assembly plugin Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=641419r1=641418r2=641419view=diff == --- maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml (original) +++ maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Wed Mar 26 10:25:26 2008 @@ -75,7 +75,7 @@ /plugin plugin artifactIdmaven-assembly-plugin/artifactId - version2.2-beta-1/version + version2.2-beta-2/version /plugin plugin artifactIdmaven-clean-plugin/artifactId
svn commit: r641422 - /maven/components/branches/maven-2.0.x/pom.xml
Author: brianf Date: Wed Mar 26 10:31:21 2008 New Revision: 641422 URL: http://svn.apache.org/viewvc?rev=641422view=rev Log: enable auto versioning for the core tree. Modified: maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=641422r1=641421r2=641422view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Wed Mar 26 10:31:21 2008 @@ -180,6 +180,7 @@ version2.0-beta-7/version configuration tagBasehttps://svn.apache.org/repos/asf/maven/components/tags/tagBase +autoVersionSubmodulestrue/autoVersionSubmodules /configuration /plugin plugin
svn commit: r641441 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Wed Mar 26 10:58:07 2008 New Revision: 641441 URL: http://svn.apache.org/viewvc?rev=641441view=rev Log: [maven-release-plugin] prepare release maven-2.0.9-RC3 Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=641441r1=641440r2=641441view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Wed Mar 26 10:58:07 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.9-RC3/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=641441r1=641440r2=641441view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Wed Mar 26 10:58:07 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.9-RC3/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=641441r1=641440r2=641441view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Wed Mar 26 10:58:07 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.9-RC3/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=641441r1=641440r2=641441view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Wed Mar 26 10:58:07 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.9-RC3/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=641441r1=641440r2=641441view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x
svn commit: r641442 - in /maven/components/tags/maven-2.0.9-RC3: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Wed Mar 26 10:59:34 2008 New Revision: 641442 URL: http://svn.apache.org/viewvc?rev=641442view=rev Log: [maven-release-plugin] copy for tag maven-2.0.9-RC3 Added: maven/components/tags/maven-2.0.9-RC3/ - copied from r641435, maven/components/branches/maven-2.0.x/ maven/components/tags/maven-2.0.9-RC3/apache-maven/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-artifact-manager/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-artifact-test/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-artifact/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-core/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-error-diagnostics/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-model/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-monitor/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-plugin-api/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-plugin-descriptor/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-plugin-registry/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-profile/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-project/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-reporting/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-repository-metadata/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-script/maven-script-ant/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-script/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-settings/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/tags/maven-2.0.9-RC3/maven-toolchain/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/tags/maven-2.0.9-RC3/pom.xml - copied unchanged from r641441, maven/components/branches/maven-2.0.x/pom.xml
svn commit: r641444 - in /maven/components/branches/maven-2.0.x: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-m
Author: brianf Date: Wed Mar 26 11:00:36 2008 New Revision: 641444 URL: http://svn.apache.org/viewvc?rev=641444view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/maven-toolchain/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/apache-maven/pom.xml?rev=641444r1=641443r2=641444view=diff == --- maven/components/branches/maven-2.0.x/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.x/apache-maven/pom.xml Wed Mar 26 11:00:36 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC3/version +version2.0.9-RC4-SNAPSHOT/version /parent artifactIdapache-maven/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=641444r1=641443r2=641444view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Wed Mar 26 11:00:36 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC3/version +version2.0.9-RC4-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=641444r1=641443r2=641444view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Wed Mar 26 11:00:36 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC3/version +version2.0.9-RC4-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=641444r1=641443r2=641444view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Wed Mar 26 11:00:36 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-RC3/version +version2.0.9-RC4-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=641444r1=641443r2=641444view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components
svn commit: r641513 - /maven/components/branches/maven-2.0.x/pom.xml
Author: brianf Date: Wed Mar 26 12:46:15 2008 New Revision: 641513 URL: http://svn.apache.org/viewvc?rev=641513view=rev Log: (empty) Modified: maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=641513r1=641512r2=641513view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Wed Mar 26 12:46:15 2008 @@ -242,7 +242,7 @@ /dependencies properties -mavenVersion2.0.9-RC3/mavenVersion +mavenVersion2.0.9-RC4-SNAPSHOT/mavenVersion !-- Can't use. bootstrap-mini isn't smart enough: wagonVersion1.0-beta-2/wagonVersion -- /properties
svn commit: r641515 - /maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml
Author: brianf Date: Wed Mar 26 12:47:13 2008 New Revision: 641515 URL: http://svn.apache.org/viewvc?rev=641515view=rev Log: (empty) Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml?rev=641515r1=641514r2=641515view=diff == --- maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core-it-runner/pom.xml Wed Mar 26 12:47:13 2008 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.9-RC4-SNAPSHOT/version /parent artifactIdmaven-core-it-runner/artifactId nameIntegration Test Executor/name
svn commit: r641650 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Author: brianf Date: Wed Mar 26 17:10:27 2008 New Revision: 641650 URL: http://svn.apache.org/viewvc?rev=641650view=rev Log: works better if i actually comment it out Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=641650r1=641649r2=641650view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Wed Mar 26 17:10:27 2008 @@ -222,7 +222,7 @@ //suite.addTestSuite( MavenIT0018Test.class ); //this test is flakey on windows and isn't a test of the core. - suite.addTestSuite( MavenIT0020Test.class ); +// suite.addTestSuite( MavenIT0020Test.class ); // suite.addTestSuite(MavenIT0091Test.class); // suite.addTestSuite(MavenIT0106Test.class);
svn commit: r641699 - /maven/components/trunk/maven-embedder/src/bin/mvnDebug
Author: brianf Date: Wed Mar 26 20:07:26 2008 New Revision: 641699 URL: http://svn.apache.org/viewvc?rev=641699view=rev Log: MNG-3484: patch from James William Dumay to quote MAVEN_OPTS Modified: maven/components/trunk/maven-embedder/src/bin/mvnDebug Modified: maven/components/trunk/maven-embedder/src/bin/mvnDebug URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/bin/mvnDebug?rev=641699r1=641698r2=641699view=diff == --- maven/components/trunk/maven-embedder/src/bin/mvnDebug (original) +++ maven/components/trunk/maven-embedder/src/bin/mvnDebug Wed Mar 26 20:07:26 2008 @@ -33,7 +33,7 @@ # set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 # -INT_MAVEN_OPTS=$MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +INT_MAVEN_OPTS=$MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 echo Preparing to Execute Maven in Debug Mode
svn commit: r641701 - in /maven/components/branches/maven-2.0.x: maven-core/src/main/java/org/apache/maven/plugin/ maven-project/src/main/java/org/apache/maven/project/ maven-project/src/test/java/org
Author: brianf Date: Wed Mar 26 20:21:55 2008 New Revision: 641701 URL: http://svn.apache.org/viewvc?rev=641701view=rev Log: MNG-3119: reverting the jira due to issues with forked lifecycles Removed: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/DefaultMavenProjectHelperTest.java Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=641701r1=641700r2=641701view=diff == --- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original) +++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Wed Mar 26 20:21:55 2008 @@ -20,6 +20,20 @@ * under the License. */ +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.maven.MavenArtifactFilterManager; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.factory.ArtifactFactory; @@ -52,7 +66,6 @@ import org.apache.maven.plugin.version.PluginVersionManager; import org.apache.maven.plugin.version.PluginVersionNotFoundException; import org.apache.maven.plugin.version.PluginVersionResolutionException; -import org.apache.maven.project.DuplicateArtifactAttachmentException; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; @@ -83,20 +96,6 @@ import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.Xpp3Dom; -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - public class DefaultPluginManager extends AbstractLogEnabled implements PluginManager, Initializable, Contextualizable @@ -453,12 +452,6 @@ dispatcher.dispatchEnd( event, goalExecId ); } -catch ( DuplicateArtifactAttachmentException e ) -{ -session.getEventDispatcher().dispatchError( event, goalExecId, e ); - -throw new MojoExecutionException( Error attaching artifact to project: Duplicate attachment., e ); -} catch ( MojoExecutionException e ) { session.getEventDispatcher().dispatchError( event, goalExecId, e ); @@ -1415,7 +1408,7 @@ { project.setDependencyArtifacts( project.createArtifacts( artifactFactory, null, null ) ); } - + Set resolvedArtifacts; try { @@ -1430,7 +1423,7 @@ catch (MultipleArtifactsNotFoundException me) { /*only do this if we are an aggregating plugin: MNG-2277 -if the dependency doesn't yet exist but is in the reactor, then +if the dependency doesn't yet exist but is in the reactor, then all we can do is warn and skip it. A better fix can be inserted into 2.1*/ if (isAggregator checkMissingArtifactsInReactor( context.getSortedProjects(), me.getMissingArtifacts() )) { @@ -1473,19 +1466,19 @@ //most likely it would be produced by the project we just found in the reactor since all //the other info matches. Assume it's ok. getLogger().warn( The dependency: + p.getId()+ can't be resolved but has been found in the reactor.\nThis dependency has been excluded from the plugin execution. You should rerun this mojo after executing mvn install.\n ); - + //found it, move on. foundInReactor.add( p ); break
svn commit: r641121 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test: java/org/apache/maven/integrationtests/ resources/MNG-2289/ resources/MNG-3426/ resources/mng2289-useNew
Author: brianf Date: Tue Mar 25 19:44:42 2008 New Revision: 641121 URL: http://svn.apache.org/viewvc?rev=641121view=rev Log: rename it folder to match others Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2289-useNewParentSnapshots/ - copied from r639717, maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2289-useNewParentSnapshots/issue/ - copied from r639745, maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/issue/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2289-useNewParentSnapshots/parent/ - copied from r639745, maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/parent/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2289-useNewParentSnapshots/test.sh - copied unchanged from r639745, maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/test.sh maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3426-overridingPluginDependency/ - copied from r639717, maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-3426/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3426-overridingPluginDependency/pom.xml - copied unchanged from r639745, maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-3426/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3426-overridingPluginDependency/readme.txt - copied unchanged from r639745, maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-3426/readme.txt maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3426-overridingPluginDependency/src/ - copied from r639745, maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-3426/src/ Removed: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-2289/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-3426/ Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java?rev=641121r1=641120r2=641121view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java Tue Mar 25 19:44:42 2008 @@ -49,7 +49,7 @@ // The testdir is computed from the location of this // file. -File testDir = ResourceExtractor.simpleExtractResources( getClass(), /MNG-3426 ); +File testDir = ResourceExtractor.simpleExtractResources( getClass(), /mng3426-overridingPluginDependency ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); List cliOptions = new ArrayList();
svn commit: r641122 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test/resources: it0012/child-project/pom.xml it0012/pom.xml it0080/test-component-b/pom.xml it0080/test-compon
Author: brianf Date: Tue Mar 25 19:45:09 2008 New Revision: 641122 URL: http://svn.apache.org/viewvc?rev=641122view=rev Log: fixing the deprecated property syntax Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0012/child-project/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0012/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0080/test-component-b/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0080/test-component-c/pom.xml Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0012/child-project/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0012/child-project/pom.xml?rev=641122r1=641121r2=641122view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0012/child-project/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0012/child-project/pom.xml Tue Mar 25 19:45:09 2008 @@ -12,7 +12,7 @@ version2.1-SNAPSHOT/version configuration outputDirectory${basedir}/target//outputDirectory - pluginFilechild-touch-${version}.txt/pluginFile + pluginFilechild-touch-${project.version}.txt/pluginFile /configuration /plugin /plugins Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0012/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0012/pom.xml?rev=641122r1=641121r2=641122view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0012/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0012/pom.xml Tue Mar 25 19:45:09 2008 @@ -13,7 +13,7 @@ groupIdorg.apache.maven.its.plugins/groupId version2.1-SNAPSHOT/version configuration - pluginFiletouch-${version}.txt/pluginFile + pluginFiletouch-${project.version}.txt/pluginFile /configuration /plugin /plugins Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0080/test-component-b/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0080/test-component-b/pom.xml?rev=641122r1=641121r2=641122view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0080/test-component-b/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0080/test-component-b/pom.xml Tue Mar 25 19:45:09 2008 @@ -11,7 +11,7 @@ packagingwar/packaging dependencies dependency - groupId${groupId}/groupId + groupId${project.groupId}/groupId artifactIdtest-component-a/artifactId version0.1/version /dependency Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0080/test-component-c/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0080/test-component-c/pom.xml?rev=641122r1=641121r2=641122view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0080/test-component-c/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0080/test-component-c/pom.xml Tue Mar 25 19:45:09 2008 @@ -11,7 +11,7 @@ packagingear/packaging dependencies dependency - groupId${groupId}/groupId + groupId${project.groupId}/groupId artifactIdtest-component-b/artifactId version0.1/version typewar/type
svn commit: r641123 - /maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml
Author: brianf Date: Tue Mar 25 19:48:49 2008 New Revision: 641123 URL: http://svn.apache.org/viewvc?rev=641123view=rev Log: (empty) Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml?rev=641123r1=641122r2=641123view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/pom.xml Tue Mar 25 19:48:49 2008 @@ -27,7 +27,7 @@ plugins plugin artifactIdmaven-plugin-plugin/artifactId - !--only fails with 2.4, not 2.3 or 2.5-- + !--only fails with 2.4, not 2.3 or 2.4.1-- /plugin /plugins /reporting
svn commit: r641126 - /maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml
Author: brianf Date: Tue Mar 25 20:00:32 2008 New Revision: 641126 URL: http://svn.apache.org/viewvc?rev=641126view=rev Log: using the corrected plugin tools Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml?rev=641126r1=641125r2=641126view=diff == --- maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml (original) +++ maven/components/branches/maven-2.0.x/maven-project/src/main/resources/org/apache/maven/project/pom-4.0.0.xml Tue Mar 25 20:00:32 2008 @@ -115,7 +115,7 @@ /plugin plugin artifactIdmaven-plugin-plugin/artifactId - version2.3/version + version2.4.1/version /plugin plugin artifactIdmaven-rar-plugin/artifactId
svn commit: r640508 - /maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml
Author: brianf Date: Mon Mar 24 11:39:13 2008 New Revision: 640508 URL: http://svn.apache.org/viewvc?rev=640508view=rev Log: revert release to fix group id Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml?rev=640508r1=640507r2=640508view=diff == --- maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml (original) +++ maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml Mon Mar 24 11:39:13 2008 @@ -7,7 +7,7 @@ modelVersion4.0.0/modelVersion artifactIdmaven-reporting-impl/artifactId nameMaven Reporting Implementation/name - version2.0.4.2-SNAPSHOT/version + version2.0.4.1-SNAPSHOT/version developers developer
svn commit: r640509 - /maven/shared/tags/maven-reporting-impl-2.0.4.1/
Author: brianf Date: Mon Mar 24 11:40:13 2008 New Revision: 640509 URL: http://svn.apache.org/viewvc?rev=640509view=rev Log: Removed file/folder Removed: maven/shared/tags/maven-reporting-impl-2.0.4.1/
svn commit: r640512 - /maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml
Author: brianf Date: Mon Mar 24 11:42:55 2008 New Revision: 640512 URL: http://svn.apache.org/viewvc?rev=640512view=rev Log: fixing the groupId Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml?rev=640512r1=640511r2=640512view=diff == --- maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml (original) +++ maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml Mon Mar 24 11:42:55 2008 @@ -6,6 +6,7 @@ /parent modelVersion4.0.0/modelVersion artifactIdmaven-reporting-impl/artifactId + groupIdorg.apache.maven.reporting/groupId nameMaven Reporting Implementation/name version2.0.4.1-SNAPSHOT/version
svn commit: r640513 - /maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml
Author: brianf Date: Mon Mar 24 11:44:17 2008 New Revision: 640513 URL: http://svn.apache.org/viewvc?rev=640513view=rev Log: [maven-release-plugin] prepare release maven-reporting-impl-2.0.4.1 Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml?rev=640513r1=640512r2=640513view=diff == --- maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml (original) +++ maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml Mon Mar 24 11:44:17 2008 @@ -8,7 +8,7 @@ artifactIdmaven-reporting-impl/artifactId groupIdorg.apache.maven.reporting/groupId nameMaven Reporting Implementation/name - version2.0.4.1-SNAPSHOT/version + version2.0.4.1/version developers developer @@ -55,9 +55,9 @@ /dependencies scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-reporting-impl-2.0.4.1/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-reporting-impl-2.0.4.1/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/tags/maven-reporting-impl-2.0.4.1/url /scm /project
svn commit: r640514 - in /maven/shared/tags/maven-reporting-impl-2.0.4.1: ./ pom.xml
Author: brianf Date: Mon Mar 24 11:44:29 2008 New Revision: 640514 URL: http://svn.apache.org/viewvc?rev=640514view=rev Log: [maven-release-plugin] copy for tag maven-reporting-impl-2.0.4.1 Added: maven/shared/tags/maven-reporting-impl-2.0.4.1/ - copied from r640131, maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/ maven/shared/tags/maven-reporting-impl-2.0.4.1/pom.xml - copied unchanged from r640513, maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml
svn commit: r640515 - /maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml
Author: brianf Date: Mon Mar 24 11:44:36 2008 New Revision: 640515 URL: http://svn.apache.org/viewvc?rev=640515view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml Modified: maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml?rev=640515r1=640514r2=640515view=diff == --- maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml (original) +++ maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/pom.xml Mon Mar 24 11:44:36 2008 @@ -8,7 +8,7 @@ artifactIdmaven-reporting-impl/artifactId groupIdorg.apache.maven.reporting/groupId nameMaven Reporting Implementation/name - version2.0.4.1/version + version2.0.4.2-SNAPSHOT/version developers developer @@ -55,9 +55,9 @@ /dependencies scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/maven-reporting-impl-2.0.4.1/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/maven-reporting-impl-2.0.4.1/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/tags/maven-reporting-impl-2.0.4.1/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/branches/maven-reporting-impl-2.0.4.1-dev/url /scm /project