You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/11/23 21:51:52 UTC
svn commit: r720039 - in /maven/components/branches/maven-2.0.x: ./
maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven-core/src/main/resources/META-INF/plexus/components.xml
Author: bentmann
Date: Sun Nov 23 12:51:51 2008
New Revision: 720039
URL: http://svn.apache.org/viewvc?rev=720039&view=rev
Log:
[MNG-3787] Add plugin version to default reports
o Merged r720038 from maven-2.1.x
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/maven-2.0.x/maven-core/src/main/resources/META-INF/plexus/components.xml
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 23 12:51:51 2008
@@ -1 +1,3 @@
/maven/components/branches/maven-2.0.x:533160,636838,645583,645642,647357,649903,657432,659677,662033,662251,669665,670358,673499,673905,674059,675074,675087,675096,675375,675380,680604,682055
+/maven/components/branches/maven-2.1.x:720038
+/maven/components/trunk:720001
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=720039&r1=720038&r2=720039&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Sun Nov 23 12:51:51 2008
@@ -616,14 +616,16 @@
String report = (String) i.next();
StringTokenizer tok = new StringTokenizer( report, ":" );
- if ( tok.countTokens() != 2 )
+ int count = tok.countTokens();
+ if ( count != 2 && count != 3 )
{
- getLogger().warn( "Invalid default report ignored: '" + report + "' (must be groupId:artifactId)" );
+ getLogger().warn( "Invalid default report ignored: '" + report + "' (must be groupId:artifactId[:version])" );
}
else
{
String groupId = tok.nextToken();
String artifactId = tok.nextToken();
+ String version = tok.hasMoreTokens() ? tok.nextToken() : null;
boolean found = false;
for ( Iterator j = reportPlugins.iterator(); j.hasNext() && !found; )
@@ -641,6 +643,7 @@
ReportPlugin reportPlugin = new ReportPlugin();
reportPlugin.setGroupId( groupId );
reportPlugin.setArtifactId( artifactId );
+ reportPlugin.setVersion( version );
reportPlugins.add( reportPlugin );
}
}
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=720039&r1=720038&r2=720039&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/resources/META-INF/plexus/components.xml Sun Nov 23 12:51:51 2008
@@ -283,7 +283,7 @@
</lifecycles>
<!-- START SNIPPET: default-reports -->
<defaultReports>
- <report>org.apache.maven.plugins:maven-project-info-reports-plugin</report>
+ <report>org.apache.maven.plugins:maven-project-info-reports-plugin:2.1</report>
<!-- TODO: currently in mojo - should they be defaults any more?
<report>org.apache.maven.plugins:maven-checkstyle-plugin</report>
<report>org.apache.maven.plugins:maven-javadoc-plugin</report>