You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2025/01/05 16:32:22 UTC
(cxf) branch 4.0.x-fixes updated (e551eeb125 -> 18df5b6037)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from e551eeb125 Recording .gitmergeinfo Changes
new 523c82da47 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2 (#2188)
new 18df5b6037 Recording .gitmergeinfo Changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
maven-plugins/java2wadl-plugin/pom.xml | 20 +++++
.../src/it/java-generate-rx/pom.xml | 59 +++++++++++++
.../src/main/java/application/Test1.java | 22 +++++
.../src/main/java/application/Test2.java | 18 ++++
.../src/it/settings.xml | 0
.../maven_plugin/javatowadl/ParseJavaDocMojo.java | 97 ++++++++++------------
parent/pom.xml | 2 +-
pom.xml | 2 +-
9 files changed, 164 insertions(+), 57 deletions(-)
create mode 100644 maven-plugins/java2wadl-plugin/src/it/java-generate-rx/pom.xml
create mode 100644 maven-plugins/java2wadl-plugin/src/it/java-generate-rx/src/main/java/application/Test1.java
create mode 100644 maven-plugins/java2wadl-plugin/src/it/java-generate-rx/src/main/java/application/Test2.java
copy maven-plugins/{codegen-plugin => java2wadl-plugin}/src/it/settings.xml (100%)
(cxf) 02/02: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 18df5b603737b7a6c7b4cc5a4826c926058e0527
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jan 5 11:31:02 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b8c81810c8..0f4295f83b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -274,6 +274,7 @@ M d5cbaed0117b679a2b4c391278720183ca090861
M d602fda008e2981081f38474eb05cb34809c4af1
M d77fd08202c101e7e1228162666b291604397aa4
M d92da9e9682716e0a725085df477d7b9ec9177e0
+M d963e585da37834062ae88e6b2935bf9fc505277
M da3f484d06fa874456d34edd3a01e4fd0454ec3e
M dae5fcb2c77c4497677746ebeb6eb53b9406ec16
M dc08a738df3e10f133f4dc149c2cdbdf56ed8350
(cxf) 01/02: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2 (#2188)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 523c82da4717251596e33ac9d0ce6308dc9da686
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Sat Jan 4 09:04:07 2025 -0500
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.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](https://github.com/apache/maven-javadoc-plugin/compare/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] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit d963e585da37834062ae88e6b2935bf9fc505277)
---
maven-plugins/java2wadl-plugin/pom.xml | 20 +++++
.../src/it/java-generate-rx/pom.xml | 59 +++++++++++++
.../src/main/java/application/Test1.java | 22 +++++
.../src/main/java/application/Test2.java | 18 ++++
maven-plugins/java2wadl-plugin/src/it/settings.xml | 45 ++++++++++
.../maven_plugin/javatowadl/ParseJavaDocMojo.java | 97 ++++++++++------------
parent/pom.xml | 2 +-
pom.xml | 2 +-
8 files changed, 208 insertions(+), 57 deletions(-)
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index f0d9dc6a01..77d1a1c9c3 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -143,6 +143,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
new file mode 100644
index 0000000000..7c89af967f
--- /dev/null
+++ 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>17</source>
+ <target>17</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
new file mode 100644
index 0000000000..68eca5145c
--- /dev/null
+++ b/maven-plugins/java2wadl-plugin/src/it/java-generate-rx/src/main/java/application/Test1.java
@@ -0,0 +1,22 @@
+/**
+ * Created by Apache CXF WadlToJava code generator
+**/
+package application;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import java.util.concurrent.CompletableFuture;
+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
new file mode 100644
index 0000000000..e0fe57b81f
--- /dev/null
+++ 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 jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.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
new file mode 100644
index 0000000000..d29dc39671
--- /dev/null
+++ 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/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
index 7830be8569..76e681e09c 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
@@ -21,10 +21,12 @@ package org.apache.cxf.maven_plugin.javatowadl;
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.JavadocReport;
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 class ParseJavaDocMojo extends AbstractMojo {
}
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 class ParseJavaDocMojo extends AbstractMojo {
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
index 474929e71c..13ba64898e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1991,7 +1991,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
index 08518c3ec3..a91781585a 100644
--- 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>