Update Doxia to 2.x stack

mojohaus · Nov 8, 2024 · b1861b1 · b1861b1
1 parent ea34ceb
commit b1861b1
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 281 deletions.
diff --git a/pom.xml b/pom.xml
@@ -123,9 +123,11 @@
 
     <processorVersion>1.3</processorVersion>
 
-    <doxiaVersion>1.12.0</doxiaVersion>
+    <doxiaVersion>2.0.0</doxiaVersion>
     <!-- ASF project maven-doxia-sitetools:1.8.1 has different release cycle and it is dependent on maven-doxia:1.8 -->
-    <doxiaRendererVersion>1.11.1</doxiaRendererVersion>
+    <doxiaRendererVersion>2.0.0</doxiaRendererVersion>
+    <mavenReportingApiVersion>4.0.0</mavenReportingApiVersion>
+    <mavenReportingImplVersion>4.0.0</mavenReportingImplVersion>
 
     <version.httpcomponents.httpclient>4.5.14</version.httpcomponents.httpclient>
     <version.httpcomponents.httpcore>4.4.16</version.httpcomponents.httpcore>
@@ -157,6 +159,12 @@
         <artifactId>slf4j-api</artifactId>
         <version>1.7.36</version>
       </dependency>
+      <dependency>
+        <!-- due to security error in transitive dependencies -->
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-archiver</artifactId>
+        <version>3.6.3</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -192,68 +200,26 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>3.1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-impl</artifactId>
-      <version>3.2.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <!-- Doxia -->
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-core</artifactId>
       <version>${doxiaVersion}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-sink-api</artifactId>
       <version>${doxiaVersion}</version>
     </dependency>
-
-    <!-- Doxia-sitetools -->
     <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-site-renderer</artifactId>
-      <version>${doxiaRendererVersion}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-component-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>antlr</groupId>
-          <artifactId>antlr</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>${mavenReportingApiVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-impl</artifactId>
+      <version>${mavenReportingImplVersion}</version>
     </dependency>
 
     <!-- dependencies to annotations -->
@@ -268,11 +234,6 @@
       <artifactId>plexus-utils</artifactId>
       <version>4.0.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-xml</artifactId>
-      <version>3.0.1</version>
-    </dependency>
 
     <dependency>
       <groupId>org.nuiton.processor</groupId>
@@ -285,13 +246,6 @@
       <artifactId>commons-lang3</artifactId>
       <version>3.17.0</version>
     </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.3.4</version>
-    </dependency>
-
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>

diff --git a/src/it/aggregate-third-party-report/postbuild.groovy b/src/it/aggregate-third-party-report/postbuild.groovy
@@ -20,7 +20,7 @@
  * #L%
  */
 
-file = new File(basedir, 'target/site/aggregate-third-party-report.html');
+file = new File(basedir, 'target/reports/aggregate-third-party-report.html');
 assert file.exists();
 content = file.text;
 assert !content.contains('the project has no dependencies.');
@@ -29,5 +29,5 @@ assert content.contains('<a href="#commons-logging:commons-logging:1.1.1">common
 assert content.contains('<td>The Apache Software License, Version 2.0</td>'); // TODO Should be a link
 assert content.contains('<a href="#Overview">Back to top</a>');
 
-file = new File(basedir, 'target/site/third-party-report.html');
+file = new File(basedir, 'target/reports/third-party-report.html');
 assert !file.exists();
diff --git a/src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java b/src/main/java/org/codehaus/mojo/license/AbstractDownloadLicensesMojo.java
@@ -46,8 +46,8 @@
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;