You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2011/11/26 20:14:55 UTC
svn commit: r1206547 -
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
Author: simonetripodi
Date: Sat Nov 26 19:14:55 2011
New Revision: 1206547
URL: http://svn.apache.org/viewvc?rev=1206547&view=rev
Log:
exclude the packaging from Maven dependency if the type is jar, since it is implicit
Thanks to Robert Scholte
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java?rev=1206547&r1=1206546&r2=1206547&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java Sat Nov 26 19:14:55 2011
@@ -21,6 +21,8 @@ public final class DependencyInformation
private static final String DEPENDENCY_INFO = "dependency-info";
+ private static final String JAR_PACKAGING = "jar";
+
/**
* @parameter default-value="${project.groupId}"
* @required
@@ -121,13 +123,18 @@ public final class DependencyInformation
{
startSection( getTitle() );
- renderDependencyInfo( "Apache Maven", new Formatter()
- .format( "<dependency>%n" )
- .format( " <groupId>%s</groupId>%n", groupId )
- .format( " <artifactId>%s</artifactId>%n", artifactId )
- .format( " <version>%s</version>%n", version )
- .format( " <packaging>%s</packaging>%n", packaging )
- .format( "</dependency>" ) );
+ Formatter mavenDependency = new Formatter()
+ .format( "<dependency>%n" )
+ .format( " <groupId>%s</groupId>%n", groupId )
+ .format( " <artifactId>%s</artifactId>%n", artifactId )
+ .format( " <version>%s</version>%n", version );
+
+ if ( !JAR_PACKAGING.equals( packaging ) )
+ {
+ mavenDependency = mavenDependency.format( " <packaging>%s</packaging>%n", packaging );
+ }
+
+ renderDependencyInfo( "Apache Maven", mavenDependency.format( "</dependency>" ) );
renderDependencyInfo( "Apache Buildr", new Formatter().format( "'%s:%s:%s:%s'",
groupId, artifactId, packaging, version ) );