mojohaus#637: Refactoring report renderers

andrzejj0 · Oct 6, 2022 · 0a7e259 · 0a7e259
1 parent 720ff9e
commit 0a7e259
Show file tree

Hide file tree

Showing 44 changed files with 2,212 additions and 1,742 deletions.
diff --git a/pom.xml b/pom.xml
@@ -417,14 +417,16 @@
         </reportSets>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>versions-maven-plugin</artifactId>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>${project.artifactId}</artifactId>
+        <version>${project.version}</version>
         <reportSets>
           <reportSet>
             <reports>
               <report>dependency-updates-report</report>
               <report>plugin-updates-report</report>
               <report>property-updates-report</report>
+              <report>parent-updates-report</report>
             </reports>
           </reportSet>
         </reportSets>

diff --git a/src/it/it-abstract-versions-report-001/verify.groovy b/src/it/it-abstract-versions-report-001/verify.groovy
@@ -1,15 +1,17 @@
-dependencyUpdatesReport = new File( basedir, "target/site/dependency-updates-report.html" )
-
-assert dependencyUpdatesReport.exists(  )
+dependencyUpdatesReport = new File( basedir, "target/site/dependency-updates-report.html" ).text
+        .replaceAll( '<[^>]+>', ' ' )
+        .replaceAll( '&[^;]+;', ' ' )
+        .replaceAll( '\\s+', ' ' )
 
 // some basic (=not comprehensive) checks on the contents of the dependency report
-assert dependencyUpdatesReport.text =~ /\b1\.1\.0-2\b/  // current version of the dependency
-assert dependencyUpdatesReport.text =~ /\b3\.0\b/       // latest major available version
-
-pluginUpdatesReport = new File( basedir, "target/site/plugin-updates-report.html" )
+assert dependencyUpdatesReport =~ /\b1\.1\.0-2\b/  // current version of the dependency
+assert dependencyUpdatesReport =~ /\b3\.0\b/       // latest major available version
 
-assert pluginUpdatesReport.exists(  )
+pluginUpdatesReport = new File( basedir, "target/site/plugin-updates-report.html" ).text
+        .replaceAll( '<[^>]+>', ' ' )
+        .replaceAll( '&[^;]+;', ' ' )
+        .replaceAll( '\\s+', ' ' )
 
 // some basic (=not comprehensive) checks on the contents of the plugin report
-assert pluginUpdatesReport.text =~ /\b1\.0\b/        // current version of the plugin
-assert pluginUpdatesReport.text =~ /\b3\.1\b/        // latest major available version
+assert pluginUpdatesReport =~ /\b1\.0\b/        // current version of the plugin
+assert pluginUpdatesReport =~ /\b3\.1\b/        // latest major available version
diff --git a/src/it/it-parent-updates-report-001/invoker.properties b/src/it/it-parent-updates-report-001/invoker.properties
@@ -1 +1 @@
-invoker.goals=site
+invoker.goals = site
diff --git a/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java b/src/main/java/org/codehaus/mojo/versions/AbstractVersionsReport.java
@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import javax.inject.Inject;
-
 import java.io.File;
 import java.util.List;
 import java.util.Locale;
@@ -49,15 +47,17 @@
 import org.codehaus.mojo.versions.api.DefaultVersionsHelper;
 import org.codehaus.mojo.versions.api.VersionsHelper;
 import org.codehaus.mojo.versions.model.RuleSet;
+import org.codehaus.mojo.versions.reporting.ReportRendererFactory;
 import org.codehaus.plexus.i18n.I18N;
 
 /**
  * Base class for all versions reports.
  *
+ * @param <T> modelled report object
  * @author Stephen Connolly
  * @since 1.0-alpha-3
  */
-public abstract class AbstractVersionsReport
+public abstract class AbstractVersionsReport<T>
     extends AbstractMavenReport
 {
     /**
@@ -99,7 +99,7 @@ public abstract class AbstractVersionsReport
     /**
      * @since 1.0-alpha-3
      */
-    private WagonManager wagonManager;
+    private final WagonManager wagonManager;
 
     /**
      * @since 1.0-alpha-3
@@ -188,17 +188,25 @@ public abstract class AbstractVersionsReport
     @Parameter( property = "maven.version.ignore" )
     protected Set<String> ignoredVersions;
 
+    /**
+     * Renderer factory
+     *
+     * @since 2.13.0
+     */
+    protected ReportRendererFactory rendererFactory;
+
     // --------------------- GETTER / SETTER METHODS ---------------------
 
-    @Inject
     protected AbstractVersionsReport( I18N i18n, RepositorySystem repositorySystem, ArtifactResolver artifactResolver,
-                                   ArtifactMetadataSource artifactMetadataSource, WagonManager wagonManager )
+                                      ArtifactMetadataSource artifactMetadataSource, WagonManager wagonManager,
+                                      ReportRendererFactory rendererFactory )
     {
         this.i18n = i18n;
         this.repositorySystem = repositorySystem;
         this.artifactResolver = artifactResolver;
         this.artifactMetadataSource = artifactMetadataSource;
         this.wagonManager = wagonManager;
+        this.rendererFactory = rendererFactory;
     }
 
     public VersionsHelper getHelper()