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 2017/12/02 11:22:47 UTC
svn commit: r1816941 - in /maven/plugins/trunk/maven-javadoc-plugin/src:
main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
Author: rfscholte
Date: Sat Dec 2 11:22:47 2017
New Revision: 1816941
URL: http://svn.apache.org/viewvc?rev=1816941&view=rev
Log:
session is required parameter, so cannot be null. Fix related unittests
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java?rev=1816941&r1=1816940&r2=1816941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java Sat Dec 2 11:22:47 2017
@@ -2620,43 +2620,40 @@ public abstract class AbstractJavadocMoj
{
classpathElements.addAll( getProjectBuildOutputDirs( subProject ) );
- if ( session != null )
+ try
{
- try
- {
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder();
- sb.append( "Compiled artifacts for " );
- sb.append( subProject.getGroupId() ).append( ":" );
- sb.append( subProject.getArtifactId() ).append( ":" );
- sb.append( subProject.getVersion() ).append( '\n' );
+ sb.append( "Compiled artifacts for " );
+ sb.append( subProject.getGroupId() ).append( ":" );
+ sb.append( subProject.getArtifactId() ).append( ":" );
+ sb.append( subProject.getVersion() ).append( '\n' );
- ProjectBuildingRequest buildingRequest = session.getProjectBuildingRequest();
- buildingRequest =
- buildingRequest.setRemoteRepositories( subProject.getRemoteArtifactRepositories() );
-
- for ( ArtifactResult artifactResult
- : dependencyResolver.resolveDependencies( buildingRequest,
- subProject.getDependencies(),
- null,
- dependencyFilter ) )
- {
- populateCompileArtifactMap( compileArtifactMap,
- Collections.singletonList( artifactResult.getArtifact() ) );
-
- sb.append( artifactResult.getArtifact().getFile() ).append( '\n' );
- }
+ ProjectBuildingRequest buildingRequest = session.getProjectBuildingRequest();
+ buildingRequest =
+ buildingRequest.setRemoteRepositories( subProject.getRemoteArtifactRepositories() );
+
+ for ( ArtifactResult artifactResult
+ : dependencyResolver.resolveDependencies( buildingRequest,
+ subProject.getDependencies(),
+ null,
+ dependencyFilter ) )
+ {
+ populateCompileArtifactMap( compileArtifactMap,
+ Collections.singletonList( artifactResult.getArtifact() ) );
- if ( getLog().isDebugEnabled() )
- {
- getLog().debug( sb.toString() );
- }
-
+ sb.append( artifactResult.getArtifact().getFile() ).append( '\n' );
}
- catch ( DependencyResolverException e )
+
+ if ( getLog().isDebugEnabled() )
{
- throw new MavenReportException( e.getMessage(), e );
+ getLog().debug( sb.toString() );
}
+
+ }
+ catch ( DependencyResolverException e )
+ {
+ throw new MavenReportException( e.getMessage(), e );
}
}
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java?rev=1816941&r1=1816940&r2=1816941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java Sat Dec 2 11:22:47 2017
@@ -25,11 +25,14 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.List;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.plugins.javadoc.JavadocReport;
+import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.codehaus.plexus.util.FileUtils;
+import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
+import org.sonatype.aether.util.DefaultRepositorySystemSession;
public class AggregatorJavadocReportTest
extends AbstractMojoTestCase
@@ -63,8 +66,12 @@ public class AggregatorJavadocReportTest
JavadocReport mojo = (JavadocReport) lookupMojo( "aggregate", testPom );
MojoExecution mojoExec = new MojoExecution( new Plugin(), "aggregate", null );
-
setVariableValueToObject( mojo, "mojo", mojoExec );
+
+ MavenSession session = newMavenSession( new MavenProjectStub() );
+ DefaultRepositorySystemSession repoSysSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+ repoSysSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepo ) );
+ setVariableValueToObject( mojo, "session", session );
return mojo;
}