Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.1…

…1.2 (#2188) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.11.1 to 3.11.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.11.1...maven-javadoc-plugin-3.11.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit d963e58)
apache · Jan 5, 2025 · 17cc2ec · 17cc2ec
1 parent ce9d559
commit 17cc2ec
Show file tree

Hide file tree

Showing 8 changed files with 210 additions and 57 deletions.
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
@@ -140,6 +140,26 @@
                     <goalPrefix>cxf-java2wadl</goalPrefix>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>test-integration</id>
+                        <goals>
+                            <goal>install</goal>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <settingsFile>src/it/settings.xml</settingsFile>
+                            <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+                            <skipInvocation>${maven.test.skip.exec}</skipInvocation>
+                            <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/pom.xml b/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/pom.xml
@@ -0,0 +1,59 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.apache.cxf.it</groupId>
+    <artifactId>java-generate-rx</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>java-generate-rx</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+            <version>@project.version@</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-java2wadl-plugin</artifactId>
+                <version>@project.version@</version>
+                <executions>
+                    <execution>
+                        <id>parsejavadoc</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>parsejavadoc</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>process-classes</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>java2wadl</goal>
+                        </goals>
+                        <configuration>
+                            <classResourceNames>
+                                <classResourceName>application.Test1</classResourceName>
+                                <classResourceName>application.Test2</classResourceName>
+                            </classResourceNames>
+                            <docProvider>org.apache.cxf.maven_plugin.javatowadl.ResourceMapJavaDocProvider</docProvider>
+                            <attachWadl>true</attachWadl>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/src/main/java/application/Test1.java b/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/src/main/java/application/Test1.java
@@ -0,0 +1,24 @@
+/**
+ * Created by Apache CXF WadlToJava code generator
+**/
+package application;
+
+import java.util.concurrent.CompletableFuture;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import org.apache.cxf.jaxrs.ext.multipart.Multipart;
+
+@Path("/1")
+public interface Test1 {
+
+    @PUT
+    @Consumes("multipart/mixed")
+    @Produces("text/plain")
+    CompletableFuture<String> put(@QueryParam("standalone") Boolean standalone, @Multipart("action") String action, @Multipart(value = "sources", required = false) String sources);
+
+}
diff --git a/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/src/main/java/application/Test2.java b/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/src/main/java/application/Test2.java
@@ -0,0 +1,18 @@
+/**
+ * Created by Apache CXF WadlToJava code generator
+**/
+package application;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.QueryParam;
+
+@Path("/2")
+public interface Test2 {
+
+    @PUT
+    @Consumes("application/json")
+    void put(@QueryParam("snapshot") boolean snapshot, String flow);
+
+}
diff --git a/maven-plugins/java2wadl-plugin/src/it/settings.xml b/maven-plugins/java2wadl-plugin/src/it/settings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<settings>
+  <profiles>
+    <profile>
+      <id>it-repo</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <repositories>
+        <repository>
+          <id>local.central</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </repository>
+      </repositories>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>local.central</id>
+          <url>@localRepositoryUrl@</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+          <id>local.it</id>
+          <url>file://@project.build.directory@/it/repo</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
+    </profile>
+  </profiles>
+</settings>
diff --git a/...va2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/...va2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
@@ -21,10 +21,12 @@
 import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.List;
 import java.util.Locale;
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
+import org.apache.maven.doxia.tools.SiteTool;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -34,10 +36,10 @@
 import org.apache.maven.plugins.javadoc.options.DocletArtifact;
 import org.apache.maven.plugins.javadoc.resolver.ResourceResolver;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
-import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
 import org.apache.maven.toolchain.ToolchainManager;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
 
 /**
  * @goal parsejavadoc
@@ -78,19 +80,6 @@ public class ParseJavaDocMojo extends AbstractMojo {
      * @component
      */
     private ResourceResolver resourceResolver;
-
-    /**
-     * @component
-     */
-    private DependencyResolver dependencyResolver;
-
-
-    /**
-     * @component
-     */
-    private ArtifactResolver artifactResolver;
-
-
 
     /**
      * @component
@@ -109,15 +98,6 @@ public class ParseJavaDocMojo extends AbstractMojo {
      */
     private File dumpFileOutputDirectory;
 
-    /**
-     * The local maven repository.
-     *
-     * @parameter expression="${localRepository}"
-     * @required
-     * @readonly
-     */
-    private ArtifactRepository localRepository;
-
 
     /**
      * Directory into which assembled {@link JavadocOptions} instances will be written before they
@@ -128,9 +108,37 @@ public class ParseJavaDocMojo extends AbstractMojo {
      */
     private File javadocOptionsDir;
 
+    /**
+     * @component
+     */
+    private RepositorySystem repoSystem;
+
+    /**
+     * @parameter default-value = "${repositorySystemSession}"
+     * @required
+     * @readonly
+     */
+    private RepositorySystemSession repoSession;
+
+    /**
+     * @component
+     */
+    private ArtifactHandlerManager artifactHandlerManager;
+
+    /**
+     * @component
+     */
+    private SiteTool siteTool;
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
-        AbstractJavadocMojo mojo = new JavadocReport();
+        AbstractJavadocMojo mojo = new JavadocReport(siteTool,
+                archiverManager,
+                resourceResolver,
+                repoSystem,
+                artifactHandlerManager,
+                mavenProjectBuilder,
+                toolchainManager);
         Locale locale = Locale.getDefault();
         try {
             Field f = AbstractJavadocMojo.class.getDeclaredField("doclet");
@@ -164,39 +172,10 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             }
             f.set(mojo, docletArtifact);
 
-
-            f = AbstractJavadocMojo.class.getDeclaredField("mavenProjectBuilder");
-            f.setAccessible(true);
-            f.set(mojo, this.mavenProjectBuilder);
-
-            f = AbstractJavadocMojo.class.getDeclaredField("resourceResolver");
-            f.setAccessible(true);
-            f.set(mojo, this.resourceResolver);
-
             f = AbstractJavadocMojo.class.getDeclaredField("session");
             System.out.println("========>" + session.getProjects());
             f.setAccessible(true);
             f.set(mojo, this.session);
-
-            f = AbstractJavadocMojo.class.getDeclaredField("dependencyResolver");
-            f.setAccessible(true);
-            f.set(mojo, this.dependencyResolver);
-
-            f = AbstractJavadocMojo.class.getDeclaredField("artifactResolver");
-            f.setAccessible(true);
-            f.set(mojo, this.artifactResolver);
-
-            f = AbstractJavadocMojo.class.getDeclaredField("archiverManager");
-            f.setAccessible(true);
-            f.set(mojo, this.archiverManager);
-
-            f = AbstractJavadocMojo.class.getDeclaredField("toolchainManager");
-            f.setAccessible(true);
-            f.set(mojo, this.toolchainManager);
-
-            f = AbstractJavadocMojo.class.getDeclaredField("localRepository");
-            f.setAccessible(true);
-            f.set(mojo, this.localRepository);
 
             f = AbstractJavadocMojo.class.getDeclaredField("applyJavadocSecurityFix");
             f.setAccessible(true);
@@ -221,6 +200,14 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 f.set(mojo, dumpFileOutputDirectory);
             }
 
+            f = AbstractJavadocMojo.class.getDeclaredField("reactorProjects");
+            f.setAccessible(true);
+            f.set(mojo, List.of());
+
+            f = AbstractJavadocMojo.class.getDeclaredField("repoSession");
+            f.setAccessible(true);
+            f.set(mojo, repoSession);
+
             Method m = AbstractJavadocMojo.class.getDeclaredMethod("executeReport", Locale.class);
             m.setAccessible(true);
             m.invoke(mojo, locale);

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -1959,7 +1959,7 @@
             <dependency>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.11.1</version>
+                <version>3.11.2</version>
             </dependency>
             <dependency>
                 <groupId>org.ehcache</groupId>

diff --git a/pom.xml b/pom.xml
@@ -466,7 +466,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.11.1</version>
+                    <version>3.11.2</version>
                     <configuration>
                         <attach>true</attach>
                         <source>${cxf.jdk.version}</source>