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 2017/12/20 09:16:35 UTC
[maven-javadoc-plugin] 04/13: session is required parameter,
so cannot be null. Fix related unittests
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master2
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 6719499a314c72bf43cc8f6277720e553173a08e
Author: Robert Scholte <rf...@apache.org>
AuthorDate: Sat Dec 2 11:22:47 2017 +0000
session is required parameter, so cannot be null. Fix related unittests
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1816941 13f79535-47bb-0310-9956-ffa450edef68
---
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 59 ++++++++++------------
.../javadoc/AggregatorJavadocReportTest.java | 11 +++-
2 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 171736e..a2562a9 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -2620,43 +2620,40 @@ public abstract class AbstractJavadocMojo
{
classpathElements.addAll( getProjectBuildOutputDirs( subProject ) );
- if ( session != null )
+ try
{
- try
+ 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' );
+
+ ProjectBuildingRequest buildingRequest = session.getProjectBuildingRequest();
+ buildingRequest =
+ buildingRequest.setRemoteRepositories( subProject.getRemoteArtifactRepositories() );
+
+ for ( ArtifactResult artifactResult
+ : dependencyResolver.resolveDependencies( buildingRequest,
+ subProject.getDependencies(),
+ null,
+ dependencyFilter ) )
{
- 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' );
-
- 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' );
- }
+ 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 );
}
}
}
diff --git a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
index e54bf63..bc94fcd 100644
--- a/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/javadoc/AggregatorJavadocReportTest.java
@@ -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;
}
--
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.