You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/05/01 00:35:04 UTC
svn commit: r1098179 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src:
it/full-pom/pom.xml it/full-pom/verify.bsh
main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
Author: hboutemy
Date: Sat Apr 30 22:35:04 2011
New Revision: 1098179
URL: http://svn.apache.org/viewvc?rev=1098179&view=rev
Log:
[MPIR-223] fixed file name corruption caused by dependencies report when artifacts with classifiers are used
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/pom.xml
maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/verify.bsh
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/pom.xml?rev=1098179&r1=1098178&r2=1098179&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/pom.xml Sat Apr 30 22:35:04 2011
@@ -143,6 +143,18 @@
<artifactId>maven-artifact</artifactId>
<version>2.1.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>1.2</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -166,6 +178,7 @@
<version>@pom.version@</version>
<configuration>
<introduction>mail list intro text foo</introduction>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/verify.bsh?rev=1098179&r1=1098178&r2=1098179&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/verify.bsh (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/it/full-pom/verify.bsh Sat Apr 30 22:35:04 2011
@@ -55,15 +55,20 @@ try
}
File maillist = new File( siteDir, "mail-lists.html");
- FileInputStream fis = new FileInputStream ( maillist );
- String downloadContent = IOUtil.toString ( fis, "UTF-8" );
- int indexOf = downloadContent.indexOf( "mail list intro text foo" );
- if ( indexOf < 0)
+ String content = FileUtils.fileRead( maillist, "UTF-8" );
+ if ( !content.contains( "mail list intro text foo" ) )
{
System.err.println( "mail-lists.html doesn't contain mail list intro text foo" );
return false;
}
+ File dependencies = new File( siteDir, "dependencies.html");
+ content = FileUtils.fileRead( dependencies, "UTF-8" );
+ if ( !content.contains( "doxia-core-1.2.jar" ) )
+ {
+ System.err.println( "dependencies.html doesn't contain doxia-core-1.2.jar" );
+ return false;
+ }
}
catch( Throwable t )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java?rev=1098179&r1=1098178&r2=1098179&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java Sat Apr 30 22:35:04 2011
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.dependency.tree.DependencyNode;
import org.apache.maven.shared.jar.JarAnalyzer;
@@ -83,17 +82,11 @@ public class Dependencies
* @param dependencyTreeNode the DependencyNode.
* @param classesAnalyzer the JarClassesAnalysis.
*/
- public Dependencies( MavenProject project, DependencyNode dependencyTreeNode,
- JarClassesAnalysis classesAnalyzer )
+ public Dependencies( MavenProject project, DependencyNode dependencyTreeNode, JarClassesAnalysis classesAnalyzer )
{
this.project = project;
this.dependencyTreeNode = dependencyTreeNode;
this.classesAnalyzer = classesAnalyzer;
-
- /*
- * Workaround to ensure proper File objects in the Artifacts from the ReportResolutionListener
- */
- mapArtifactFiles( this.dependencyTreeNode );
}
/**
@@ -289,30 +282,6 @@ public class Dependencies
// Private methods
// ----------------------------------------------------------------------
- private void mapArtifactFiles( DependencyNode node )
- {
- @SuppressWarnings( "unchecked" )
- List<DependencyNode> childs = node.getChildren();
- if ( ( childs == null ) || childs.isEmpty() )
- {
- return;
- }
-
- Iterator<DependencyNode> it = childs.iterator();
- while ( it.hasNext() )
- {
- DependencyNode anode = it.next();
- String key = ArtifactUtils.versionlessKey( anode.getArtifact() );
- Artifact projartifact = (Artifact) project.getArtifactMap().get( key );
- if ( projartifact != null )
- {
- anode.getArtifact().setFile( projartifact.getFile() );
- }
-
- mapArtifactFiles( anode );
- }
- }
-
/**
* Recursive method to get all dependencies from a given <code>dependencyNode</code>
*