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/10 02:22:02 UTC
(cxf) branch 3.5.x-fixes updated (c385234e9a -> ba7a79a3b3)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from c385234e9a Fix codeql-analysis Github workflow (post merge conflicts resolution)
new 2a7435ec0d Bump org.assertj:assertj-core from 3.27.0 to 3.27.1 (#2213)
new b11f838e37 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.11.1 to 3.11.2 (#2188)
new 0f6ab75812 Bump org.assertj:assertj-core from 3.27.1 to 3.27.2 (#2216)
new ce698b08d6 CXF-9093: Client does not send entire payload (if size ~> 2500 bytes) when hc5, TLS1.3 are used (#2214)
new ba7a79a3b3 Recording .gitmergeinfo Changes
The 5 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 | 8 ++
maven-plugins/java2wadl-plugin/pom.xml | 20 +++++
.../src/it/java-generate-rx/pom.xml | 59 +++++++++++++
.../src/main/java/application/Test1.java | 24 ++++++
.../src/main/java/application/Test2.java | 18 ++++
.../src/it/settings.xml | 0
.../maven_plugin/javatowadl/ParseJavaDocMojo.java | 97 ++++++++++------------
parent/pom.xml | 4 +-
pom.xml | 2 +-
systests/transport-hc5/pom.xml | 10 +++
.../hc5/https/clientauth/ClientAuthTest.java | 71 ++++++++++++++++
.../hc5/https/clientauth/client-auth-server.xml | 25 +++++-
.../hc5/https/clientauth/client-auth-tls-1.3.xml} | 2 +-
13 files changed, 279 insertions(+), 61 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%)
copy systests/{transports/src/test/resources/org/apache/cxf/systest/https/clientauth/client-auth.xml => transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-tls-1.3.xml} (95%)
(cxf) 01/05: Bump org.assertj:assertj-core from 3.27.0 to 3.27.1 (#2213)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2a7435ec0db55286e2b9f8ef7aa0d45cda41ec6a
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Jan 2 08:16:28 2025 -0500
Bump org.assertj:assertj-core from 3.27.0 to 3.27.1 (#2213)
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.0 to 3.27.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.0...assertj-build-3.27.1)
---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
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 b3dff1fec1fc923e9f341c6e38d8b7146685863c)
(cherry picked from commit 0318a11a52c250f13b9d6350194d7c271bd1d8d2)
# Conflicts:
# parent/pom.xml
(cherry picked from commit 8cf6382f931b74b7158b40efc374d173530af3d6)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e3c827147c..e9ce24471e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -86,7 +86,7 @@
<cxf.arquillian.version>1.1.14.Final</cxf.arquillian.version>
<cxf.arquillian.weld.container.version>2.0.1.Final</cxf.arquillian.weld.container.version>
<cxf.aspectj.version>1.9.22.1</cxf.aspectj.version>
- <cxf.assertj.version>3.27.0</cxf.assertj.version>
+ <cxf.assertj.version>3.27.1</cxf.assertj.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.6.1</cxf.atmosphere.version>
<cxf.bcprov.version>1.78.1</cxf.bcprov.version>
(cxf) 05/05: 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 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ba7a79a3b39e433bbd6135610620bf4131a6375f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jan 9 21:21:31 2025 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 18a95f746b..59850bba3a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -73,6 +73,7 @@ B 2279fcb96413302d9875d450283d9231bf0ce31b
B 22d817d86fb576479f6095a43d8f64521350b53d
B 23cea61d50ebafdbe4e8932e8630d5387f6c6c49
B 24143cf0fe15a9d6b8fcd435afeec6b91f61a47b
+B 24241b007edc2162150e1b1ddbd69bc76198a7c0
B 242d9a76e6e9351e994b34960614bd65cf5eb1f8
B 2438f7ebd983959935f5fb770caa4ad48ed3b0fb
B 247de3b035aac013f12358fe8c746416506975ec
@@ -390,6 +391,7 @@ B b30f428e74d86a182e8101b0de555cfa2f57d826
B b3bad8f124bc8659dd4ba0286cd6752c4f928cb7
B b544d0eb6966cb81b33095e6c7ae03ea12e0d31c
B b64caf2d07203084161ba59f0eaa3d86fe19c81c
+B b673682f2daf6e74ff902ae3c483b985f63557c2
B b73007230c50ff0b50c50f4ee1cd2c0e06547b8d
B b740e0a7f606d9e5acb8c27dfb3a671708bb19db
B b837cc4613590e6b2a3cec9a74b4b3c958359a78
@@ -432,6 +434,7 @@ B c8a91c5bd9170b20ccafaa4ac257d94a97af0c6c
B c9c1c375e3a923b2539acae01fa1b971e0b151d4
B cad4f0b76bb79f82a5ef4bc7e435e93996eb884b
B cd57ff040fa97373994ea1f17b1e33f9c9e55671
+B ce9d5590d0cf8eba0daf38b143efc483a30f203c
B cec58e80d94e1e40d6f0948a8cdb8b9eadb6268d
B cedaa7ee3302717bd9ca44b2996655c437d7a67c
B cef0733a835c917d7c2c26a67d69dae4efaa332d
@@ -493,6 +496,7 @@ B e6abcd2a008b39cb40573718eb26c7f9d1d76676
B e7328567faaaa0c3c2a59f07eb6ba25b425b455f
B e76b0cf44e237dbda63e982a65a9c17516c91a38
B e77527fbb19d006713cde6bc9b1b3996a82cec3b
+B e7b06a2c3944d908e0e48552e90bcc4ba09a2ebc
B e7c2aee206ae5084204502b4744feed5a8e93e04
B e7d101b0654337d5e55de521af679bcb5526ab30
B e7d5bca0ba38b0f282f9da7f87bf964544b6b66a
@@ -925,6 +929,7 @@ M 8c95c070142fc70d5ad7f7337cc7ff94ab7e34ce
M 8c9663b8d8547c085cdfdf8455ebc2d652cf8a42
M 8cc27337e48fd90142b3b4251b469b1026598bef
M 8ccb1c0bb71db17c130de825a1c152aa847564e2
+M 8cf6382f931b74b7158b40efc374d173530af3d6
M 8d51dc8111e0083f1bbba311b9676872c8178a8a
M 8e2ce5d61df95daaaeee0209e9c9d768ca8bf6a2
M 8e70e7d9b804bbe9a06d65ef6a574a9b933fb1bb
@@ -941,6 +946,7 @@ M 90ec7283673a9aae874b2d4e9a077701300ac0de
M 916510c739481fa414d2bf0cb0ffee33dd01199b
M 91c97378d9a64166b3099cad6a9f842d18c5bcad
M 91f39963a2f0963911e0aaba5f91168dbf34b150
+M 9261461a83551522462b760a27692a1a9b67a02f
M 929a72545f8d729f4320eb5b871ab63738503ab4
M 937d6ca1fad9e39fa9684ea62c924b461b57d177
M 942c04dab17e2ea2bcee487c5c5f14cbd813e265
@@ -992,6 +998,7 @@ M a5ad0b1798aac1f5df2f725363f932a808395b3e
M a65137905175b6a02fb8f704d3363e62dc3069f9
M a6782300fd9c55764b2582f7d9f4e73d1031028c
M a68aca6a36de4c6e7761efef119c38614ce95a38
+M a68d008589470d83b2b7c5e268243f6254a9a93d
M a716e70d9590c566b28d6d87316bc78b1872a136
M a75b56a7c3826a48320202aca771cbcbdca6a350
M a77a4fe0c382f8631635b805400a51da25a4709f
@@ -1197,6 +1204,7 @@ M e6fd52bd53f8b16082d5532a7276b5165463a8a5
M e7720665528832a45359ca32f407ce60d25e5f2c
M e80acb4df2793b98e8674965a548221b2d4a53b2
M e82bb5c5d1300656d13f790e4f9547cd3ee88b23
+M e8b4a8d19f8375e9f2f1a308cf98e53b2d05ca19
M e8da447f0bd469ca392fe4bca601c8ae269a9430
M e903d8be3537fc09fc634a9cecfce6517a368eef
M e9471c7c9aff40a106452b2cc5c307585d8c1e57
(cxf) 04/05: CXF-9093: Client does not send entire payload (if size ~> 2500 bytes) when hc5, TLS1.3 are used (#2214)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ce698b08d6fe2237528f754a177a1250149048ea
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jan 9 13:02:21 2025 -0500
CXF-9093: Client does not send entire payload (if size ~> 2500 bytes) when hc5, TLS1.3 are used (#2214)
(cherry picked from commit f7da232ff5446cbf379a140652550ad6eecf7f95)
(cherry picked from commit 92c971862796efd8514ab9cbd865c9b93f5fa8d8)
(cherry picked from commit a68d008589470d83b2b7c5e268243f6254a9a93d)
# Conflicts:
# systests/transport-hc5/pom.xml
---
systests/transport-hc5/pom.xml | 10 +++
.../hc5/https/clientauth/ClientAuthTest.java | 71 ++++++++++++++++++++++
.../hc5/https/clientauth/client-auth-server.xml | 25 +++++++-
.../hc5/https/clientauth/client-auth-tls-1.3.xml | 44 ++++++++++++++
4 files changed, 148 insertions(+), 2 deletions(-)
diff --git a/systests/transport-hc5/pom.xml b/systests/transport-hc5/pom.xml
index 7633c2050d..4ff72498dd 100644
--- a/systests/transport-hc5/pom.xml
+++ b/systests/transport-hc5/pom.xml
@@ -70,6 +70,16 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <!-- See please https://issues.apache.org/jira/browse/HTTPCORE-775 -->
+ <jsse.SSLEngine.acceptLargeFragments>true</jsse.SSLEngine.acceptLargeFragments>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
diff --git a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/https/clientauth/ClientAuthTest.java b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/https/clientauth/ClientAuthTest.java
index 678b642f56..3d50791ecf 100644
--- a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/https/clientauth/ClientAuthTest.java
+++ b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/https/clientauth/ClientAuthTest.java
@@ -24,6 +24,8 @@ import java.net.URL;
import java.security.KeyStore;
import java.util.Arrays;
import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
@@ -65,6 +67,7 @@ import static org.junit.Assert.fail;
public class ClientAuthTest extends AbstractBusClientServerTestBase {
static final String PORT = allocatePort(ClientAuthServer.class);
static final String PORT2 = allocatePort(ClientAuthServer.class, 2);
+ static final String PORT3 = allocatePort(ClientAuthServer.class, 3);
final Boolean async;
@@ -575,6 +578,74 @@ public class ClientAuthTest extends AbstractBusClientServerTestBase {
((java.io.Closeable)port).close();
}
+ // Server directly trusts the client cert and uses TLSv1.3, no chunking
+ @org.junit.Test
+ public void testDirectTrustTls13LargeNoChunking() throws Exception {
+ SpringBusFactory bf = new SpringBusFactory();
+ URL busFile = ClientAuthTest.class.getResource("client-auth-tls-1.3.xml");
+
+ Bus bus = bf.createBus(busFile.toString());
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
+
+ URL url = SOAPService.WSDL_LOCATION;
+ SOAPService service = new SOAPService(url, SOAPService.SERVICE);
+ assertNotNull("Service is null", service);
+ final Greeter port = service.getHttpsPort();
+ assertNotNull("Port is null", port);
+
+ updateAddressPort(port, PORT3);
+
+ // Enable Async
+ if (async) {
+ ((BindingProvider)port).getRequestContext().put("use.async.http.conduit", true);
+ }
+
+ Client client = ClientProxy.getClient(port);
+ HTTPConduit http = (HTTPConduit) client.getConduit();
+ http.getClient().setAllowChunking(false);
+
+ final String name = IntStream.range(0, 500).mapToObj(i -> "Kitty ").collect(Collectors.joining());
+ assertEquals(port.greetMe(name), "Hello " + name);
+
+ ((java.io.Closeable)port).close();
+ bus.shutdown(true);
+ }
+
+ // Server directly trusts the client cert and uses TLSv1.3, chunking
+ @org.junit.Test
+ public void testDirectTrustTls13LargeChunking() throws Exception {
+ SpringBusFactory bf = new SpringBusFactory();
+ URL busFile = ClientAuthTest.class.getResource("client-auth-tls-1.3.xml");
+
+ Bus bus = bf.createBus(busFile.toString());
+ BusFactory.setDefaultBus(bus);
+ BusFactory.setThreadDefaultBus(bus);
+
+ URL url = SOAPService.WSDL_LOCATION;
+ SOAPService service = new SOAPService(url, SOAPService.SERVICE);
+ assertNotNull("Service is null", service);
+ final Greeter port = service.getHttpsPort();
+ assertNotNull("Port is null", port);
+
+ updateAddressPort(port, PORT3);
+
+ // Enable Async
+ if (async) {
+ ((BindingProvider)port).getRequestContext().put("use.async.http.conduit", true);
+ }
+
+ Client client = ClientProxy.getClient(port);
+ HTTPConduit http = (HTTPConduit) client.getConduit();
+ http.getClient().setAllowChunking(true);
+
+ final String name = IntStream.range(0, 500).mapToObj(i -> "Kitty ").collect(Collectors.joining());
+ assertEquals(port.greetMe(name), "Hello " + name);
+
+ ((java.io.Closeable)port).close();
+ bus.shutdown(true);
+ }
+
private static final class DisableCNCheckVerifier implements HostnameVerifier {
@Override
diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-server.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-server.xml
index af5a90ffe6..1b96177faa 100644
--- a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-server.xml
+++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-server.xml
@@ -54,7 +54,7 @@
address="https://localhost:${testutil.ports.ClientAuthServer}/SoapContext/HttpsPort"
serviceName="s:SOAPService"
endpointName="e:HttpsPort" depends-on="direct-trust-tls-settings"/>
-
+
<httpj:engine-factory id="chain-trust-tls-settings">
<httpj:engine port="${testutil.ports.ClientAuthServer.2}">
<httpj:tlsServerParameters>
@@ -76,5 +76,26 @@
address="https://localhost:${testutil.ports.ClientAuthServer.2}/SoapContext/HttpsPort"
serviceName="s:SOAPService"
endpointName="e:HttpsPort" depends-on="chain-trust-tls-settings"/>
-
+
+ <httpj:engine-factory id="direct-trust-tls-1.3-settings">
+ <httpj:engine port="${testutil.ports.ClientAuthServer.3}">
+ <httpj:tlsServerParameters secureSocketProtocol="TLSv1.3">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="jks" password="password" resource="keys/Bethal.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ <sec:clientAuthentication want="true" required="true"/>
+ </httpj:tlsServerParameters>
+ </httpj:engine>
+ </httpj:engine-factory>
+
+ <jaxws:endpoint xmlns:e="http://apache.org/hello_world/services"
+ xmlns:s="http://apache.org/hello_world/services"
+ id="DirectTrustServerTls1.3"
+ implementor="org.apache.cxf.systest.hc5.GreeterImpl"
+ address="https://localhost:${testutil.ports.ClientAuthServer.3}/SoapContext/HttpsPort"
+ serviceName="s:SOAPService"
+ endpointName="e:HttpsPort" depends-on="direct-trust-tls-1.3-settings"/>
</beans>
\ No newline at end of file
diff --git a/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-tls-1.3.xml b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-tls-1.3.xml
new file mode 100644
index 0000000000..dc19c42849
--- /dev/null
+++ b/systests/transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/https/clientauth/client-auth-tls-1.3.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:http="http://cxf.apache.org/transports/http/configuration"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:p="http://cxf.apache.org/policy"
+ xmlns:sec="http://cxf.apache.org/configuration/security"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
+
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+ <http:conduit name="https://localhost:.*">
+ <http:tlsClientParameters disableCNCheck="true" secureSocketProtocol="TLSv1.3">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="jks" password="password" resource="keys/Morpit.jks"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="jks" password="password" resource="keys/Truststore.jks"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
+</beans>
\ No newline at end of file
(cxf) 02/05: 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 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b11f838e37238fdefb47bc4a20087a30e6638df3
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)
(cherry picked from commit 17cc2ec18bcc0500388f11ed21f20750557948c9)
---
maven-plugins/java2wadl-plugin/pom.xml | 20 +++++
.../src/it/java-generate-rx/pom.xml | 59 +++++++++++++
.../src/main/java/application/Test1.java | 24 ++++++
.../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, 210 insertions(+), 57 deletions(-)
diff --git a/maven-plugins/java2wadl-plugin/pom.xml b/maven-plugins/java2wadl-plugin/pom.xml
index 85887a97af..98fad1c59d 100644
--- 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
new file mode 100644
index 0000000000..6f0620df41
--- /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>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
new file mode 100644
index 0000000000..58711bfb53
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..2658027238
--- /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 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
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 e9ce24471e..9256db7fdd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2043,7 +2043,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 8c11bcdbd5..0b8bfd510b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,7 +467,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>
(cxf) 03/05: Bump org.assertj:assertj-core from 3.27.1 to 3.27.2 (#2216)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0f6ab758123f7d0c8b01864e819a1390d18098c3
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jan 6 17:15:38 2025 -0500
Bump org.assertj:assertj-core from 3.27.1 to 3.27.2 (#2216)
Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.27.1 to 3.27.2.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.27.1...assertj-build-3.27.2)
---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
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 436721d94079bf5b91a18e37bdcbf3fb7560d270)
(cherry picked from commit 3f5290defd6b6c0a80aa7db9a0ca1c2418c57e6b)
# Conflicts:
# parent/pom.xml
(cherry picked from commit e8b4a8d19f8375e9f2f1a308cf98e53b2d05ca19)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9256db7fdd..efefe9ed37 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -86,7 +86,7 @@
<cxf.arquillian.version>1.1.14.Final</cxf.arquillian.version>
<cxf.arquillian.weld.container.version>2.0.1.Final</cxf.arquillian.weld.container.version>
<cxf.aspectj.version>1.9.22.1</cxf.aspectj.version>
- <cxf.assertj.version>3.27.1</cxf.assertj.version>
+ <cxf.assertj.version>3.27.2</cxf.assertj.version>
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.6.1</cxf.atmosphere.version>
<cxf.bcprov.version>1.78.1</cxf.bcprov.version>