You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/12/05 22:48:05 UTC

[maven-project-info-reports-plugin] 01/02: Use site.xml

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch use-site.xml
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git

commit eade14422d4cad420e083013b57ef62c3da95bfd
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Dec 5 22:45:11 2022 +0100

    Use site.xml
---
 pom.xml                                                           | 2 +-
 .../maven/report/projectinfo/AbstractProjectInfoReport.java       | 8 --------
 .../maven/report/projectinfo/AbstractProjectInfoTestCase.java     | 3 +++
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d41e5b..e98c8ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>4.0.0-M3</version>
+      <version>4.0.0-M4-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.maven</groupId>
diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
index 8fb5027..7f53e52 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
@@ -102,14 +102,6 @@ public abstract class AbstractProjectInfoReport
     @Parameter( property = "project.pluginArtifactRepositories" )
     protected List<ArtifactRepository> pluginRepositories;
 
-    /**
-     * The reactor projects.
-     *
-     * @since 2.10
-     */
-    @Parameter( defaultValue = "${reactorProjects}", required = true, readonly = true )
-    protected List<MavenProject> reactorProjects;
-
     /**
      * The current user system settings for use in Maven.
      *
diff --git a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
index fdf8f13..a4ca918 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
@@ -21,6 +21,7 @@ package org.apache.maven.report.projectinfo;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
 
 import org.apache.maven.doxia.tools.SiteTool;
 import org.apache.maven.plugin.LegacySupport;
@@ -184,8 +185,10 @@ public abstract class AbstractProjectInfoTestCase
         repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, new LocalRepository( artifactStubFactory.getWorkingDir() ) ) );
 
         setVariableValueToObject( mojo, "session", legacySupport.getSession() );
+        setVariableValueToObject( mojo, "reactorProjects", Collections.emptyList() );
         setVariableValueToObject( mojo, "remoteRepositories", mojo.getProject().getRemoteArtifactRepositories() );
         setVariableValueToObject( mojo, "pluginRepositories", mojo.getProject().getPluginArtifactRepositories() );
+        setVariableValueToObject( mojo, "siteDirectory", new File( mojo.getProject().getBasedir(), "src/site" ) );
         return mojo;
     }