Migrate to Doxia 2.0.0 stack

jenkinsci · Oct 15, 2024 · cf7b19f · cf7b19f
1 parent f5483af
commit cf7b19f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/jellydoc-maven-plugin/pom.xml b/jellydoc-maven-plugin/pom.xml
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>3.2.0</version>
+      <version>4.0.0</version>
       <exclusions>
         <exclusion>
           <groupId>dom4j</groupId>
@@ -134,6 +134,11 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-classworlds</artifactId>
+      <version>2.7.0</version>
+    </dependency>
     <dependency>
       <groupId>org.dom4j</groupId>
       <artifactId>dom4j</artifactId>

diff --git a/jellydoc-maven-plugin/src/main/java/org/jvnet/maven/jellydoc/JellydocMojo.java b/jellydoc-maven-plugin/src/main/java/org/jvnet/maven/jellydoc/JellydocMojo.java
@@ -220,20 +220,6 @@ private void setParam(Javadoc.DocletInfo d, String name, String value) {
     //        return src;
     //    }
 
-    /**
-     * Generate a report.
-     *
-     * @param sink The sink to use for the generation.
-     * @param locale The desired locale in which to generate the report; could be null.
-     * @throws MavenReportException if any error occurs
-     * @deprecated use {@link #generate(Sink, SinkFactory, Locale)} instead.
-     */
-    @Deprecated
-    @Override
-    public void generate(org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException {
-        generate(sink, null, locale);
-    }
-
     /**
      * Generate a report.
      *

diff --git a/jellydoc-maven-plugin/src/site/site.xml b/jellydoc-maven-plugin/src/site/site.xml
@@ -3,7 +3,7 @@
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.12.0</version>
+    <version>2.0.0-M11</version>
   </skin>
 
   <body>