From a8d4690acefc0d5ac67b6c1d7796802776d8d715 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Sun, 13 Feb 2022 23:08:55 +0100
Subject: [PATCH] [MDEP-788] Upgrade maven-reporting-impl to version 3.1.0

- use maven-site-plugin in IT test
- remove dependency to doxia, it is transitive from maven-reporting-impl
---
 pom.xml                                       | 50 +------------------
 .../analyze-report/invoker.properties         |  3 +-
 src/it/projects/analyze-report/pom.xml        | 37 ++++++++++++--
 src/it/projects/analyze-report/verify.bsh     |  2 +-
 4 files changed, 35 insertions(+), 57 deletions(-)

diff --git a/pom.xml b/pom.xml
index 48c727fd2..4feb76eb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,8 +90,6 @@ under the License.
 
   <properties>
     <mavenVersion>3.1.1</mavenVersion>
-    <doxiaVersion>1.11.1</doxiaVersion>
-    <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
     <jettyVersion>9.4.44.v20210927</jettyVersion>
     <pluginTestingVersion>3.1.0</pluginTestingVersion>
     <javaVersion>8</javaVersion>
@@ -146,33 +144,10 @@ under the License.
     </dependency>
     
     <!-- reporting -->
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>3.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>3.0.0</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>maven-artifact-manager</artifactId>
-          <groupId>org.apache.maven</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>maven-project</artifactId>
-          <groupId>org.apache.maven</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>maven-profile</artifactId>
-          <groupId>org.apache.maven</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>maven-plugin-registry</artifactId>
-          <groupId>org.apache.maven</groupId>
-        </exclusion>
-      </exclusions>
+      <version>3.1.0</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -180,23 +155,6 @@ under the License.
       <version>2.11.0</version>
     </dependency>
 
-    <!-- doxia -->
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-sink-api</artifactId>
-      <version>${doxiaVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-core</artifactId>
-      <version>${doxiaVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-site-renderer</artifactId>
-      <version>${doxiaSitetoolsVersion}</version>
-    </dependency>
-
     <!-- plexus -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -259,12 +217,6 @@ under the License.
       <version>4.2</version>
     </dependency>
 
-    <dependency>
-      <groupId>classworlds</groupId>
-      <artifactId>classworlds</artifactId>
-      <version>1.1</version>
-    </dependency>
-
     <!-- dependencies to annotations -->
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/src/it/projects/analyze-report/invoker.properties b/src/it/projects/analyze-report/invoker.properties
index 38edf1c32..a3d335ef8 100644
--- a/src/it/projects/analyze-report/invoker.properties
+++ b/src/it/projects/analyze-report/invoker.properties
@@ -15,5 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.goals = clean ${project.groupId}:${project.artifactId}:${project.version}:analyze-report
-invoker.maven.version = 3.0+
+invoker.goals = site
diff --git a/src/it/projects/analyze-report/pom.xml b/src/it/projects/analyze-report/pom.xml
index 161afb63c..1cc764e48 100644
--- a/src/it/projects/analyze-report/pom.xml
+++ b/src/it/projects/analyze-report/pom.xml
@@ -59,13 +59,40 @@
       <plugins>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <configuration>
-           <outputXML>true</outputXML>
-           <scriptableOutput>true</scriptableOutput>
-           <verbose>true</verbose>
-          </configuration>
+          <version>@project.version@</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.10.0</version>
         </plugin>
       </plugins>
     </pluginManagement>
   </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>3.2.1</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>index</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>analyze-report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>
diff --git a/src/it/projects/analyze-report/verify.bsh b/src/it/projects/analyze-report/verify.bsh
index 75b57c771..d32f9f902 100644
--- a/src/it/projects/analyze-report/verify.bsh
+++ b/src/it/projects/analyze-report/verify.bsh
@@ -19,7 +19,7 @@
 
 import java.io.*;
 
-File htmlFile = new File( basedir, "target/dependency-analysis.html" );
+File htmlFile = new File( basedir, "target/site/dependency-analysis.html" );
 
 if ( !htmlFile.isFile() )
 {