You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/05/18 18:51:09 UTC
svn commit: r1744444 -
/maven/plugins/branches/maven-javadoc-plugin_jigsaw-ea/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Author: rfscholte
Date: Wed May 18 18:51:09 2016
New Revision: 1744444
URL: http://svn.apache.org/viewvc?rev=1744444&view=rev
Log:
Refactor code
Modified:
maven/plugins/branches/maven-javadoc-plugin_jigsaw-ea/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/branches/maven-javadoc-plugin_jigsaw-ea/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-javadoc-plugin_jigsaw-ea/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1744444&r1=1744443&r2=1744444&view=diff
==============================================================================
--- maven/plugins/branches/maven-javadoc-plugin_jigsaw-ea/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/branches/maven-javadoc-plugin_jigsaw-ea/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Wed May 18 18:51:09 2016
@@ -2536,7 +2536,33 @@ public abstract class AbstractJavadocMoj
populateCompileArtifactMap( compileArtifactMap, getProjectArtifacts( project ) );
- if ( isAggregator() && project.isExecutionRoot() )
+ if ( isAggregator() && project.isExecutionRoot() )
+ {
+ getAggregatorClasspath( classpathElements, compileArtifactMap );
+ }
+
+ for ( Artifact a : compileArtifactMap.values() )
+ {
+ classpathElements.add( a.getFile().getPath() );
+ }
+
+ if ( additionalDependencies != null )
+ {
+ for ( Dependency dependency : additionalDependencies )
+ {
+ Artifact artifact = resolveDependency( dependency );
+ String path = artifact.getFile().getPath();
+ getLog().debug( "add additional artifact with path " + path );
+ classpathElements.add( path );
+ }
+ }
+
+ return StringUtils.join( classpathElements.iterator(), File.pathSeparator );
+ }
+
+ private void getAggregatorClasspath( List<String> classpathElements, Map<String, Artifact> compileArtifactMap )
+ throws MavenReportException
+ {
{
List<Artifact> reactorArtifacts = new ArrayList<Artifact>();
for ( MavenProject p : reactorProjects )
@@ -2603,7 +2629,7 @@ public abstract class AbstractJavadocMoj
sb.append( subProject.getVersion() ).append( '\n' );
for ( Artifact a : compileArtifactMap.values() )
{
- sb.append( a.getFile() ).append( '\n' );
+ sb.append( a.getFile().getPath() ).append( '\n' );
}
getLog().debug( sb.toString() );
@@ -2617,24 +2643,6 @@ public abstract class AbstractJavadocMoj
throw new MavenReportException( e.getMessage(), e );
}
}
-
- for ( Artifact a : compileArtifactMap.values() )
- {
- classpathElements.add( a.getFile().toString() );
- }
-
- if ( additionalDependencies != null )
- {
- for ( Dependency dependency : additionalDependencies )
- {
- Artifact artifact = resolveDependency( dependency );
- String path = artifact.getFile().toString();
- getLog().debug( "add additional artifact with path " + path );
- classpathElements.add( path );
- }
- }
-
- return StringUtils.join( classpathElements.iterator(), File.pathSeparator );
}
/**