[cxf] branch 3.6.x-fixes updated: Change from using aonymous inner classes to static classes to avoid holding onto "this" longer than needed. Fixes CXF-8946
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 4f5b943e72 Change from using aonymous inner classes to static classes
to avoid holding onto "this" longer than needed. Fixes CXF-8946
4f5b943e72 is described below
commit 4f5b943e7286fa562d563a6224c6a099e8aadc0f
Author: Daniel Kulp
AuthorDate: Thu Oct 19 16:03:36 2023 -0400
Change from using aonymous inner classes to static classes to avoid holding
onto "this" longer than needed.
Fixes CXF-8946
(cherry picked from commit 5ffdb906b560458ad8df5a892554b6e806d98d9e)
---
.../apache/cxf/jaxrs/client/AbstractClient.java| 7 +
.../cxf/transport/http/HttpClientHTTPConduit.java | 232 ++---
2 files changed, 163 insertions(+), 76 deletions(-)
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index 8018f4b5be..c4f5f80f71 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -336,6 +336,13 @@ public abstract class AbstractClient implements Client {
return this;
}
+@SuppressWarnings("deprecation")
+@Override
+protected void finalize() throws Throwable {
+close();
+super.finalize();
+}
+
@Override
public void close() {
if (closed.compareAndSet(false, true)) {
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index 86284ba093..10a65c6e50 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -353,7 +353,141 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
}
}
-class HttpClientWrappedOutputStream extends WrappedOutputStream {
+static class HttpClientPipedOutputStream extends PipedOutputStream {
+HttpClientWrappedOutputStream stream;
+HTTPClientPolicy csPolicy;
+HttpClientBodyPublisher publisher;
+HttpClientPipedOutputStream(HttpClientWrappedOutputStream s,
+PipedInputStream pin,
+HTTPClientPolicy cp,
+HttpClientBodyPublisher bp) throws
IOException {
+super(pin);
+stream = s;
+csPolicy = cp;
+publisher = bp;
+}
+public void close() throws IOException {
+super.close();
+csPolicy = null;
+stream = null;
+if (publisher != null) {
+publisher.close();
+publisher = null;
+}
+}
+synchronized boolean canWrite() throws IOException {
+return stream.isConnectionAttemptCompleted(csPolicy, this);
+}
+@Override
+public void write(int b) throws IOException {
+if (stream != null && (stream.connectionComplete || canWrite())) {
+super.write(b);
+}
+}
+@Override
+public void write(byte[] b, int off, int len) throws IOException {
+if (stream != null && (stream.connectionComplete || canWrite())) {
+super.write(b, off, len);
+}
+}
+
+};
+private static final class HttpClientFilteredInputStream extends
FilterInputStream {
+boolean closed;
+
+private HttpClientFilteredInputStream(InputStream in) {
+super(in);
+}
+@Override
+public int read() throws IOException {
+if (closed) {
+throw new IOException("stream is closed");
+}
+return super.read();
+}
+
+@Override
+public int read(byte[] b) throws IOException {
+if (closed) {
+throw new IOException("stream is closed");
+}
+return super.read(b);
+}
+
+@Override
+public int read(byte[] b, int off, int len) throws IOException {
+if (closed) {
+throw new IOException("stream is closed");
+}
+return super.read(b, off, len);
+}
+
+@Override
+public void close() throws IOException {
+if (!closed) {
+closed = true;
+super.close();
+in = null;
+}
+}
+}
+private static final
[cxf] branch main updated: Change from using aonymous inner classes to static classes to avoid holding onto "this" longer than needed. Fixes CXF-8946
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 5ffdb906b5 Change from using aonymous inner classes to static classes
to avoid holding onto "this" longer than needed. Fixes CXF-8946
5ffdb906b5 is described below
commit 5ffdb906b560458ad8df5a892554b6e806d98d9e
Author: Daniel Kulp
AuthorDate: Thu Oct 19 16:03:36 2023 -0400
Change from using aonymous inner classes to static classes to avoid holding
onto "this" longer than needed.
Fixes CXF-8946
---
.../apache/cxf/jaxrs/client/AbstractClient.java| 7 +
.../cxf/transport/http/HttpClientHTTPConduit.java | 232 ++---
2 files changed, 163 insertions(+), 76 deletions(-)
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index a8356ce002..3b83963804 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -336,6 +336,13 @@ public abstract class AbstractClient implements Client {
return this;
}
+@SuppressWarnings("deprecation")
+@Override
+protected void finalize() throws Throwable {
+close();
+super.finalize();
+}
+
@Override
public void close() {
if (closed.compareAndSet(false, true)) {
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index 86284ba093..10a65c6e50 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -353,7 +353,141 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
}
}
-class HttpClientWrappedOutputStream extends WrappedOutputStream {
+static class HttpClientPipedOutputStream extends PipedOutputStream {
+HttpClientWrappedOutputStream stream;
+HTTPClientPolicy csPolicy;
+HttpClientBodyPublisher publisher;
+HttpClientPipedOutputStream(HttpClientWrappedOutputStream s,
+PipedInputStream pin,
+HTTPClientPolicy cp,
+HttpClientBodyPublisher bp) throws
IOException {
+super(pin);
+stream = s;
+csPolicy = cp;
+publisher = bp;
+}
+public void close() throws IOException {
+super.close();
+csPolicy = null;
+stream = null;
+if (publisher != null) {
+publisher.close();
+publisher = null;
+}
+}
+synchronized boolean canWrite() throws IOException {
+return stream.isConnectionAttemptCompleted(csPolicy, this);
+}
+@Override
+public void write(int b) throws IOException {
+if (stream != null && (stream.connectionComplete || canWrite())) {
+super.write(b);
+}
+}
+@Override
+public void write(byte[] b, int off, int len) throws IOException {
+if (stream != null && (stream.connectionComplete || canWrite())) {
+super.write(b, off, len);
+}
+}
+
+};
+private static final class HttpClientFilteredInputStream extends
FilterInputStream {
+boolean closed;
+
+private HttpClientFilteredInputStream(InputStream in) {
+super(in);
+}
+@Override
+public int read() throws IOException {
+if (closed) {
+throw new IOException("stream is closed");
+}
+return super.read();
+}
+
+@Override
+public int read(byte[] b) throws IOException {
+if (closed) {
+throw new IOException("stream is closed");
+}
+return super.read(b);
+}
+
+@Override
+public int read(byte[] b, int off, int len) throws IOException {
+if (closed) {
+throw new IOException("stream is closed");
+}
+return super.read(b, off, len);
+}
+
+@Override
+public void close() throws IOException {
+if (!closed) {
+closed = true;
+super.close();
+in = null;
+}
+}
+}
+private static final class InputStreamSupplier implements
Supplier {
+final Input
svn commit: r64100 - in /release/cxf: 3.5.5/ 3.6.0/ 4.0.1/
Author: dkulp Date: Mon Sep 18 18:48:28 2023 New Revision: 64100 Log: Remove old versions Removed: release/cxf/3.5.5/ release/cxf/3.6.0/ release/cxf/4.0.1/
svn commit: r64099 - in /release/cxf: 3.5.7/ 3.6.2/ 4.0.3/
Author: dkulp Date: Mon Sep 18 18:46:14 2023 New Revision: 64099 Log: Add latest releases Added: release/cxf/3.5.7/ release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz (with props) release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz.asc release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz.sha256 release/cxf/3.5.7/apache-cxf-3.5.7-src.zip (with props) release/cxf/3.5.7/apache-cxf-3.5.7-src.zip.asc release/cxf/3.5.7/apache-cxf-3.5.7-src.zip.sha256 release/cxf/3.5.7/apache-cxf-3.5.7.tar.gz (with props) release/cxf/3.5.7/apache-cxf-3.5.7.tar.gz.asc release/cxf/3.5.7/apache-cxf-3.5.7.tar.gz.sha256 release/cxf/3.5.7/apache-cxf-3.5.7.zip (with props) release/cxf/3.5.7/apache-cxf-3.5.7.zip.asc release/cxf/3.5.7/apache-cxf-3.5.7.zip.sha256 release/cxf/3.6.2/ release/cxf/3.6.2/apache-cxf-3.6.2-src.tar.gz (with props) release/cxf/3.6.2/apache-cxf-3.6.2-src.tar.gz.asc release/cxf/3.6.2/apache-cxf-3.6.2-src.tar.gz.sha256 release/cxf/3.6.2/apache-cxf-3.6.2-src.zip (with props) release/cxf/3.6.2/apache-cxf-3.6.2-src.zip.asc release/cxf/3.6.2/apache-cxf-3.6.2-src.zip.sha256 release/cxf/3.6.2/apache-cxf-3.6.2.tar.gz (with props) release/cxf/3.6.2/apache-cxf-3.6.2.tar.gz.asc release/cxf/3.6.2/apache-cxf-3.6.2.tar.gz.sha256 release/cxf/3.6.2/apache-cxf-3.6.2.zip (with props) release/cxf/3.6.2/apache-cxf-3.6.2.zip.asc release/cxf/3.6.2/apache-cxf-3.6.2.zip.sha256 release/cxf/4.0.3/ release/cxf/4.0.3/apache-cxf-4.0.3-src.tar.gz (with props) release/cxf/4.0.3/apache-cxf-4.0.3-src.tar.gz.asc release/cxf/4.0.3/apache-cxf-4.0.3-src.tar.gz.sha256 release/cxf/4.0.3/apache-cxf-4.0.3-src.zip (with props) release/cxf/4.0.3/apache-cxf-4.0.3-src.zip.asc release/cxf/4.0.3/apache-cxf-4.0.3-src.zip.sha256 release/cxf/4.0.3/apache-cxf-4.0.3.tar.gz (with props) release/cxf/4.0.3/apache-cxf-4.0.3.tar.gz.asc release/cxf/4.0.3/apache-cxf-4.0.3.tar.gz.sha256 release/cxf/4.0.3/apache-cxf-4.0.3.zip (with props) release/cxf/4.0.3/apache-cxf-4.0.3.zip.asc release/cxf/4.0.3/apache-cxf-4.0.3.zip.sha256 Added: release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz == Binary file - no diff available. Propchange: release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz.asc == --- release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz.asc (added) +++ release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz.asc Mon Sep 18 18:46:14 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEUbUtxd1FL5K+NCzChY/ExPQ4VqMFAmUBxZsACgkQhY/ExPQ4 +VqPeFxAAk3OoYGX5CEZzm7ektOHT/0QGm+dXLRD4X40ajgUfMBi0A9vFii7zp+mm +GwnJ+OZ5B5S/LzwSfKxLTHSVubSIxXz/mpl6B9f2Gle/Z4m0bh4p4pwFi+Xi1x6X +eoKIj8K+q+W+3BxuhlFniIuIWtaM8hcv5zr1FMf8y2bdxQiS1Pm2VGJHjiMxOocJ +1wdKQaS8PKkClwOONXWTwfrsBnXSnZyqxZb7eHT1svNKd5ZXsDjKECmI3H164DCU +LyNWkStOnXIU2dv+CKJ3s76m8WfYFkpyHPSb3Q0tuQIzgMCQys9E/kbLuBop9Zr7 +AflhR94D1mLjRkWPQ8p2e5InBZxhUlqbK+8x1L6XDHPlsyvRY8HdkRkdPCFgEXcD +bTanQar6r6Pv0lEK4q0e4S6ovCiX6faoBNHRAdiJckR5utEWT9kRfRXDIhmVsjVJ +3TfOTu8DyorgH4nrl5xtfr8xUhqfJsI+KIunmnzSTrU7lwN3J7WTTGLSmJQbMzBq +YDSoKqXcTl9tTc5tJ22XxpRkAAATLMSoXLkYo8pxg5e2GN4RhxXvb7TDlubZUlTV +/91SPhhgu8Q3mCz2jkJHhPMo9OEI7gIO7IeoknJxv4XX+evdWV1Pm4tpE99Ogb+/ +HxQKMSe10Cw2Sd1kFaTpoWpUvE9fSiPrCSYp+2dzUklxVk88hTw= +=AVNx +-END PGP SIGNATURE- Added: release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz.sha256 == --- release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz.sha256 (added) +++ release/cxf/3.5.7/apache-cxf-3.5.7-src.tar.gz.sha256 Mon Sep 18 18:46:14 2023 @@ -0,0 +1 @@ +8ce6212ca958a53b536eb0ef3c78324eaf3b60f54f9f92b78b29b456b556018b apache-cxf-3.5.7-src.tar.gz Added: release/cxf/3.5.7/apache-cxf-3.5.7-src.zip == Binary file - no diff available. Propchange: release/cxf/3.5.7/apache-cxf-3.5.7-src.zip -- svn:mime-type = application/octet-stream Added: release/cxf/3.5.7/apache-cxf-3.5.7-src.zip.asc == --- release/cxf/3.5.7/apache-cxf-3.5.7-src.zip.asc (added) +++ release/cxf/3.5.7/apache-cxf-3.5.7-src.zip.asc Mon Sep 18 18:46:14 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEUbUtxd1FL5K+NCzChY/ExPQ4VqMFAmUBxZsACgkQhY/ExPQ4 +VqM6mA//YEDa5kC8Tz8j0o//q42hZV7XDjtRg5z4Np1T2ERGeu4LFIZ8aBsWzCQa +QaLbtrLdVEdtSemjcGKeLKkmy0VEUzxbb+cbz9UoZ0+prT0FT+JEFFPfeWviTSv2
[cxf] annotated tag cxf-4.0.3 created (now 48b2939b15)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-4.0.3 in repository https://gitbox.apache.org/repos/asf/cxf.git at 48b2939b15 (tag) tagging 4adb1dc8bbd08f0910c5daef628182fea436523d (commit) replaces cxf-4.0.2 by Daniel Kulp on Wed Sep 13 13:16:01 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-4.0.3 --- No new revisions were added by this update.
[cxf] 01/02: Fix pom for release
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 59631a11f4df7fe556bc12442516b7608567e198
Author: Daniel Kulp
AuthorDate: Wed Sep 13 13:10:37 2023 -0400
Fix pom for release
---
.../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index f1eca202e1..126db79c37 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -83,33 +83,33 @@
org.apache.cxf
cxf-rt-transports-http
-${cxf.version}
+4.0.3-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-${cxf.version}
+4.0.3-SNAPSHOT
org.apache.cxf
cxf-rt-frontend-jaxrs
-${cxf.version}
+4.0.3-SNAPSHOT
org.apache.cxf
cxf-rt-rs-client
-${cxf.version}
-
+4.0.3-SNAPSHOT
+
org.apache.cxf
cxf-integration-tracing-opentelemetry
-${cxf.version}
+4.0.3-SNAPSHOT
org.apache.cxf
cxf-rt-rs-extension-providers
-${cxf.version}
+4.0.3-SNAPSHOT
jakarta.json
[cxf] branch main updated (251b21b314 -> 4adb1dc8bb)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 251b21b314 Switch from wiremock to wiremock-standalone to eliminate dependency issues new 59631a11f4 Fix pom for release new 4adb1dc8bb [maven-release-plugin] prepare release cxf-4.0.3 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: bom/pom.xml | 2 +- core/pom.xml | 2 +- distribution/javadoc/pom.xml | 2 +- distribution/manifest/pom.xml| 2 +- distribution/pom.xml | 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../src/main/release/samples/aegis_standalone/pom.xml| 4 ++-- distribution/src/main/release/samples/callback/pom.xml | 8 .../release/samples/configuration_interceptor/pom.xml| 8 distribution/src/main/release/samples/corba/bank/pom.xml | 2 +- .../release/samples/corba/bank_ws_addressing/pom.xml | 2 +- .../src/main/release/samples/corba/hello_world/pom.xml | 8 .../main/release/samples/groovy_spring_support/pom.xml | 2 +- .../src/main/release/samples/in_jvm_transport/pom.xml| 10 +- .../src/main/release/samples/java_first_jaxws/pom.xml| 2 +- .../samples/java_first_jaxws_factory_bean/pom.xml| 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../src/main/release/samples/java_first_pojo/pom.xml | 8 .../release/samples/java_first_spring_support/pom.xml| 2 +- .../src/main/release/samples/jax_rs/basic/pom.xml| 8 .../release/samples/jax_rs/basic_http2_jetty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_netty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_undertow/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_oidc/pom.xml | 2 +- .../src/main/release/samples/jax_rs/big_query/pom.xml| 2 +- .../release/samples/jax_rs/content_negotiation/pom.xml | 10 +- .../description_openapi_microprofile_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml| 2 +- .../samples/jax_rs/description_openapi_v3_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_web/pom.xml| 2 +- .../main/release/samples/jax_rs/graalvm_basic/pom.xml| 2 +- .../src/main/release/samples/jax_rs/odata/pom.xml| 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../main/release/samples/jax_rs/spring_security/pom.xml | 8 .../src/main/release/samples/jax_rs/sse_cdi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_client/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +- .../main/release/samples/jax_rs/tracing_brave/pom.xml| 4 ++-- .../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 16 .../samples/jax_rs/tracing_opentelemetry_camel/pom.xml | 2 +- .../release/samples/jax_rs/tracing_opentracing/pom.xml | 14 +++--- .../src/main/release/samples/jax_rs/websocket/pom.xml| 10 +- .../main/release/samples/jax_rs/websocket_web/pom.xml| 2 +- .../main/release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml | 10 +- .../main/release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_graalvm/pom.xml | 2 +- .../release/samples/jaxws_graalvm_dynamic/client/pom.xml | 2 +- .../release/samples/jaxws_graalvm_dynamic/server/pom.xml | 2 +- .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../src/main/release/samples/jaxws_spring_boot/pom.xml | 2 +- distribution/src/main/release/samples/jms_pubsub/pom.xml | 4 ++-- distribution/src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../src/main/release/samples/jms_spring_config/pom.xml | 2 +- .../release/samples/js_browser_client_java_first/pom.xml | 10 +- .../release/samples/js_browser_client_simple/pom.xml | 10 +- distribution/src/
[cxf] annotated tag cxf-3.6.2 created (now db85c64878)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-3.6.2 in repository https://gitbox.apache.org/repos/asf/cxf.git at db85c64878 (tag) tagging 752fbd67181d7ae2bf68a632857e5c2f7c6dec6f (commit) replaces cxf-3.6.1 by Daniel Kulp on Wed Sep 13 12:37:28 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-3.6.2 --- No new revisions were added by this update.
[cxf] 01/02: Fix pom for release
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 28b52b5f07282ebedf4fb7900640a97b8ed39b3c
Author: Daniel Kulp
AuthorDate: Wed Sep 13 12:30:32 2023 -0400
Fix pom for release
---
.../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index 24f69f478d..9fd6cf1f55 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -83,33 +83,33 @@
org.apache.cxf
cxf-rt-transports-http
-${cxf.version}
+3.6.2-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-${cxf.version}
+3.6.2-SNAPSHOT
org.apache.cxf
cxf-rt-frontend-jaxrs
-${cxf.version}
+3.6.2-SNAPSHOT
org.apache.cxf
cxf-rt-rs-client
-${cxf.version}
-
+3.6.2-SNAPSHOT
+
org.apache.cxf
cxf-integration-tracing-opentelemetry
-${cxf.version}
+3.6.2-SNAPSHOT
org.apache.cxf
cxf-rt-rs-extension-providers
-${cxf.version}
+3.6.2-SNAPSHOT
jakarta.json
[cxf] branch 3.6.x-fixes updated (212a18113a -> 752fbd6718)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 212a18113a Recording .gitmergeinfo Changes new 28b52b5f07 Fix pom for release new 752fbd6718 [maven-release-plugin] prepare release cxf-3.6.2 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: bom/pom.xml | 2 +- core/pom.xml | 2 +- distribution/javadoc/pom.xml | 2 +- distribution/manifest/pom.xml| 2 +- distribution/pom.xml | 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../src/main/release/samples/aegis_standalone/pom.xml| 4 ++-- distribution/src/main/release/samples/callback/pom.xml | 8 .../samples/clustering/failover_jaxws_osgi/pom.xml | 8 .../release/samples/clustering/failover_server/pom.xml | 10 +- .../release/samples/configuration_interceptor/pom.xml| 8 distribution/src/main/release/samples/corba/bank/pom.xml | 2 +- .../release/samples/corba/bank_ws_addressing/pom.xml | 2 +- .../src/main/release/samples/corba/hello_world/pom.xml | 8 .../main/release/samples/groovy_spring_support/pom.xml | 2 +- .../src/main/release/samples/in_jvm_transport/pom.xml| 10 +- .../src/main/release/samples/java_first_jaxws/pom.xml| 2 +- .../samples/java_first_jaxws_factory_bean/pom.xml| 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../src/main/release/samples/java_first_pojo/pom.xml | 8 .../release/samples/java_first_spring_support/pom.xml| 2 +- .../src/main/release/samples/jax_rs/basic/pom.xml| 8 .../release/samples/jax_rs/basic_http2_jetty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_netty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_undertow/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_oidc/pom.xml | 2 +- .../src/main/release/samples/jax_rs/big_query/pom.xml| 2 +- .../release/samples/jax_rs/content_negotiation/pom.xml | 10 +- .../description_openapi_microprofile_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml| 2 +- .../samples/jax_rs/description_openapi_v3_osgi/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_web/pom.xml| 2 +- .../release/samples/jax_rs/description_swagger2/pom.xml | 8 .../samples/jax_rs/description_swagger2_osgi/pom.xml | 8 .../samples/jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 2 +- .../main/release/samples/jax_rs/graalvm_basic/pom.xml| 2 +- .../src/main/release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/odata/pom.xml| 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../main/release/samples/jax_rs/spring_security/pom.xml | 8 .../src/main/release/samples/jax_rs/sse_cdi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_client/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +- .../main/release/samples/jax_rs/tracing_brave/pom.xml| 4 ++-- .../release/samples/jax_rs/tracing_brave_osgi/pom.xml| 2 +- .../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 16 .../samples/jax_rs/tracing_opentelemetry_osgi/pom.xml| 2 +- .../release/samples/jax_rs/tracing_opentracing/pom.xml | 14 +++--- .../samples/jax_rs/tracing_opentracing_camel/pom.xml | 2 +- .../samples/jax_rs/tracing_opentracing_osgi/pom.xml | 4 ++-- .../src/main/release/samples/jax_rs/websocket/pom.xml| 10 +- .../main/release/samples/jax_rs/websocket_osgi/pom.xml | 2 +- .../main/release/samples/jax_rs/websocket_web/pom.xml| 2 +- .../main/release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml | 10
[cxf] branch 3.5.x-fixes updated (b234adecce -> 4b3f0ec20c)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from b234adecce Recording .gitmergeinfo Changes new 523e3cc81b Fix pom for release new 4b3f0ec20c [maven-release-plugin] prepare release cxf-3.5.7 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: bom/pom.xml | 2 +- core/pom.xml | 2 +- distribution/javadoc/pom.xml | 2 +- distribution/manifest/pom.xml| 2 +- distribution/pom.xml | 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../src/main/release/samples/aegis_standalone/pom.xml| 4 ++-- distribution/src/main/release/samples/callback/pom.xml | 8 .../samples/clustering/failover_jaxws_osgi/pom.xml | 8 .../release/samples/clustering/failover_server/pom.xml | 10 +- .../release/samples/configuration_interceptor/pom.xml| 8 distribution/src/main/release/samples/corba/bank/pom.xml | 2 +- .../release/samples/corba/bank_ws_addressing/pom.xml | 2 +- .../src/main/release/samples/corba/hello_world/pom.xml | 8 .../main/release/samples/groovy_spring_support/pom.xml | 2 +- .../src/main/release/samples/in_jvm_transport/pom.xml| 10 +- .../src/main/release/samples/java_first_jaxws/pom.xml| 2 +- .../samples/java_first_jaxws_factory_bean/pom.xml| 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../src/main/release/samples/java_first_pojo/pom.xml | 8 .../release/samples/java_first_spring_support/pom.xml| 2 +- .../src/main/release/samples/jax_rs/basic/pom.xml| 8 .../release/samples/jax_rs/basic_http2_jetty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_netty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_undertow/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_oidc/pom.xml | 2 +- .../src/main/release/samples/jax_rs/big_query/pom.xml| 2 +- .../release/samples/jax_rs/content_negotiation/pom.xml | 10 +- .../description_openapi_microprofile_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml| 2 +- .../samples/jax_rs/description_openapi_v3_osgi/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_web/pom.xml| 2 +- .../release/samples/jax_rs/description_swagger2/pom.xml | 8 .../samples/jax_rs/description_swagger2_osgi/pom.xml | 8 .../samples/jax_rs/description_swagger2_spring/pom.xml | 10 +- .../samples/jax_rs/description_swagger2_web/pom.xml | 2 +- .../main/release/samples/jax_rs/graalvm_basic/pom.xml| 2 +- .../src/main/release/samples/jax_rs/minimal_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/odata/pom.xml| 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../main/release/samples/jax_rs/spring_security/pom.xml | 8 .../src/main/release/samples/jax_rs/sse_cdi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_client/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_osgi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +- .../main/release/samples/jax_rs/tracing_brave/pom.xml| 4 ++-- .../release/samples/jax_rs/tracing_brave_osgi/pom.xml| 2 +- .../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 14 +++--- .../samples/jax_rs/tracing_opentelemetry_osgi/pom.xml| 2 +- .../release/samples/jax_rs/tracing_opentracing/pom.xml | 14 +++--- .../samples/jax_rs/tracing_opentracing_camel/pom.xml | 2 +- .../samples/jax_rs/tracing_opentracing_osgi/pom.xml | 4 ++-- .../src/main/release/samples/jax_rs/websocket/pom.xml| 10 +- .../main/release/samples/jax_rs/websocket_osgi/pom.xml | 2 +- .../main/release/samples/jax_rs/websocket_web/pom.xml| 2 +- .../main/release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml | 10 +---
[cxf] annotated tag cxf-3.5.7 created (now aa6e941b25)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-3.5.7 in repository https://gitbox.apache.org/repos/asf/cxf.git at aa6e941b25 (tag) tagging 4b3f0ec20cc77ff8b3c04fee44f1cb8ca525f331 (commit) replaces cxf-3.5.6 by Daniel Kulp on Wed Sep 13 10:00:42 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-3.5.7 --- No new revisions were added by this update.
[cxf] 01/02: Fix pom for release
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 523e3cc81bd14ba07716150da1d7c29ad26b8b01
Author: Daniel Kulp
AuthorDate: Wed Sep 13 09:46:59 2023 -0400
Fix pom for release
---
.../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index f4002209b5..46ddf77372 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -83,33 +83,33 @@
org.apache.cxf
cxf-rt-transports-http
-${cxf.version}
+3.5.7-SNAPSHOT
org.apache.cxf
cxf-rt-transports-http-jetty
-${cxf.version}
+3.5.7-SNAPSHOT
org.apache.cxf
cxf-rt-frontend-jaxrs
-${cxf.version}
+3.5.7-SNAPSHOT
org.apache.cxf
cxf-rt-rs-client
-${cxf.version}
+3.5.7-SNAPSHOT
org.apache.cxf
cxf-integration-tracing-opentelemetry
-${cxf.version}
+3.5.7-SNAPSHOT
org.apache.cxf
cxf-rt-rs-extension-providers
-${cxf.version}
+3.5.7-SNAPSHOT
jakarta.json
[cxf] branch 3.5.x-fixes updated: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.5.x-fixes by this push: new b234adecce Recording .gitmergeinfo Changes b234adecce is described below commit b234adeccec608bfb4693d42637a54b0ac077af7 Author: Daniel Kulp AuthorDate: Wed Sep 13 09:11:30 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 4 1 file changed, 4 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 45df5769d3..10bfdf30d2 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -101,6 +101,7 @@ B 493e3b1a9ba7f31ddcf8ccb2cfd82604a988b5cc B 4a7a8b57e712dd05e187cf4de6fd58b9b1236847 B 4b63dbb428488f3a6d0b7114632404b31458a521 B 4cf375c5436f3e806293a73a5bb6a8510f7ac961 +B 4dbfe49da75fe4b036b095ad0bbf92e195f07fcf B 4dd1a221c07430e83a5087206c964a2dc205d3d0 B 4e49ccab53e40384a5bc3cd966b7a8f2636dcbb3 B 4e9cc3b98770fc42065104441e85cc4785626616 @@ -181,6 +182,7 @@ B 86c4b4960df71674490b3bc84fb3ffd72ba5bea5 B 86fb83b21a14bce8cb61fa10e776078162b9d842 B 8782609de7640644614573b0aa728cd229a67a75 B 88e18536962917e2913f25981ded2c9c46558c6a +B 894725bd8bc96397cf6aebda284f70813e03ed96 B 899cd7b1dd6d1cb7a802edcab9d8595a2082d7b8 B 8aad9a1fed5b7f924270c9054cfe50255a17595e B 8ac5ce609c88585fbf4d96907c0a8d947153b27b @@ -206,6 +208,7 @@ B 9741a874147130334dea5ff6d8fa788eb11e822d B 9a6a39f27c261f8bf00d94dd20db922c5675c6a5 B 9b7ce5889159569bcce447da2ed303ed26fc752a B 9bedf1086b69068942ebaf7fb973961912ef275f +B 9c8ae75223a83c618a68adc504d4484d050b68f2 B 9d3cbdb8b30745e1820c7d8a6f904d7b6ca7f08a B 9df8b7373946cc71a7b75ca5c42b4a54103fcc2a B 9dfd633b251479e76ab4a912ae24bb90263e2328 @@ -257,6 +260,7 @@ B ba839e6b1f3ee5c26fd600834ea10227dd4cc317 B baa236c1b3cea938aecb29c5d4aaa704e08c79f9 B bb201d414c49b727865e004db0a6f28d125ad879 B bd27b0d19f960ebbaa98d08e0e4f352ac8c67de4 +B bd6b02a5e8a32ed6109f1a076693adf9b2098c73 B bdcbca177e6daaca70ececf722966a5db5de463d B be8074c6a9186f81e2d6ac6304ac68a4c5c655a4 B bf3c8a94434247be91967465347080191b1165ee
[cxf] branch 3.6.x-fixes updated (4dbfe49da7 -> bd6b02a5e8)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 4dbfe49da7 Update version of ActiveMQ used for testing new 9c8ae75223 Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0 new bd6b02a5e8 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 | 3 +++ parent/pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit bd6b02a5e8a32ed6109f1a076693adf9b2098c73 Author: Daniel Kulp AuthorDate: Wed Sep 13 08:19:46 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 0ac243ad93..162e6c77f1 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -40,6 +40,7 @@ B 3a25cab6172083d26f2cc5f29a134c11214d5131 B 3a9583d5edf20a16dd2fa739a9fb8fbce8168a23 B 3b700961ead8a1c23ef945275bfe4defe22ea81d B 3bb3b0dbe55e2d29b489ea983f6f15fd140bd010 +B 3ca892e21d2c2a778099ac77c262fff9cd34e266 B 3d5564dbff38b782837e291871cd210351acbfc2 B 400ed2294f316c46f5bce5190314e6ab1f504ba8 B 419e1849157cfe0146227dfc3e8da7c693c71045 @@ -332,6 +333,7 @@ M 470e03a82c05c5f353dde861c2b5442acad4f9ad M 474317828798de64b29483f212a43ec03ecf1d39 M 48595425eb69a8db662233991a409fb4e2b38149 M 48a2c301cdb8cc4ffce0480e670b694cca3e6249 +M 49aed0282e3bb6e54a966a342f5ec4f12976c553 M 49b9b597344089ec143129b441eed62e959c81f8 M 4b96bea6a3a2241ce891196fd6eacb34dce0e91d M 4bb4154125648a04d88cb7999f4d054a00e5c79b @@ -677,6 +679,7 @@ M f05bdcfeafebdbe93c6d189514e084ae1d40cac0 M f125c9675817f159fbfc565c0cc0406dcfd2216d M f2ad3c15f9ed98cdbc7cb2abdaa0afda13faae24 M f355ccc3a4bfc7d47485f1b623723e5b2cac96f5 +M f36255ff679264b71a2eda196182c1fcd866d112 M f3ff0735a7e0d8816bf0b43f5d97b54d5f034ff5 M f422bd4caf99c59083cf336f350ec666eeebad26 M f48dc57d5bb4a8848f3b4f9ef5cedcfd9d8ab1b7
[cxf] 01/02: Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 9c8ae75223a83c618a68adc504d4484d050b68f2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Sep 13 02:49:20 2023 + Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0 Bumps [io.specto:hoverfly-java](https://github.com/SpectoLabs/hoverfly-java) from 0.14.4 to 0.15.0. - [Commits](https://github.com/SpectoLabs/hoverfly-java/compare/0.14.4...0.15.0) --- updated-dependencies: - dependency-name: io.specto:hoverfly-java dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] (cherry picked from commit 49aed0282e3bb6e54a966a342f5ec4f12976c553) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8b0cfba156..94f5348a53 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -106,7 +106,7 @@ 3.10.8 3.0.3 3.0.2 -0.14.4 +0.15.0 1.0.1 1.1.1 1.4
[cxf] branch main updated: Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 49aed0282e Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0 49aed0282e is described below commit 49aed0282e3bb6e54a966a342f5ec4f12976c553 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Sep 13 02:49:20 2023 + Bump io.specto:hoverfly-java from 0.14.4 to 0.15.0 Bumps [io.specto:hoverfly-java](https://github.com/SpectoLabs/hoverfly-java) from 0.14.4 to 0.15.0. - [Commits](https://github.com/SpectoLabs/hoverfly-java/compare/0.14.4...0.15.0) --- updated-dependencies: - dependency-name: io.specto:hoverfly-java dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 891931edf8..d6e56bd95e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -114,7 +114,7 @@ 3.10.8 3.0.3 3.0.2 -0.14.4 +0.15.0 2.1.1 1.1.1 1.0.15
[cxf] branch main updated (bf398b0adf -> 3ca892e21d)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from bf398b0adf Add some tests for attachments to both invalid ports and invalid paths add f36255ff67 Update version of xnio used add 3ca892e21d Update release notes for 4.0.3 No new revisions were added by this update. Summary of changes: distribution/src/main/release/release_notes.txt | 103 ++-- parent/pom.xml | 12 +++ rt/transports/http-undertow/pom.xml | 8 ++ systests/rs-sse/rs-sse-undertow/pom.xml | 10 +++ 4 files changed, 90 insertions(+), 43 deletions(-)
[cxf] 01/03: Update version of xnio used
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ffd06bd6cfbdd312d7aaae9e136986417e84579b
Author: Daniel Kulp
AuthorDate: Tue Sep 12 12:44:04 2023 -0400
Update version of xnio used
---
parent/pom.xml | 13 -
rt/transports/http-undertow/pom.xml | 8
systests/rs-sse/rs-sse-undertow/pom.xml | 10 ++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d543c57407..ae5637c26f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -221,7 +221,7 @@
1.8
[1.4,3.0)
[3.3,4.0)
-2.2.24.Final
+2.2.26.Final
@@ -236,6 +236,7 @@
2.4.2
2.12.2
2.3.1
+3.8.9.Final
2.1
@@ -1246,6 +1247,16 @@
jboss-logging
${cxf.jboss.logging.version}
+
+org.jboss.xnio
+xnio-nio
+${cxf.xnio.version}
+
+
+org.jboss.xnio
+xnio-api
+${cxf.xnio.version}
+
org.wildfly.common
wildfly-common
diff --git a/rt/transports/http-undertow/pom.xml
b/rt/transports/http-undertow/pom.xml
index ac6c714626..d5f47b16cb 100644
--- a/rt/transports/http-undertow/pom.xml
+++ b/rt/transports/http-undertow/pom.xml
@@ -89,6 +89,14 @@
io.undertow
undertow-servlet
+
+org.jboss.xnio
+xnio-nio
+
+
+org.jboss.xnio
+xnio-api
+
${cxf.servlet-api.group}
${cxf.servlet-api.artifact}
diff --git a/systests/rs-sse/rs-sse-undertow/pom.xml
b/systests/rs-sse/rs-sse-undertow/pom.xml
index a7980e44b3..caec274209 100644
--- a/systests/rs-sse/rs-sse-undertow/pom.xml
+++ b/systests/rs-sse/rs-sse-undertow/pom.xml
@@ -45,6 +45,16 @@
undertow-servlet
test
+
+org.jboss.xnio
+xnio-nio
+test
+
+
+org.jboss.xnio
+xnio-api
+test
+
org.apache.cxf.systests
cxf-systests-rs-sse-base
[cxf] branch 3.6.x-fixes updated (ebafb13096 -> 4dbfe49da7)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from ebafb13096 Recording .gitmergeinfo Changes new ffd06bd6cf Update version of xnio used new 894725bd8b Update rleease notes for 3.6.2 new 4dbfe49da7 Update version of ActiveMQ used for testing The 3 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: distribution/src/main/release/release_notes.txt | 99 +++-- parent/pom.xml | 19 - rt/transports/http-undertow/pom.xml | 8 ++ rt/transports/jms/pom.xml | 4 + systests/rs-sse/rs-sse-undertow/pom.xml | 10 +++ 5 files changed, 131 insertions(+), 9 deletions(-)
[cxf] 03/03: Update version of ActiveMQ used for testing
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 4dbfe49da75fe4b036b095ad0bbf92e195f07fcf Author: Daniel Kulp AuthorDate: Tue Sep 12 14:22:17 2023 -0400 Update version of ActiveMQ used for testing --- parent/pom.xml| 6 +- rt/transports/jms/pom.xml | 4 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index ae5637c26f..8b0cfba156 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -77,7 +77,7 @@ [0,3) -5.16.3 +5.17.5 2.12.3 1.6.0.Final 2.0.1.Final @@ -1723,6 +1723,10 @@ com.google.guava guava + +javax.annotation +javax.annotation-api + diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml index 740b224e91..d37b93a901 100644 --- a/rt/transports/jms/pom.xml +++ b/rt/transports/jms/pom.xml @@ -41,6 +41,10 @@ jakarta.transaction jakarta.transaction-api + +jakarta.annotation +jakarta.annotation-api + org.apache.cxf cxf-core
[cxf] 02/03: Update rleease notes for 3.6.2
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 894725bd8bc96397cf6aebda284f70813e03ed96 Author: Daniel Kulp AuthorDate: Tue Sep 12 14:22:06 2023 -0400 Update rleease notes for 3.6.2 --- distribution/src/main/release/release_notes.txt | 99 +++-- 1 file changed, 92 insertions(+), 7 deletions(-) diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index 4bfe6796d5..0fe545b9dc 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,4 +1,4 @@ -Apache CXF 3.6.1 Release Notes +Apache CXF 3.6.2 Release Notes 1. Overview @@ -24,7 +24,7 @@ http://cxf.apache.org/docs/36-migration-guide.html for further information and requirements for upgrading from earlier versions of CXF. -3.6.1 fixes over 5 issues reported by users. +3.6.2 fixes over 53 issues/tasks reported by users. 2. Installation Prerequisites @@ -67,15 +67,100 @@ for caveats when upgrading. 7. Release Notes ** Sub-task -* [CXF-8606] - Introduce HTTP/2 Transport: client-side support (Netty & HttpClient 5) +* [CXF-8842] - Get rid of EasyMock in cxf-core +* [CXF-8843] - Get rid of EasyMock in cxf-integration-jca +* [CXF-8844] - Get rid of EasyMock in cxf-rt-bindings-coloc +* [CXF-8845] - Get rid of EasyMock in cxf-rt-bindings-corba +* [CXF-8846] - Get rid of EasyMock in cxf-rt-bindings-soap +* [CXF-8847] - Get rid of EasyMock in cxf-rt-databinding-aegis +* [CXF-8848] - Get rid of EasyMock in cxf-rt-databinding-jaxb +* [CXF-8849] - Get rid of EasyMock in cxf-rt-features-clustering +* [CXF-8850] - Get rid of EasyMock in cxf-rt-features-logging +* [CXF-8851] - Get rid of EasyMock in cxf-rt-features-throttling +* [CXF-8852] - Get rid of EasyMock in cxf-services-xkms-x509-repo-ldap +* [CXF-8853] - Get rid of EasyMock in cxf-services-xkms-x509-handlers +* [CXF-8854] - Get rid of EasyMock in cxf-rt-wsdl +* [CXF-8855] - Get rid of EasyMock in cxf-rt-ws-transfer +* [CXF-8856] - Get rid of EasyMock in cxf-rt-frontend-jaxrs +* [CXF-8857] - Get rid of EasyMock in cxf-rt-frontend-jaxws +* [CXF-8858] - Get rid of EasyMock in cxf-rt-frontend-js +* [CXF-8859] - Get rid of EasyMock in cxf-rt-ws-security +* [CXF-8860] - Get rid of EasyMock in cxf-rt-ws-rm +* [CXF-8861] - Get rid of EasyMock in cxf-rt-ws-policy +* [CXF-8862] - Get rid of EasyMock in cxf-rt-ws-addr +* [CXF-8863] - Get rid of EasyMock in cxf-rt-transports-websocket +* [CXF-8864] - Get rid of EasyMock in cxf-rt-transports-jms +* [CXF-8865] - Get rid of EasyMock in cxf-rt-management +* [CXF-8866] - Get rid of EasyMock in cxf-rt-rs-service-description +* [CXF-8867] - Get rid of EasyMock in cxf-rt-rs-client +* [CXF-8868] - Get rid of EasyMock in cxf-rt-rs-extension-providers +* [CXF-8869] - Get rid of EasyMock in cxf-rt-rs-extension-search +* [CXF-8870] - Get rid of EasyMock in cxf-rt-transports-http-undertow +* [CXF-8871] - Get rid of EasyMock in cxf-rt-rs-mp-client +* [CXF-8872] - Get rid of EasyMock in cxf-rt-rs-security-oauth2 +* [CXF-8873] - Get rid of EasyMock in cxf-rt-rs-security-oauth2-saml +* [CXF-8874] - Get rid of EasyMock in cxf-rt-rs-security-sso-oidc +* [CXF-8876] - Get rid of EasyMock in cxf-rt-transports-http-jetty +* [CXF-8877] - Get rid of EasyMock in cxf-rt-transports-http-netty-client +* [CXF-8878] - Get rid of EasyMock in cxf-rt-transports-http-netty-server +* [CXF-8890] - Get rid of EasyMock in cxf-rt-transports-http +* [CXF-8917] - Get rid of EasyMock in cxf-rt-transports-http-hc +* [CXF-8921] - Get rid of EasyMock in cxf-rt-rs-service-description-swagger ** Bug -* [CXF-8881] - WSDLValidator link doesn't work -* [CXF-8882] - Apache HttpClient 5 async conduit does not handle authentication -* [CXF-8884] - Update commons-jexl3 to 3.3 +* [CXF-8885] - HttpClient SelectorManager threads run indefinitely causing OOM +* [CXF-8886] - JavaDocProvider does not work with JDK 17 and beyond +* [CXF-8892] - CXF build on Windows is broken (test failures) +* [CXF-8895] - Deadlock instead of timeout with new HttpClientHTTPConduit using large payloads +* [CXF-8903] - Too many open files error in HttpClientHTTPConduit +* [CXF-8905] - TransportURIResolver doesn't honor the property setting in bus +* [CXF-8907] - java.lang.NullPointerException at AsymmetricBindingHandler.java +* [CXF-8914] - No content-length header after upgrade CXF from 3.5.6 to 3.6.1 +* [CXF-8918] - Upgrade xnio-nio jar to latest version (3.8.8+) to get rid of CVE-2022-0084 +* [CXF-8920] - Can't filter when collection has attribute of type LocalDate or LocalDateTime +* [CXF-8925] - Logging twice in case of faults happe
[cxf] branch 3.5.x-fixes updated (4a86b7d210 -> ad5cae2a93)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 4a86b7d210 Recording .gitmergeinfo Changes new 783037b216 Update some dep versions for commons things new 52d8b56b10 Update to latest xmlschema new 51505c1101 Recording .gitmergeinfo Changes new b368aa9bb8 Update version of xnio used new ad5cae2a93 Update release notes for 3.5.7 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 | 4 +++ distribution/src/main/release/release_notes.txt | 37 + parent/pom.xml | 21 ++ rt/transports/http-undertow/pom.xml | 8 ++ systests/rs-sse/rs-sse-undertow/pom.xml | 10 +++ 5 files changed, 57 insertions(+), 23 deletions(-)
[cxf] 03/05: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 51505c11010a74418d0a12feeeaa6e9ba76e0022 Author: Daniel Kulp AuthorDate: Tue Sep 12 12:09:01 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 4 1 file changed, 4 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 3cbe7feaa9..45df5769d3 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -167,6 +167,7 @@ B 805cfde2da7924f245807e3ac0c401268d02dd3e B 80e82a53cc4efe5eb9649de614c51fa07b5b8be3 B 81af252a18835f9118249eac2cc87abb4e9d3506 B 8252a18d68b994129a6adbcfe1330f67020eb4f0 +B 82c2224e4b7b890860bddf61af28498b7c6bc341 B 8311c0ea9783697307e616bd4c3f669e8396eab3 B 83909463eb6b905b983208a6b084a97f2e91ab0f B 849ad290b10946cb07183ab6df775c9b66fb59af @@ -194,6 +195,7 @@ B 916ed55237f8600f9980ff81c6e9f3bed0c26418 B 91ab6c7e750426a64e6a5b4fbed2ea4b8b6b75c8 B 92f5d20576e3f424f03f988dbdfb8b5e813bb5f7 B 9313c2a54131b44e8f9c4332671e881bfc35a01e +B 9329faac7a89979c118dc9b0dcd784245f28ff24 B 937fb0646cca5d15eda0f9d131309bc9c4871de9 B 93dd95007be0ac506ae4bf56d1ed25544831c8cb B 959404f8cc72a91a9ed108bf407c500ed2764688 @@ -319,6 +321,7 @@ B e9ca1a75d8f232b2cea6c3c6b375bb6222cb0461 B ea0212e271a1df063cba57b80d658d78efe5eb1f B eb54ef785deb4d58def825feb9852ebe68b6b5b8 B eba0b1be2f33b250956beab6bd4a371f6c55fb05 +B ebafb13096e9b9126894ef1e927dbe143976d3ab B ee814f4de36be5c0ba72de24ae41ecdf32efdbb7 B eeed584b8134dad9ca9ddb059f54c360b7005794 B ef369f2efd144ac4fec2fac43e1805a794e777a6 @@ -496,6 +499,7 @@ M 77bf6ad084d900e11832b5b9b15ec6291be58732 M 7853be3288f065a4181f178c1bc49edff663af1c M 78f90b6d6f0985ecc2277c37bbaaa594b0adb78d M 7a4d0b1b6b71e5253e6a4e21b45e4b6fd1d714ae +M 7aa75bd3106998464daaf6f567afb569b13e3ef1 M 7b2e7af4f94bd26db08866fd24563df53af8977c M 7ce7ebb281c5cb9f335de28c30fdf97fac9b852c M 7fb5cdd08ab862f60bb867086e0d667bf4333f37
[cxf] 05/05: Update release notes for 3.5.7
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit ad5cae2a93e85a8779cd83baf31f7ed099d0cf40 Author: Daniel Kulp AuthorDate: Tue Sep 12 12:45:19 2023 -0400 Update release notes for 3.5.7 --- distribution/src/main/release/release_notes.txt | 37 + 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index 64c9292298..6a72300e97 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,4 +1,4 @@ -Apache CXF 3.5.6 Release Notes +Apache CXF 3.5.7 Release Notes 1. Overview @@ -31,7 +31,7 @@ for further information and requirements for upgrading from earlier versions of CXF. -3.5.6 fixes over 15 JIRA issues reported by users and the community. +3.5.7 fixes over 12 JIRA issues reported by users and the community. 2. Installation Prerequisites @@ -73,24 +73,25 @@ for caveats when upgrading. 7. Specific issues, features, and improvements fixed in this version - ** Sub-task -* [CXF-8815] - Fix org.apache.cxf.transport.http.asyncclient.hc5.AsyncHTTPConduitTest.testResponseSameBufferSize -* [CXF-8830] - Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce +* [CXF-8606] - Introduce HTTP/2 Transport: client-side support (Netty & HttpClient 5) +* [CXF-8877] - Get rid of EasyMock in cxf-rt-transports-http-netty-client ** Bug -* [CXF-8669] - Multipart annotation not working 3.4.6 onwards. -* [CXF-8745] - MemoryLeak when using SpringBus in a spring context which has a reusable parent context -* [CXF-8797] - NameBinding ignored when implementing interface -* [CXF-8810] - Exception on cxf-rt-transports-http-hc Osgi startup -* [CXF-8816] - Deflater and Inflater initialized with different 'nowrap' value -* [CXF-8822] - AsyncHTTPConduit removes query-parameters when path is empty -* [CXF-8824] - CDI beans produced by @Produces methods are generated twice -* [CXF-8826] - AsyncHTTPConduit (hc5) - Unexpected EOF during response processing -* [CXF-8833] - GZIPInInterceptor, when processing HTTP 204 empty response, throws EOFException -* [CXF-8837] - Allow P11 RSA Keys within JwsUtils -* [CXF-8839] - Missing dependency on plexus-utils in cxf-wsdl-validator-plugin +* [CXF-8881] - WSDLValidator link doesn't work +* [CXF-8882] - Apache HttpClient 5 async conduit does not handle authentication +* [CXF-8884] - Update commons-jexl3 to 3.3 +* [CXF-8886] - JavaDocProvider does not work with JDK 17 and beyond +* [CXF-8907] - java.lang.NullPointerException at AsymmetricBindingHandler.java +* [CXF-8918] - Upgrade xnio-nio jar to latest version (3.8.8+) to get rid of CVE-2022-0084 +* [CXF-8920] - Can't filter when collection has attribute of type LocalDate or LocalDateTime +* [CXF-8925] - Logging twice in case of faults happening after pre-stream phase in out-chain ** Improvement -* [CXF-8809] - Migrate LDAP systest cases from ApacheDS to UnboundID LDAP -* [CXF-8835] - Upgrade to Spring 5.3.26 +* [CXF-8457] - Provide OpenTelemetry support +* [CXF-8802] - Update to Maven Remote Resources Plugin 3.1.0 +* [CXF-8901] - Update Guava to 32.1.1 (solving CVE-2023-2976) + + + +
[cxf] 02/05: Update to latest xmlschema
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 52d8b56b1022280d7bbb6004e3e8d7a07e061197 Author: Daniel Kulp AuthorDate: Mon Sep 11 10:32:46 2023 -0400 Update to latest xmlschema (cherry picked from commit 1ba515ec4125aa0f104a251a7b4f386400fa0d95) # Conflicts: # parent/pom.xml (cherry picked from commit 361de693864cf2cb526338d5a66f5e3ae538a80b) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9b3dc0af28..e6f228b965 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -236,7 +236,7 @@ 1.6.3 2.4.2 2.12.2 -2.3.0 +2.3.1 2.1
[cxf] 04/05: Update version of xnio used
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b368aa9bb86ab0c902f5d894985ec342085bcbba
Author: Daniel Kulp
AuthorDate: Tue Sep 12 12:44:04 2023 -0400
Update version of xnio used
---
parent/pom.xml | 13 -
rt/transports/http-undertow/pom.xml | 8
systests/rs-sse/rs-sse-undertow/pom.xml | 10 ++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e6f228b965..a91bb1305c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -222,7 +222,7 @@
1.8
[1.4,3.0)
[3.3,4.0)
-2.2.24.Final
+2.2.26.Final
@@ -237,6 +237,7 @@
2.4.2
2.12.2
2.3.1
+3.8.9.Final
2.1
@@ -1231,6 +1232,16 @@
jboss-logging
${cxf.jboss.logging.version}
+
+org.jboss.xnio
+xnio-nio
+${cxf.xnio.version}
+
+
+org.jboss.xnio
+xnio-api
+${cxf.xnio.version}
+
org.wildfly.common
wildfly-common
diff --git a/rt/transports/http-undertow/pom.xml
b/rt/transports/http-undertow/pom.xml
index fa17d2e47a..fc55b4c088 100644
--- a/rt/transports/http-undertow/pom.xml
+++ b/rt/transports/http-undertow/pom.xml
@@ -89,6 +89,14 @@
io.undertow
undertow-servlet
+
+org.jboss.xnio
+xnio-nio
+
+
+org.jboss.xnio
+xnio-api
+
${cxf.servlet-api.group}
${cxf.servlet-api.artifact}
diff --git a/systests/rs-sse/rs-sse-undertow/pom.xml
b/systests/rs-sse/rs-sse-undertow/pom.xml
index e21f0e4253..1e540c1f65 100644
--- a/systests/rs-sse/rs-sse-undertow/pom.xml
+++ b/systests/rs-sse/rs-sse-undertow/pom.xml
@@ -45,6 +45,16 @@
undertow-servlet
test
+
+org.jboss.xnio
+xnio-nio
+test
+
+
+org.jboss.xnio
+xnio-api
+test
+
org.apache.cxf.systests
cxf-systests-rs-sse-base
[cxf] 01/05: Update some dep versions for commons things
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 783037b21663db27e49fe553734f0d306bbb1717 Author: Daniel Kulp AuthorDate: Tue Sep 12 08:53:39 2023 -0400 Update some dep versions for commons things (cherry picked from commit 7aa75bd3106998464daaf6f567afb569b13e3ef1) --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6c4fd5634f..9b3dc0af28 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -97,10 +97,10 @@ 2.0.2 4.8.25 1.5.1 -1.15 -2.11.0 +1.16.0 +2.13.0 2.2.1 -3.12.0 +3.13.0 1.2 1.10.0 10.14.2.0
[cxf] branch 3.6.x-fixes updated (2f9cc772e8 -> ebafb13096)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 2f9cc772e8 Recording .gitmergeinfo Changes new 9329faac7a Exlude transitive dep to xml-apis to avoid Java17 module issues new 7aa75bd310 Update some dep versions for commons things new 361de69386 Update to latest xmlschema new 82c2224e4b Add some tests for attachments to both invalid ports and invalid paths new ebafb13096 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 + parent/pom.xml | 8 +- .../cxf/systest/jaxrs/JAXRSMultipartTest.java | 81 ++- .../cxf/systest/swa/ClientServerSwaTest.java | 237 +++-- systests/transports/pom.xml| 6 + 5 files changed, 264 insertions(+), 76 deletions(-)
[cxf] 05/05: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit ebafb13096e9b9126894ef1e927dbe143976d3ab Author: Daniel Kulp AuthorDate: Tue Sep 12 08:57:23 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 8 1 file changed, 8 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 11ecf3813d..0ac243ad93 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -41,6 +41,7 @@ B 3a9583d5edf20a16dd2fa739a9fb8fbce8168a23 B 3b700961ead8a1c23ef945275bfe4defe22ea81d B 3bb3b0dbe55e2d29b489ea983f6f15fd140bd010 B 3d5564dbff38b782837e291871cd210351acbfc2 +B 400ed2294f316c46f5bce5190314e6ab1f504ba8 B 419e1849157cfe0146227dfc3e8da7c693c71045 B 43e1aa22d5498bc0a324fc57292e241c42e7ea0c B 448ce7865eae2f20208e238af2ad1e795d359ed7 @@ -122,6 +123,7 @@ B c4f3d9665f242bfcf143388933ddb89dd725bd3b B c56c9797b8bc92570d48e6618fe8f450a0d188db B c788d82cb02b3257d3ec560de0df4a6130ba93e9 B c7b4aa0adcf465b43f5088a9be6ec5969e47a6db +B c9c962bce36e24c38e7bc1fe0982b5592dc4bcb8 B cad4f0b76bb79f82a5ef4bc7e435e93996eb884b B cb00226811f39d36b4f91106be94fd889c426005 B cd2a2a2f6663c5c401f1a7ba35e520503edc2e94 @@ -134,6 +136,7 @@ B cfe9f430ee617552eb743140cb78cc5df4c4eb83 B d31e1a35f56b28c7c06800364434b10aee90ce24 B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8 B dc5e818f5a8387e7009bc4471b5a032428cfb3cc +B dd10616afd0142e9e8b95af2aad2635218fd91b0 B ddcc93f12758a13cb4ce98c3d76a68f207ba674f B de2de41e48fca5743d206d1fb9426fb6ccae5061 B df7fe8b569a7b8825ab6181a3ea0aab2a2493858 @@ -142,6 +145,7 @@ B e277f0c2bb0e09b8dc550e0eddcda9d8362eb09a B e476d83ee9ca5c01d6098a14bd4d5d9bc847eca7 B e4a3e2493825ebae748ef8cd6e2f8c148fd4303d B e7157bb371804a15e3c78351c9b506776bcbdeda +B e787cf9f346788069b8e84c46fd6a3ca7a883857 B e8ea9fbbff58bde7dac7c8336a25c9bb92bad62e B e94ea49b2a328e641673a0940dcab8cb0d37c5a3 B ea334cd2a0fbe25d570138a7c937c64c5e304a36 @@ -226,6 +230,7 @@ M 1a3bc6682d9ed7c59068e7abb312a7af847e50fa M 1a434023d792e352785e0be73815560fcae1efe4 M 1b04ad8026a8ad0dcd203ece3e435f50fac681cc M 1b078aa212ee17050bad33dc7d6f61b22785afad +M 1ba515ec4125aa0f104a251a7b4f386400fa0d95 M 1c17991a4b6ae93a4634583919692ff3da483c81 M 1d92d5abc7913e0ef77f234ee0200d4b0e72ca85 M 1e4658323353b57ab3b7f07bc0ac1951256b8ac7 @@ -237,6 +242,7 @@ M 1e9e61a3765318c7706a1886733fd45fe2f2f977 M 1ecc24d817d4ef0cba4a4079a1c69abf33d1ad9b M 1ee1c8fa5321a06d7814707c2e350742f34e92fb M 1f62de8deb593a6e76514fb6e340b91afbaf493e +M 1f829190e583560ea4bf72ea0bc67ec277884c5e M 1ff9472aed179c1dbb36c2cbfb96a742ade7c54e M 2068929ab7277b8c1d9dcd5609838185f2e734e9 M 2083c29ed066576be424b99b57dfea9cdd90c581 @@ -562,6 +568,7 @@ M bbf73a155bf4d87d824e00e54c269fb4e697468e M bca28f3d8c69edd370d877077b761087699c02d1 M bd0ec6e3280990c685366e8857e266cc43f4670e M be82565592c74765f4e899ee242ff6bb8e3f338b +M bf398b0adfd3ed9047c694560abaad048759f564 M bf5b532815a84fba7f35156d637c54c75248a6cb M bfc96878264bde108a3ca64644b564b12f54a5c8 M bfe1e8588de4d0957eb8957a8ea0e2e293a9257b @@ -611,6 +618,7 @@ M d4f4b7712b3c8c5c684fa4fa0a28758d9a27cef3 M d505b2327c8695054d775d034c3e4c1ec9af7490 M d6201134428dc4b219071e271a99b62c6f959a58 M d62ffb116bf1725f9c1eaa66f1e32a1e0dafae6e +M d66d693166bcc08c8b911a0c05cab3cb97958f3a M d699ac68c040a4e4f110ac31b3b15497a97ed877 M d6d29ddea0eb9c57e576b124dc29b4ed39eb066e M d6e11ccc73ab0bec25d724d81852761d6f53f82f
[cxf] 01/05: Exlude transitive dep to xml-apis to avoid Java17 module issues
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 9329faac7a89979c118dc9b0dcd784245f28ff24 Author: Daniel Kulp AuthorDate: Wed Aug 30 12:08:58 2023 -0400 Exlude transitive dep to xml-apis to avoid Java17 module issues (cherry picked from commit 1f829190e583560ea4bf72ea0bc67ec277884c5e) # Conflicts: # systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java --- systests/transports/pom.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml index aa1cc278cc..9d74defc75 100644 --- a/systests/transports/pom.xml +++ b/systests/transports/pom.xml @@ -236,6 +236,12 @@ net.sourceforge.nekohtml nekohtml 1.9.22 + + +xml-apis +xml-apis + + org.springframework
[cxf] 04/05: Add some tests for attachments to both invalid ports and invalid paths
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 82c2224e4b7b890860bddf61af28498b7c6bc341
Author: Daniel Kulp
AuthorDate: Tue Sep 12 08:49:49 2023 -0400
Add some tests for attachments to both invalid ports and invalid paths
(cherry picked from commit bf398b0adfd3ed9047c694560abaad048759f564)
---
.../cxf/systest/jaxrs/JAXRSMultipartTest.java | 81 ++-
.../cxf/systest/swa/ClientServerSwaTest.java | 237 +++--
2 files changed, 246 insertions(+), 72 deletions(-)
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
index 1dfc1a414d..b9e17f549d 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
@@ -75,6 +75,7 @@ import org.apache.http.entity.mime.content.ByteArrayBody;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
+import org.springframework.util.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -89,6 +90,7 @@ import static org.junit.Assert.assertTrue;
public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
public static final String PORT = MultipartServer.PORT;
+public static final String PORTINV =
allocatePort(JAXRSMultipartTest.class, 1);
@BeforeClass
public static void startServers() throws Exception {
@@ -181,7 +183,7 @@ public class JAXRSMultipartTest extends
AbstractBusClientServerTestBase {
String address = "http://localhost:; + PORT +
"/bookstore/books/attachments";
InputStream is =
getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/attachmentData");
-//create a stream that sticks a bunch of data for the attachement to
cause the
+//create a stream that sticks a bunch of data for the attachment to
cause the
//server to buffer the attachment to disk.
PushbackInputStream buf = new PushbackInputStream(is, 1024 * 20) {
int bcount = -1;
@@ -211,6 +213,83 @@ public class JAXRSMultipartTest extends
AbstractBusClientServerTestBase {
};
doAddBook("multipart/related", address, buf, 413);
assertEquals(orig, countTempFiles());
+}
+@Test
+public void testBookAsMassiveAttachmentInvalidPath() throws Exception {
+int orig = countTempFiles();
+String address = "http://localhost:; + PORT +
"/INVALID/bookstore/books/attachments";
+InputStream is =
+
getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/attachmentData");
+//create a stream that sticks a bunch of data for the attachment to
cause the
+//server to buffer the attachment to disk.
+PushbackInputStream buf = new PushbackInputStream(is, 1024 * 20) {
+int bcount = -1;
+@Override
+public int read(byte[] b, int offset, int len) throws IOException {
+if (bcount >= 0 && bcount < 1024 * 5000) {
+for (int x = 0; x < len; x++) {
+b[offset + x] = (byte)x;
+}
+bcount += len;
+return len;
+}
+int i = super.read(b, offset, len);
+for (int x = 0; x < i - 5; x++) {
+if (b[x + offset] == '*'
+&& b[x + offset + 1] == '*'
+&& b[x + offset + 2] == 'D'
+&& b[x + offset + 3] == '*'
+&& b[x + offset + 4] == '*') {
+super.unread(b, x + offset + 5, i - x - 5);
+i = x;
+bcount = 0;
+}
+}
+return i;
+}
+};
+doAddBook("multipart/related", address, buf, 404);
+assertEquals(orig, countTempFiles());
+}
+@Test
+public void testBookAsMassiveAttachmentInvalidPort() throws Exception {
+String address = "http://localhost:; + PORTINV +
"/bookstore/books/attachments";
+InputStream is =
+
getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/attachmentData");
+//create a stream that sticks a bunch of data for the attachment to
cause the
+//server to buffer the attachment to disk.
+PushbackInputStream buf = new PushbackInputStream(is, 1024 * 20) {
+int bcount = -1;
[cxf] 02/05: Update some dep versions for commons things
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 7aa75bd3106998464daaf6f567afb569b13e3ef1 Author: Daniel Kulp AuthorDate: Tue Sep 12 08:53:39 2023 -0400 Update some dep versions for commons things --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 299e9ba716..ae260f7e1e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -93,10 +93,10 @@ 2.0.2 4.8.25 1.5.1 -1.15 -2.11.0 +1.16.0 +2.13.0 2.2.1 -3.12.0 +3.13.0 1.2 1.10.0 10.15.2.0
[cxf] 03/05: Update to latest xmlschema
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 361de693864cf2cb526338d5a66f5e3ae538a80b Author: Daniel Kulp AuthorDate: Mon Sep 11 10:32:46 2023 -0400 Update to latest xmlschema (cherry picked from commit 1ba515ec4125aa0f104a251a7b4f386400fa0d95) # 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 ae260f7e1e..d543c57407 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -235,7 +235,7 @@ 1.6.3 2.4.2 2.12.2 -2.3.0 +2.3.1 2.1
[cxf] branch main updated: Add some tests for attachments to both invalid ports and invalid paths
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new bf398b0adf Add some tests for attachments to both invalid ports and
invalid paths
bf398b0adf is described below
commit bf398b0adfd3ed9047c694560abaad048759f564
Author: Daniel Kulp
AuthorDate: Tue Sep 12 08:49:49 2023 -0400
Add some tests for attachments to both invalid ports and invalid paths
---
.../cxf/systest/jaxrs/JAXRSMultipartTest.java | 81 ++-
.../cxf/systest/swa/ClientServerSwaTest.java | 237 +++--
2 files changed, 246 insertions(+), 72 deletions(-)
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
index 842a634aca..5bfbb4cbec 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
@@ -75,6 +75,7 @@ import org.apache.http.entity.mime.content.ByteArrayBody;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
+import org.springframework.util.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -89,6 +90,7 @@ import static org.junit.Assert.assertTrue;
public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
public static final String PORT = MultipartServer.PORT;
+public static final String PORTINV =
allocatePort(JAXRSMultipartTest.class, 1);
@BeforeClass
public static void startServers() throws Exception {
@@ -181,7 +183,7 @@ public class JAXRSMultipartTest extends
AbstractBusClientServerTestBase {
String address = "http://localhost:; + PORT +
"/bookstore/books/attachments";
InputStream is =
getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/attachmentData");
-//create a stream that sticks a bunch of data for the attachement to
cause the
+//create a stream that sticks a bunch of data for the attachment to
cause the
//server to buffer the attachment to disk.
PushbackInputStream buf = new PushbackInputStream(is, 1024 * 20) {
int bcount = -1;
@@ -211,6 +213,83 @@ public class JAXRSMultipartTest extends
AbstractBusClientServerTestBase {
};
doAddBook("multipart/related", address, buf, 413);
assertEquals(orig, countTempFiles());
+}
+@Test
+public void testBookAsMassiveAttachmentInvalidPath() throws Exception {
+int orig = countTempFiles();
+String address = "http://localhost:; + PORT +
"/INVALID/bookstore/books/attachments";
+InputStream is =
+
getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/attachmentData");
+//create a stream that sticks a bunch of data for the attachment to
cause the
+//server to buffer the attachment to disk.
+PushbackInputStream buf = new PushbackInputStream(is, 1024 * 20) {
+int bcount = -1;
+@Override
+public int read(byte[] b, int offset, int len) throws IOException {
+if (bcount >= 0 && bcount < 1024 * 5000) {
+for (int x = 0; x < len; x++) {
+b[offset + x] = (byte)x;
+}
+bcount += len;
+return len;
+}
+int i = super.read(b, offset, len);
+for (int x = 0; x < i - 5; x++) {
+if (b[x + offset] == '*'
+&& b[x + offset + 1] == '*'
+&& b[x + offset + 2] == 'D'
+&& b[x + offset + 3] == '*'
+&& b[x + offset + 4] == '*') {
+super.unread(b, x + offset + 5, i - x - 5);
+i = x;
+bcount = 0;
+}
+}
+return i;
+}
+};
+doAddBook("multipart/related", address, buf, 404);
+assertEquals(orig, countTempFiles());
+}
+@Test
+public void testBookAsMassiveAttachmentInvalidPort() throws Exception {
+String address = "http://localhost:; + PORTINV +
"/bookstore/books/attachments";
+InputStream is =
+
getClass().getResourceAsStream("/org/apache/cxf/systest/jaxrs/resources/attachmentData");
+//create a stream that sticks a bunch of data for the attachment to
cause the
+//server to buffer the attachment to disk.
+
[cxf] branch main updated: Update to latest xmlschema
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 1ba515ec41 Update to latest xmlschema 1ba515ec41 is described below commit 1ba515ec4125aa0f104a251a7b4f386400fa0d95 Author: Daniel Kulp AuthorDate: Mon Sep 11 10:32:46 2023 -0400 Update to latest xmlschema --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a6ea6195ac..ca66e7eac0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -236,7 +236,7 @@ 4.2.1 1.6.3 3.0.1 -2.3.0 +2.3.1 2.1 2.16.4
[cxf] branch main updated (345eefc777 -> d66d693166)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 345eefc777 Update Wiremock to 3.0.2 add d66d693166 Couple of minor dependency version bumps No new revisions were added by this update. Summary of changes: parent/pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
[cxf] 02/04: TransportURIResolver replaces the InputStream, but doesn't close the original.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5e99df45a0ca001c9606b86cf340c75760f3a220
Author: Daniel Kulp
AuthorDate: Tue Sep 5 08:44:50 2023 -0400
TransportURIResolver replaces the InputStream, but doesn't close the
original.
(cherry picked from commit 86cb53f39b3f14fee17a601a70cfcf04a2bbc40f)
---
.../java/org/apache/cxf/transport/TransportURIResolver.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
index 4c1446ef04..752b1f0f8c 100644
--- a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
+++ b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
@@ -112,7 +112,7 @@ public class TransportURIResolver extends
ExtendedURIResolver {
// set the endpointInfo name which could be used for
configuration
info.setName(new QName("http://cxf.apache.org;,
"TransportURIResolver"));
info.setAddress(base.toString());
-final Conduit c = ci.getConduit(info, bus);
+Conduit c = ci.getConduit(info, bus);
Message message = new MessageImpl();
Exchange exch = new ExchangeImpl();
exch.put(Bus.class, bus);
@@ -123,9 +123,8 @@ public class TransportURIResolver extends
ExtendedURIResolver {
public void onMessage(Message message) {
LoadingByteArrayOutputStream bout = new
LoadingByteArrayOutputStream();
try {
-
IOUtils.copy(message.getContent(InputStream.class), bout);
+
IOUtils.copyAndCloseInput(message.getContent(InputStream.class), bout);
message.getExchange().put(InputStream.class,
bout.createInputStream());
-c.close(message);
} catch (IOException e) {
//ignore
}
@@ -133,6 +132,12 @@ public class TransportURIResolver extends
ExtendedURIResolver {
});
c.prepare(message);
c.close(message);
+if (exch.getInMessage() != null) {
+c.close(exch.getInMessage());
+}
+if (exch.getInFaultMessage() != null) {
+c.close(exch.getInFaultMessage());
+}
c.close();
InputStream ins = exch.get(InputStream.class);
resourceOpened.add(ins);
@@ -150,6 +155,7 @@ public class TransportURIResolver extends
ExtendedURIResolver {
} catch (Exception e) {
//ignore
LOG.log(Level.FINEST, "Conduit initiator could not resolve " +
baseUri + " " + curUri, e);
+e.printStackTrace();
}
}
if (is == null
[cxf] 02/02: Handle empty http responses better to make sure they are marked as complete
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 48b89768082a31802f65ec9c5985ca7b7b5c0988
Author: Daniel Kulp
AuthorDate: Tue Sep 5 10:59:52 2023 -0400
Handle empty http responses better to make sure they are marked as complete
---
.../cxf/transport/http/HttpClientHTTPConduit.java | 91 +-
1 file changed, 55 insertions(+), 36 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index 9012f3a047..4cab8ae253 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -342,7 +342,6 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
int rtimeout;
volatile Throwable exception;
volatile boolean connectionComplete;
-PipedInputStream pin;
PipedOutputStream pout;
HttpRequest request;
@@ -367,7 +366,9 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
@Override
protected void handleNoOutput() throws IOException {
contentLen = 0;
-pout.close();
+if (pout != null) {
+pout.close();
+}
if (exception != null) {
if (exception instanceof IOException) {
throw (IOException)exception;
@@ -449,44 +450,50 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
String httpRequestMethod =
(String)outMessage.get(Message.HTTP_REQUEST_METHOD);
-pin = new PipedInputStream(csPolicy.getChunkLength() <= 0
-? 4096 : csPolicy.getChunkLength());
-pout = new PipedOutputStream(pin) {
-synchronized boolean canWrite() throws IOException {
-return isConnectionAttemptCompleted(csPolicy, this);
-}
-@Override
-public void write(int b) throws IOException {
-if (connectionComplete || canWrite()) {
-super.write(b);
-}
-}
-@Override
-public void write(byte[] b, int off, int len) throws
IOException {
-if (connectionComplete || canWrite()) {
-super.write(b, off, len);
-}
-}
-
-};
if (KNOWN_HTTP_VERBS_WITH_NO_CONTENT.contains(httpRequestMethod)
||
PropertyUtils.isTrue(outMessage.get(Headers.EMPTY_REQUEST_PROPERTY))) {
contentLen = 0;
}
+final PipedInputStream pin = new
PipedInputStream(csPolicy.getChunkLength() <= 0
+? 4096 : csPolicy.getChunkLength());
+if (contentLen != 0) {
+pout = new PipedOutputStream(pin) {
+synchronized boolean canWrite() throws IOException {
+return isConnectionAttemptCompleted(csPolicy, this);
+}
+@Override
+public void write(int b) throws IOException {
+if (connectionComplete || canWrite()) {
+super.write(b);
+}
+}
+@Override
+public void write(byte[] b, int off, int len) throws
IOException {
+if (connectionComplete || canWrite()) {
+super.write(b, off, len);
+}
+}
+};
+}
+
BodyPublisher bp = new BodyPublisher() {
@Override
public void subscribe(Subscriber
subscriber) {
connectionComplete = true;
-synchronized (pout) {
-pout.notifyAll();
+if (pout != null) {
+synchronized (pout) {
+pout.notifyAll();
+}
+BodyPublishers.ofInputStream(new
Supplier() {
+public InputStream get() {
+return pin;
+}
+}).subscribe(subscriber);
+} else {
+BodyPublishers.noBody().subscribe(subscriber);
}
-BodyPublishers.ofInputStream(new Supplier() {
-public InputStre
[cxf] 01/02: TransportURIResolver replaces the InputStream, but doesn't close the original.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 86cb53f39b3f14fee17a601a70cfcf04a2bbc40f
Author: Daniel Kulp
AuthorDate: Tue Sep 5 08:44:50 2023 -0400
TransportURIResolver replaces the InputStream, but doesn't close the
original.
---
.../java/org/apache/cxf/transport/TransportURIResolver.java | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
index 4c1446ef04..752b1f0f8c 100644
--- a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
+++ b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
@@ -112,7 +112,7 @@ public class TransportURIResolver extends
ExtendedURIResolver {
// set the endpointInfo name which could be used for
configuration
info.setName(new QName("http://cxf.apache.org;,
"TransportURIResolver"));
info.setAddress(base.toString());
-final Conduit c = ci.getConduit(info, bus);
+Conduit c = ci.getConduit(info, bus);
Message message = new MessageImpl();
Exchange exch = new ExchangeImpl();
exch.put(Bus.class, bus);
@@ -123,9 +123,8 @@ public class TransportURIResolver extends
ExtendedURIResolver {
public void onMessage(Message message) {
LoadingByteArrayOutputStream bout = new
LoadingByteArrayOutputStream();
try {
-
IOUtils.copy(message.getContent(InputStream.class), bout);
+
IOUtils.copyAndCloseInput(message.getContent(InputStream.class), bout);
message.getExchange().put(InputStream.class,
bout.createInputStream());
-c.close(message);
} catch (IOException e) {
//ignore
}
@@ -133,6 +132,12 @@ public class TransportURIResolver extends
ExtendedURIResolver {
});
c.prepare(message);
c.close(message);
+if (exch.getInMessage() != null) {
+c.close(exch.getInMessage());
+}
+if (exch.getInFaultMessage() != null) {
+c.close(exch.getInFaultMessage());
+}
c.close();
InputStream ins = exch.get(InputStream.class);
resourceOpened.add(ins);
@@ -150,6 +155,7 @@ public class TransportURIResolver extends
ExtendedURIResolver {
} catch (Exception e) {
//ignore
LOG.log(Level.FINEST, "Conduit initiator could not resolve " +
baseUri + " " + curUri, e);
+e.printStackTrace();
}
}
if (is == null
[cxf] 04/04: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 453287d2990a2b417b498ddf178f05d6b5e475da Author: Daniel Kulp AuthorDate: Tue Sep 5 12:05:16 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 104c0a6792..fccb592a5e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -60,6 +60,7 @@ B 538a3869e3edef90ca7c32929ca1911e60ab941f B 56667a4295c0e1a9694fc9d6a943447d0f39a575 B 57999b80bbdb93016dd8b336f671d83f3eaf3c8c B 58ae0ed63c9361ad5e9591c5cf8bf6f34d1649fd +B 58d8029e6ffdacaab35c46d531aac289002eacdf B 5e88225f5b45ca03416e616e77f602e62b25ace5 B 60aa618e06d0bbaadd7bc65d3cd3503673e53a6b B 60f00a123ee85f6865e24ee35a91e4ec6eced62c
[cxf] 01/04: Make sure TransportURIResolver closes the conduit it uses, make sure HttpClient is unset from message on exchange close/complete.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 711899d6d0698060fef79262acbc72f9ea0785b5
Author: Daniel Kulp
AuthorDate: Tue Sep 5 03:30:03 2023 -0400
Make sure TransportURIResolver closes the conduit it uses, make sure
HttpClient is unset from message on exchange close/complete.
(cherry picked from commit d1396f4ce4ffb890b2434930402a8890094d7079)
---
.../main/java/org/apache/cxf/transport/TransportURIResolver.java| 1 +
.../java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java | 6 ++
2 files changed, 7 insertions(+)
diff --git
a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
index c3da4e54a7..4c1446ef04 100644
--- a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
+++ b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
@@ -133,6 +133,7 @@ public class TransportURIResolver extends
ExtendedURIResolver {
});
c.prepare(message);
c.close(message);
+c.close();
InputStream ins = exch.get(InputStream.class);
resourceOpened.add(ins);
InputSource src = new InputSource(ins);
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index b40b6904dc..9012f3a047 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -107,6 +107,12 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
|| lastURL.getPort() != url.getPort();
}
+@Override
+public void close(Message msg) throws IOException {
+super.close(msg);
+msg.remove(HttpClient.class);
+}
+
/**
* Close the conduit
*/
[cxf] branch 3.6.x-fixes updated (f3e1f49b72 -> 453287d299)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from f3e1f49b72 Recording .gitmergeinfo Changes new 711899d6d0 Make sure TransportURIResolver closes the conduit it uses, make sure HttpClient is unset from message on exchange close/complete. new 5e99df45a0 TransportURIResolver replaces the InputStream, but doesn't close the original. new 2923b3324d Handle empty http responses better to make sure they are marked as complete new 453287d299 Recording .gitmergeinfo Changes The 4 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 + .../apache/cxf/transport/TransportURIResolver.java | 13 ++- .../cxf/transport/http/HttpClientHTTPConduit.java | 97 ++ 3 files changed, 72 insertions(+), 39 deletions(-)
[cxf] 03/04: Handle empty http responses better to make sure they are marked as complete
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2923b3324db22481b8f2b3868c3c66ddff29b222
Author: Daniel Kulp
AuthorDate: Tue Sep 5 10:59:52 2023 -0400
Handle empty http responses better to make sure they are marked as complete
(cherry picked from commit 48b89768082a31802f65ec9c5985ca7b7b5c0988)
---
.../cxf/transport/http/HttpClientHTTPConduit.java | 91 +-
1 file changed, 55 insertions(+), 36 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index 9012f3a047..4cab8ae253 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -342,7 +342,6 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
int rtimeout;
volatile Throwable exception;
volatile boolean connectionComplete;
-PipedInputStream pin;
PipedOutputStream pout;
HttpRequest request;
@@ -367,7 +366,9 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
@Override
protected void handleNoOutput() throws IOException {
contentLen = 0;
-pout.close();
+if (pout != null) {
+pout.close();
+}
if (exception != null) {
if (exception instanceof IOException) {
throw (IOException)exception;
@@ -449,44 +450,50 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
String httpRequestMethod =
(String)outMessage.get(Message.HTTP_REQUEST_METHOD);
-pin = new PipedInputStream(csPolicy.getChunkLength() <= 0
-? 4096 : csPolicy.getChunkLength());
-pout = new PipedOutputStream(pin) {
-synchronized boolean canWrite() throws IOException {
-return isConnectionAttemptCompleted(csPolicy, this);
-}
-@Override
-public void write(int b) throws IOException {
-if (connectionComplete || canWrite()) {
-super.write(b);
-}
-}
-@Override
-public void write(byte[] b, int off, int len) throws
IOException {
-if (connectionComplete || canWrite()) {
-super.write(b, off, len);
-}
-}
-
-};
if (KNOWN_HTTP_VERBS_WITH_NO_CONTENT.contains(httpRequestMethod)
||
PropertyUtils.isTrue(outMessage.get(Headers.EMPTY_REQUEST_PROPERTY))) {
contentLen = 0;
}
+final PipedInputStream pin = new
PipedInputStream(csPolicy.getChunkLength() <= 0
+? 4096 : csPolicy.getChunkLength());
+if (contentLen != 0) {
+pout = new PipedOutputStream(pin) {
+synchronized boolean canWrite() throws IOException {
+return isConnectionAttemptCompleted(csPolicy, this);
+}
+@Override
+public void write(int b) throws IOException {
+if (connectionComplete || canWrite()) {
+super.write(b);
+}
+}
+@Override
+public void write(byte[] b, int off, int len) throws
IOException {
+if (connectionComplete || canWrite()) {
+super.write(b, off, len);
+}
+}
+};
+}
+
BodyPublisher bp = new BodyPublisher() {
@Override
public void subscribe(Subscriber
subscriber) {
connectionComplete = true;
-synchronized (pout) {
-pout.notifyAll();
+if (pout != null) {
+synchronized (pout) {
+pout.notifyAll();
+}
+BodyPublishers.ofInputStream(new
Supplier() {
+public InputStream get() {
+return pin;
+}
+}).subscribe(subscriber);
+} else {
+BodyPublishers.noBody().subscribe(subs
[cxf] branch main updated (d62ffb116b -> 48b8976808)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from d62ffb116b Bump cxf.aspectj.version from 1.9.20 to 1.9.20.1 (#1421) new 86cb53f39b TransportURIResolver replaces the InputStream, but doesn't close the original. new 48b8976808 Handle empty http responses better to make sure they are marked as complete 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: .../apache/cxf/transport/TransportURIResolver.java | 12 ++- .../cxf/transport/http/HttpClientHTTPConduit.java | 91 +- 2 files changed, 64 insertions(+), 39 deletions(-)
[cxf] branch main updated: Make sure TransportURIResolver closes the conduit it uses, make sure HttpClient is unset from message on exchange close/complete.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new d1396f4ce4 Make sure TransportURIResolver closes the conduit it uses,
make sure HttpClient is unset from message on exchange close/complete.
d1396f4ce4 is described below
commit d1396f4ce4ffb890b2434930402a8890094d7079
Author: Daniel Kulp
AuthorDate: Tue Sep 5 03:30:03 2023 -0400
Make sure TransportURIResolver closes the conduit it uses, make sure
HttpClient is unset from message on exchange close/complete.
---
.../main/java/org/apache/cxf/transport/TransportURIResolver.java| 1 +
.../java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java | 6 ++
2 files changed, 7 insertions(+)
diff --git
a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
index c3da4e54a7..4c1446ef04 100644
--- a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
+++ b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
@@ -133,6 +133,7 @@ public class TransportURIResolver extends
ExtendedURIResolver {
});
c.prepare(message);
c.close(message);
+c.close();
InputStream ins = exch.get(InputStream.class);
resourceOpened.add(ins);
InputSource src = new InputSource(ins);
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index b40b6904dc..9012f3a047 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -107,6 +107,12 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
|| lastURL.getPort() != url.getPort();
}
+@Override
+public void close(Message msg) throws IOException {
+super.close(msg);
+msg.remove(HttpClient.class);
+}
+
/**
* Close the conduit
*/
[cxf] 02/02: Re-enable checkstyle/pmd on master, fix all the issues so backporting changes is easier
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 58d8029e6ffdacaab35c46d531aac289002eacdf
Author: Daniel Kulp
AuthorDate: Wed Aug 30 18:26:55 2023 -0400
Re-enable checkstyle/pmd on master, fix all the issues so backporting
changes is easier
---
.../main/java/org/apache/cxf/helpers/NSDecl.java | 2 +-
.../jaxws/CxfJaxwsAutoConfiguration.java | 2 +
.../AbstractObservationClientProvider.java | 4 +-
.../micrometer/CxfObservationConventionUtil.java | 11 +++--
.../ObservationClientStartInterceptor.java | 5 ++-
.../micrometer/ObservationStartInterceptor.java| 7 ++--
.../jaxrs/AbstractJaxrsObservationConvention.java | 4 +-
.../jaxrs/ContainerRequestReceiverContext.java | 3 +-
...tainerRequestReceiverObservationConvention.java | 3 +-
.../ContainerRequestSenderObservationContext.java | 3 +-
...ontainerRequestSenderObservationConvention.java | 3 +-
...tainerRequestReceiverObservationConvention.java | 11 ++---
...ontainerRequestSenderObservationConvention.java | 8 ++--
.../jaxrs/JaxrsObservationDocumentation.java | 9 -
.../jaxrs/ObservationClientProvider.java | 16
.../jaxrs/ObservationContextProvider.java | 2 +-
.../micrometer/jaxrs/ObservationFeature.java | 6 +--
.../micrometer/jaxrs/ObservationProvider.java | 17
.../micrometer/ObservationIntegrationTest.java | 4 +-
.../AbstractOpenTelemetryProvider.java | 2 +-
.../opentelemetry/OpenTelemetryFeature.java| 4 +-
.../opentelemetry/jaxrs/OpenTelemetryFeature.java | 7 ++--
parent/pom.xml | 47 --
.../cxf/jaxrs/provider/CustomJaxbProvider.java | 2 +-
.../http/netty/client/NettyHttpClientRequest.java | 2 +-
.../netty/server/NettyHttpDestinationTest.java | 3 +-
.../java/org/apache/cxf/ws/rm/RMManagerTest.java | 3 +-
.../apache/cxf/sts/claims/LdapClaimsHandler.java | 2 +-
.../cxf/sts/claims/LdapGroupClaimsHandler.java | 2 +-
.../apache/cxf/sts/claims/StaticClaimsHandler.java | 4 +-
.../sts/claims/StaticEndpointClaimsHandler.java| 4 +-
.../apache/cxf/sts/claims/mapper/ClaimUtils.java | 4 +-
.../org/apache/cxf/sts/event/map/EventMapper.java | 4 +-
.../provider/jwt/DefaultJWTClaimsProvider.java | 2 +-
.../sts/claims/mapper/JexlClaimsMapperTest.java| 7 ++--
.../cxf/sts/common/CustomAttributeProvider.java| 4 +-
.../apache/cxf/systest/sts/rest/STSRESTTest.java | 4 +-
.../cdi/base/tomcat/AbstractTomcatServer.java | 2 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java| 4 +-
.../jaxrs/provider/CXFJaxbElementProvider.java | 2 +-
.../systest/dispatch/DispatchClientServerTest.java | 2 +-
.../org/apache/cxf/systest/jaxws/CXF7990Test.java | 2 +-
.../jaxrs/sse/tomcat/AbstractTomcatServer.java | 2 +-
.../systest/type_test/AbstractTypeTestClient2.java | 2 +-
.../toolspec/parser/CommandLineParserTest.java | 2 +-
.../jaxws/customization/CustomizationParser.java | 20 -
46 files changed, 141 insertions(+), 124 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/helpers/NSDecl.java
b/core/src/main/java/org/apache/cxf/helpers/NSDecl.java
index ca3d34ee32..f64fdc4a26 100644
--- a/core/src/main/java/org/apache/cxf/helpers/NSDecl.java
+++ b/core/src/main/java/org/apache/cxf/helpers/NSDecl.java
@@ -31,7 +31,7 @@ public final class NSDecl {
this.prefix = pfx.intern();
}
this.uri = ur.intern();
-this.hashCode = (toString()).hashCode();
+this.hashCode = toString().hashCode();
}
public String getPrefix() {
diff --git
a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/jaxws/CxfJaxwsAutoConfiguration.java
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/jaxws/CxfJaxwsAutoConfiguration.java
index 5f785b0400..c4d41b38e0 100644
---
a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/jaxws/CxfJaxwsAutoConfiguration.java
+++
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/jaxws/CxfJaxwsAutoConfiguration.java
@@ -29,6 +29,8 @@ import org.springframework.context.annotation.Bean;
import
org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
import org.springframework.context.annotation.Configuration;
+//CHECKSTYLE:OFF
+
@Configuration
@ConditionalOnClass({ Resource.class, WebServiceContext.class })
public class CxfJaxwsAutoConfiguration {
diff --git
a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/AbstractObservationClientProvider.java
b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer
[cxf] 01/02: Add system properly to force use of older URLConnection
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3d70de80fb60b74040c0214fc6a28774362556e4
Author: Daniel Kulp
AuthorDate: Wed Aug 30 12:28:20 2023 -0400
Add system properly to force use of older URLConnection
---
.../cxf/transport/http/HTTPTransportFactory.java | 11 ++-
.../cxf/transport/http/HttpClientHTTPConduit.java | 81 --
.../transport/http/URLConnectionHTTPConduit.java | 7 --
3 files changed, 53 insertions(+), 46 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
index f13e236425..40d42c8e31 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPTransportFactory.java
@@ -37,6 +37,7 @@ import java.util.logging.Logger;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingInfo;
@@ -84,6 +85,9 @@ public class HTTPTransportFactory
private final ReadWriteLock lock = new ReentrantReadWriteLock();
private final Lock r = lock.readLock();
private final Lock w = lock.writeLock();
+
+private boolean forceURLConnectionConduit
+=
Boolean.valueOf(SystemPropertyAction.getProperty("org.apache.cxf.transport.http.forceURLConnection"));
public HTTPTransportFactory() {
this(new DestinationRegistryImpl());
@@ -233,8 +237,11 @@ public class HTTPTransportFactory
conduit = factory.createConduit(this, bus, endpointInfo, target);
}
if (conduit == null) {
-//conduit = new URLConnectionHTTPConduit(bus, endpointInfo,
target);
-conduit = new HttpClientHTTPConduit(bus, endpointInfo, target);
+if (forceURLConnectionConduit) {
+conduit = new URLConnectionHTTPConduit(bus, endpointInfo,
target);
+} else {
+conduit = new HttpClientHTTPConduit(bus, endpointInfo, target);
+}
}
// Spring configure the conduit.
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index e16f9d3b48..b40b6904dc 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -90,10 +90,6 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
volatile HttpClient client;
volatile int lastTlsHash = -1;
volatile URI sslURL;
-
-public HttpClientHTTPConduit(Bus b, EndpointInfo ei) throws IOException {
-super(b, ei);
-}
public HttpClientHTTPConduit(Bus b, EndpointInfo ei, EndpointReferenceType
t) throws IOException {
super(b, ei, t);
@@ -115,7 +111,13 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
* Close the conduit
*/
public void close() {
-if (client != null) {
+if (client instanceof AutoCloseable) {
+try {
+((AutoCloseable)client).close();
+} catch (Exception e) {
+//ignore
+}
+} else if (client != null) {
String name = client.toString();
client = null;
tryToShutdownSelector(name);
@@ -398,6 +400,41 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
}
}
+private boolean isConnectionAttemptCompleted(HTTPClientPolicy
csPolicy, PipedOutputStream out)
+throws IOException {
+if (!connectionComplete) {
+// if we haven't connected yet, we'll see if an exception is
the reason
+// why we haven't connected. Otherwise, wait for the
connection
+// to complete.
+if (future.isDone()) {
+try {
+future.get();
+} catch (InterruptedException | ExecutionException e) {
+if (e.getCause() instanceof IOException) {
+throw new Fault("Could not send Message.", LOG,
(IOException)e.getCause());
+}
+}
+return false;
+}
+try {
+out.wait(csPolicy.
[cxf] branch main updated (1f829190e5 -> 58d8029e6f)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 1f829190e5 Exlude transitive dep to xml-apis to avoid Java17 module issues new 3d70de80fb Add system properly to force use of older URLConnection new 58d8029e6f Re-enable checkstyle/pmd on master, fix all the issues so backporting changes is easier 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: .../main/java/org/apache/cxf/helpers/NSDecl.java | 2 +- .../jaxws/CxfJaxwsAutoConfiguration.java | 2 + .../AbstractObservationClientProvider.java | 4 +- .../micrometer/CxfObservationConventionUtil.java | 11 +-- .../ObservationClientStartInterceptor.java | 5 +- .../micrometer/ObservationStartInterceptor.java| 7 +- .../jaxrs/AbstractJaxrsObservationConvention.java | 4 +- .../jaxrs/ContainerRequestReceiverContext.java | 3 +- ...tainerRequestReceiverObservationConvention.java | 3 +- .../ContainerRequestSenderObservationContext.java | 3 +- ...ontainerRequestSenderObservationConvention.java | 3 +- ...tainerRequestReceiverObservationConvention.java | 11 +-- ...ontainerRequestSenderObservationConvention.java | 8 +-- .../jaxrs/JaxrsObservationDocumentation.java | 9 ++- .../jaxrs/ObservationClientProvider.java | 16 ++--- .../jaxrs/ObservationContextProvider.java | 2 +- .../micrometer/jaxrs/ObservationFeature.java | 6 +- .../micrometer/jaxrs/ObservationProvider.java | 17 ++--- .../micrometer/ObservationIntegrationTest.java | 4 +- .../AbstractOpenTelemetryProvider.java | 2 +- .../opentelemetry/OpenTelemetryFeature.java| 4 +- .../opentelemetry/jaxrs/OpenTelemetryFeature.java | 7 +- parent/pom.xml | 47 + .../cxf/jaxrs/provider/CustomJaxbProvider.java | 2 +- .../http/netty/client/NettyHttpClientRequest.java | 2 +- .../netty/server/NettyHttpDestinationTest.java | 3 +- .../cxf/transport/http/HTTPTransportFactory.java | 11 ++- .../cxf/transport/http/HttpClientHTTPConduit.java | 81 -- .../transport/http/URLConnectionHTTPConduit.java | 7 -- .../java/org/apache/cxf/ws/rm/RMManagerTest.java | 3 +- .../apache/cxf/sts/claims/LdapClaimsHandler.java | 2 +- .../cxf/sts/claims/LdapGroupClaimsHandler.java | 2 +- .../apache/cxf/sts/claims/StaticClaimsHandler.java | 4 +- .../sts/claims/StaticEndpointClaimsHandler.java| 4 +- .../apache/cxf/sts/claims/mapper/ClaimUtils.java | 4 +- .../org/apache/cxf/sts/event/map/EventMapper.java | 4 +- .../provider/jwt/DefaultJWTClaimsProvider.java | 2 +- .../sts/claims/mapper/JexlClaimsMapperTest.java| 7 +- .../cxf/sts/common/CustomAttributeProvider.java| 4 +- .../apache/cxf/systest/sts/rest/STSRESTTest.java | 4 +- .../cdi/base/tomcat/AbstractTomcatServer.java | 2 +- .../org/apache/cxf/systest/jaxrs/BookStore.java| 4 +- .../jaxrs/provider/CXFJaxbElementProvider.java | 2 +- .../systest/dispatch/DispatchClientServerTest.java | 2 +- .../org/apache/cxf/systest/jaxws/CXF7990Test.java | 2 +- .../jaxrs/sse/tomcat/AbstractTomcatServer.java | 2 +- .../systest/type_test/AbstractTypeTestClient2.java | 2 +- .../toolspec/parser/CommandLineParserTest.java | 2 +- .../jaxws/customization/CustomizationParser.java | 20 +++--- 49 files changed, 194 insertions(+), 170 deletions(-)
[cxf] branch main updated: Exlude transitive dep to xml-apis to avoid Java17 module issues
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 1f829190e5 Exlude transitive dep to xml-apis to avoid Java17 module issues 1f829190e5 is described below commit 1f829190e583560ea4bf72ea0bc67ec277884c5e Author: Daniel Kulp AuthorDate: Wed Aug 30 12:08:58 2023 -0400 Exlude transitive dep to xml-apis to avoid Java17 module issues --- .../org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java | 2 +- systests/transports/pom.xml | 6 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java index ae0a688a48..1fd0693954 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/AbstractFailoverTest.java @@ -43,7 +43,7 @@ import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals;; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/systests/transports/pom.xml b/systests/transports/pom.xml index 71cf873461..00424efc11 100644 --- a/systests/transports/pom.xml +++ b/systests/transports/pom.xml @@ -236,6 +236,12 @@ net.sourceforge.nekohtml nekohtml 1.9.22 + + +xml-apis +xml-apis + + org.springframework
[cxf] branch main updated: CXF-8885: Eliminate hard refs to `HttpClient` via `HTTPClientPolicy`
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 728edf1b58 CXF-8885: Eliminate hard refs to `HttpClient` via
`HTTPClientPolicy`
728edf1b58 is described below
commit 728edf1b589c87715220e753208a5b1ff2a3f0cb
Author: Leonard Wörteler
AuthorDate: Sat Aug 12 17:22:26 2023 +0200
CXF-8885: Eliminate hard refs to `HttpClient` via `HTTPClientPolicy`
There are additional potential references to the `HttpClientFacade`
hidden in the property change listeners of `HTTPClientPolicy`.
To prevent those from keeping the SelectorManager thread alive, the
`HTTPConduit` now registers itself as a listener only via a
`WeakReference`, so the conduit can be garbage collected even if the
client policy is still referenced inside the SelectorManager thread.
---
.../org/apache/cxf/transport/http/HTTPConduit.java | 32 ++
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 33b6157559..801eac24e4 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -26,6 +26,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.lang.ref.WeakReference;
import java.net.HttpRetryException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -298,6 +299,27 @@ public abstract class HTTPConduit
private volatile boolean clientSidePolicyCalced;
+private final PropertyChangeListener weakRefListener = new
WeakPropertyChangeListenerAdapter(this);
+
+/**
+ * Change listener that propagates events to this conduit as long as it is
alive without holding a hard reference.
+ */
+private static final class WeakPropertyChangeListenerAdapter implements
PropertyChangeListener {
+/** Weak reference so the listener can be garbage collected even if it
is still registered somewhere. */
+private final WeakReference reference;
+
+WeakPropertyChangeListenerAdapter(PropertyChangeListener inner) {
+reference = new WeakReference<>(inner);
+}
+
+@Override
+public void propertyChange(PropertyChangeEvent evt) {
+PropertyChangeListener inner = reference.get();
+if (inner != null) {
+inner.propertyChange(evt);
+}
+}
+}
/**
* Constructor
@@ -352,8 +374,8 @@ public abstract class HTTPConduit
this,
new
ClientPolicyCalculator());
if (clientSidePolicy != null) {
-clientSidePolicy.removePropertyChangeListener(this);
//make sure we aren't added twice
-clientSidePolicy.addPropertyChangeListener(this);
+
clientSidePolicy.removePropertyChangeListener(weakRefListener); //make sure we
aren't added twice
+
clientSidePolicy.addPropertyChangeListener(weakRefListener);
}
}
}
@@ -749,7 +771,7 @@ public abstract class HTTPConduit
*/
public void close() {
if (clientSidePolicy != null) {
-clientSidePolicy.removePropertyChangeListener(this);
+clientSidePolicy.removePropertyChangeListener(weakRefListener);
}
}
@@ -927,8 +949,8 @@ public abstract class HTTPConduit
}
this.clientSidePolicyCalced = true;
this.clientSidePolicy = client;
-clientSidePolicy.removePropertyChangeListener(this); //make sure we
aren't added twice
-clientSidePolicy.addPropertyChangeListener(this);
+clientSidePolicy.removePropertyChangeListener(weakRefListener); //make
sure we aren't added twice
+clientSidePolicy.addPropertyChangeListener(weakRefListener);
endpointInfo.setProperty("org.apache.cxf.ws.addressing.replyto",
client.getDecoupledEndpoint());
}
[cxf] branch 3.6.x-fixes updated: [CXF-8895] ConnectionExceptions with larger payloads could cause a hang with new HttpClient based conduit
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 1f11e61729 [CXF-8895] ConnectionExceptions with larger payloads could
cause a hang with new HttpClient based conduit
1f11e61729 is described below
commit 1f11e61729d9482d23048076703a6431646d6c38
Author: Daniel Kulp
AuthorDate: Wed Jun 28 18:48:55 2023 -0400
[CXF-8895] ConnectionExceptions with larger payloads could cause a hang
with new HttpClient based conduit
---
.../cxf/transport/http/HttpClientHTTPConduit.java | 70 --
.../systest/dispatch/DispatchClientServerTest.java | 28 +
2 files changed, 93 insertions(+), 5 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index f836903431..0451e9af68 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -74,6 +74,7 @@ import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.helpers.JavaUtils;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.io.CacheAndWriteOutputStream;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
@@ -379,19 +380,69 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
}
}
+private boolean isConnectionAttemptCompleted(HTTPClientPolicy
csPolicy, PipedOutputStream out)
+throws IOException {
+if (!connectionComplete) {
+// if we haven't connected yet, we'll see if an exception is
the reason
+// why we haven't connected. Otherwise, wait for the
connection
+// to complete.
+if (future.isDone()) {
+try {
+future.get();
+} catch (InterruptedException | ExecutionException e) {
+if (e.getCause() instanceof IOException) {
+throw new Fault("Could not send Message.", LOG,
(IOException)e.getCause());
+}
+}
+return false;
+}
+try {
+out.wait(csPolicy.getConnectionTimeout());
+} catch (InterruptedException e) {
+//ignore
+}
+if (future.isDone()) {
+try {
+future.get();
+} catch (InterruptedException | ExecutionException e) {
+if (e.getCause() instanceof IOException) {
+throw new Fault("Could not send Message.", LOG,
(IOException)e.getCause());
+}
+}
+return false;
+}
+}
+return true;
+}
+
@Override
protected void setProtocolHeaders() throws IOException {
HttpClient cl = outMessage.get(HttpClient.class);
Address address =
(Address)outMessage.get(KEY_HTTP_CONNECTION_ADDRESS);
-HTTPClientPolicy csPolicy = getClient(outMessage);
+final HTTPClientPolicy csPolicy = getClient(outMessage);
String httpRequestMethod =
(String)outMessage.get(Message.HTTP_REQUEST_METHOD);
pin = new PipedInputStream(csPolicy.getChunkLength() <= 0
? 4096 : csPolicy.getChunkLength());
-pout = new PipedOutputStream(pin);
-
-
+pout = new PipedOutputStream(pin) {
+synchronized boolean canWrite() throws IOException {
+return isConnectionAttemptCompleted(csPolicy, this);
+}
+@Override
+public void write(int b) throws IOException {
+if (connectionComplete || canWrite()) {
+super.write(b);
+}
+}
+@Override
+public void write(byte[] b, int off, int len) throws
IOException {
+if (connectionComplete || canWrite()) {
+super.write(b, off, len);
+}
+}
+
+};
if (KNOWN_HTTP_VERBS_WITH_NO_CONTENT.contains(httpRequestMethod)
||
PropertyUtils.isTrue(outMessage.get(Headers
[cxf] branch main updated: [CXF-8895] ConnectionExceptions with larger payloads could cause a hang with new HttpClient based conduit
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 1e9e61a376 [CXF-8895] ConnectionExceptions with larger payloads could
cause a hang with new HttpClient based conduit
1e9e61a376 is described below
commit 1e9e61a3765318c7706a1886733fd45fe2f2f977
Author: Daniel Kulp
AuthorDate: Wed Jun 28 17:45:21 2023 -0400
[CXF-8895] ConnectionExceptions with larger payloads could cause a hang
with new HttpClient based conduit
---
.../cxf/transport/http/HttpClientHTTPConduit.java | 65 --
.../systest/dispatch/DispatchClientServerTest.java | 28 ++
2 files changed, 88 insertions(+), 5 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index f836903431..a9e9f51830 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -74,6 +74,7 @@ import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.helpers.JavaUtils;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.io.CacheAndWriteOutputStream;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
@@ -383,15 +384,60 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
protected void setProtocolHeaders() throws IOException {
HttpClient cl = outMessage.get(HttpClient.class);
Address address =
(Address)outMessage.get(KEY_HTTP_CONNECTION_ADDRESS);
-HTTPClientPolicy csPolicy = getClient(outMessage);
+final HTTPClientPolicy csPolicy = getClient(outMessage);
String httpRequestMethod =
(String)outMessage.get(Message.HTTP_REQUEST_METHOD);
pin = new PipedInputStream(csPolicy.getChunkLength() <= 0
? 4096 : csPolicy.getChunkLength());
-pout = new PipedOutputStream(pin);
-
-
+pout = new PipedOutputStream(pin) {
+synchronized boolean canWrite() throws IOException {
+if (!connectionComplete) {
+// if we haven't connected yet, we'll see if an
exception is the reason
+// why we haven't connected. Otherwise, wait for the
connection
+// to complete.
+if (future.isDone()) {
+try {
+future.get();
+} catch (InterruptedException | ExecutionException
e) {
+if (e.getCause() instanceof IOException) {
+throw new Fault("Could not send Message.",
LOG, (IOException)e.getCause());
+}
+}
+return false;
+}
+try {
+wait(csPolicy.getConnectionTimeout());
+} catch (InterruptedException e) {
+//ignore
+}
+if (future.isDone()) {
+try {
+future.get();
+} catch (InterruptedException | ExecutionException
e) {
+if (e.getCause() instanceof IOException) {
+throw new Fault("Could not send Message.",
LOG, (IOException)e.getCause());
+}
+}
+return false;
+}
+}
+return true;
+}
+@Override
+public void write(int b) throws IOException {
+if (connectionComplete || canWrite()) {
+super.write(b);
+}
+}
+@Override
+public void write(byte[] b, int off, int len) throws
IOException {
+if (connectionComplete || canWrite()) {
+super.write(b, off, len);
+}
+}
+
+};
if (KNOWN_HTTP_VERBS_WITH_NO_CONTENT.contains(httpRequestMethod)
||
PropertyUtils.isTrue(outMessage.get(Headers.EMPTY_REQUEST_PROPERT
[cxf] branch main updated: Fix checkstyle
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 40ad295ad0 Fix checkstyle
40ad295ad0 is described below
commit 40ad295ad0fb5cb856cd97b260f10ce2a53a526b
Author: Daniel Kulp
AuthorDate: Tue Jun 13 13:39:28 2023 -0400
Fix checkstyle
---
.../apache/cxf/transport/http/HttpClientHTTPConduit.java | 5 +
.../apache/cxf/systest/jaxws/JaxWsClientThreadTest.java | 16
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index af7c81b2ec..f836903431 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -25,7 +25,6 @@ import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.PushbackInputStream;
-import java.lang.reflect.InvocationTargetException;
import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -34,7 +33,6 @@ import java.net.ProxySelector;
import java.net.SocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URLConnection;
import java.net.UnknownHostException;
import java.net.http.HttpClient;
import java.net.http.HttpClient.Redirect;
@@ -73,7 +71,6 @@ import javax.net.ssl.SSLSession;
import org.apache.cxf.Bus;
import org.apache.cxf.common.util.PropertyUtils;
-import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.helpers.JavaUtils;
@@ -137,7 +134,7 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
}
try {
ThreadGroup rootGroup = Thread.currentThread().getThreadGroup();
-Thread threads[] = new Thread[rootGroup.activeCount()];
+Thread[] threads = new Thread[rootGroup.activeCount()];
int cnt = rootGroup.enumerate(threads);
for (int x = 0; x < cnt; x++) {
if (threads[x].getName().contains(n)) {
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
index 223faba554..d437e6a8a8 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
@@ -237,15 +237,15 @@ public class JaxWsClientThreadTest extends
AbstractCXFTest {
int start = rootGroup.activeCount();
Thread[] threads = new Thread[numThreads];
-for (int i = 0; i < numThreads; i++) {
-final int tid = i;
+for (int t = 0; t < numThreads; t++) {
+final int tid = t;
Runnable r = new Runnable() {
public void run() {
final Greeter greeter = s.getPort(portName, Greeter.class);
-try (AutoCloseable c = (AutoCloseable)greeter){
+try (AutoCloseable c = (AutoCloseable)greeter) {
final InvocationHandler handler =
Proxy.getInvocationHandler(greeter);
-Map requestContext =
((BindingProvider)handler).getRequestContext();
-
+Map requestContext =
((BindingProvider)handler).getRequestContext();
+
final String protocol = "http-" +
Thread.currentThread().getId();
for (int i = 0; i < 10; i++) {
String threadSpecificaddress = protocol +
"://localhost:80/" + i;
@@ -277,7 +277,7 @@ public class JaxWsClientThreadTest extends AbstractCXFTest {
}
}
};
-threads[i] = new Thread(r);
+threads[t] = new Thread(r);
}
for (int i = 0; i < numThreads; i++) {
threads[i].start();
@@ -301,8 +301,8 @@ public class JaxWsClientThreadTest extends AbstractCXFTest {
System.out.println("Start: " + start + " End: " + end);
-// we'll allow a few extra threads to be created for various things
like GC, but we definitely shouldn't be anywhere
-// near numThreads of extra threads
+// we'll allow a few extra threads to be created for various things
like GC, but we
+// definitely shouldn't be anywhere near nu
[cxf] 01/03: [CXF-8885] Make an attempt to get the HttpClient selector threads to shutdown sooner Technically, they should shut themselves down about 3 seconds after a garbage collection assuming the
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5b69dd06a61a8985e9166108e66e56f481a438cf
Author: Daniel Kulp
AuthorDate: Tue Jun 13 13:27:57 2023 -0400
[CXF-8885] Make an attempt to get the HttpClient selector threads to
shutdown sooner
Technically, they should shut themselves down about 3 seconds after a
garbage collection assuming the client they are associated with is cleaned up
and released. However, if many clients are used, this may be too long and
thus we'll make an attempt (via some hacks) to get the thread to shutdown
sooner. It's a shame HttpClient doesn't implement Closeable. :(
(cherry picked from commit 65711680af99de16f56cbaa819d207edb9428e8a)
---
.../cxf/transport/http/HttpClientHTTPConduit.java | 40 ++
.../cxf/systest/jaxws/JaxWsClientThreadTest.java | 86 ++
2 files changed, 126 insertions(+)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index 2546e24bac..af7c81b2ec 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.PushbackInputStream;
+import java.lang.reflect.InvocationTargetException;
import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -33,6 +34,7 @@ import java.net.ProxySelector;
import java.net.SocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.URLConnection;
import java.net.UnknownHostException;
import java.net.http.HttpClient;
import java.net.http.HttpClient.Redirect;
@@ -71,6 +73,7 @@ import javax.net.ssl.SSLSession;
import org.apache.cxf.Bus;
import org.apache.cxf.common.util.PropertyUtils;
+import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.helpers.JavaUtils;
@@ -110,6 +113,43 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
|| lastURL.getPort() != url.getPort();
}
+/**
+ * Close the conduit
+ */
+public void close() {
+if (client != null) {
+String name = client.toString();
+client = null;
+tryToShutdownSelector(name);
+}
+defaultAddress = null;
+super.close();
+}
+private synchronized void tryToShutdownSelector(String n) {
+// it can take three seconds (or more) for the JVM to determine the
client
+// is unreferenced and then shutdown the selector thread, we'll try
and speed that
+// up. This is somewhat of a complete hack.
+int idx = n.lastIndexOf('(');
+if (idx > 0) {
+n = n.substring(idx + 1);
+n = n.substring(0, n.length() - 1);
+n = "HttpClient-" + n + "-SelectorManager";
+}
+try {
+ThreadGroup rootGroup = Thread.currentThread().getThreadGroup();
+Thread threads[] = new Thread[rootGroup.activeCount()];
+int cnt = rootGroup.enumerate(threads);
+for (int x = 0; x < cnt; x++) {
+if (threads[x].getName().contains(n)) {
+threads[x].interrupt();
+}
+}
+} catch (Throwable t) {
+//ignore, nothing we can do except wait for the garbage collection
+//and then the three seconds for the timeout
+}
+}
+
@Override
protected void setupConnection(Message message, Address address,
HTTPClientPolicy csPolicy) throws IOException {
URI uri = address.getURI();
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
index d7c247b797..e853b0bf11 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
@@ -220,4 +220,90 @@ public class JaxWsClientThreadTest extends AbstractCXFTest
{
.get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY));
}
+@Test
+public void testMultiGreeterThreadSafety() throws Throwable {
+
+URL url = getClass().getResource("/wsdl/hello_world.wsdl");
+final jakarta.xml.ws.Service s = jakarta.xml.ws.Service.create(url,
serviceName);
[cxf] 02/03: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 800ec5225fcb3c5a213ca7a4ff5ccbc57b8d30a2 Author: Daniel Kulp AuthorDate: Tue Jun 13 13:30:44 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 11 +++ 1 file changed, 11 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 565d3eea6c..bf0f8bbbd1 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -26,6 +26,7 @@ B 24984eacaf4568b893ab71ebbded1100bdc060c8 B 253186a0d19c628e84e0558dd950a6d6b9e5be93 B 2a9fff8ebb48f040e3c5092d0084470298fba61f B 2be8e0126914cbbec926259ebb84573f4d0f9e56 +B 2d45e69e4802c625fe6239f8fbdee390ca83f36a B 2dfd3bf93e1db856f456058ea0d1ab3d0eb380af B 30b8b01da0cbd72d784fbbb0710efe252293caec B 31c8076321503aa16897701795cf334891dd1bab @@ -91,6 +92,7 @@ B 9b97793fa0ba0fccefdd82bcbe7322d354d43c8c B 9d8e7d5131deb3056e14e6e63bad67c87bc7bd9a B 9e15038746a2eded8345243e9eaa112bc56da463 B a25da60afef8051cab6b8b0a733346dad718f65a +B a35573688627269ee7f3bd2341dfabd6ec413b39 B a3bd17dc5476c2f200a80207ae33674ac906b992 B a43d30df5cc78535812339bec9663c4d60241d79 B a6501f782cd2b392f09edb4ccb99a83acd2e75a2 @@ -140,8 +142,11 @@ B e476d83ee9ca5c01d6098a14bd4d5d9bc847eca7 B e4a3e2493825ebae748ef8cd6e2f8c148fd4303d B e7157bb371804a15e3c78351c9b506776bcbdeda B e8ea9fbbff58bde7dac7c8336a25c9bb92bad62e +B e94ea49b2a328e641673a0940dcab8cb0d37c5a3 B ea334cd2a0fbe25d570138a7c937c64c5e304a36 B ea7d512f753c5db9be260f47f68fd134c013490b +B ea8b32093020842261e395ebaa7cb458faa7bd07 +B ec1ffc66d13a7cde72ef74b0a98b3c1eca0636dd B f03c3b0f9dccf7ebec8e1016247091cb363344ea B f16a87bdd0cedd82af9d62729c0d7418aa0e81a0 B f35d8ae18b51088f7238a0af6b9caaca4da8ef95 @@ -251,6 +256,7 @@ M 2c9be58586580ce1c2e9642a1fb44fa92d109c8a M 2d5d085df8621805ff33640f7aa43b47d098622d M 2db882176d45017b2fc53046bdabdd2da53b886f M 2dfd3bf93e1db856f456058ea0d1ab3d0eb380af +M 2ef08e13cee1e66f67033ec44ba7e5469c7a9c09 M 2f1e5a9b49893711f96644a7cf9745ff8559517a M 2f5044e10a4487bd9abc6340bdc438df23cd8f1e M 2f76e327b3c1128453e5ce996a802a656859671e @@ -308,9 +314,11 @@ M 5147a509abcee1aa885f0fcace2d797e28347608 M 5183fbf3c51cac50aa96506a03b6884587cec8ec M 52557512cf03c392069befce37977302d5c88539 M 5439c3f36b5f8525a0d92831fdf89b4fa2c48d31 +M 54919faf04751a1737b4edf95d8e2e7604bd3226 M 549bae9e692f84ccc1a2a6170fc9bdab2c7fc882 M 55265412d3c62ada4003a5f019477ea47eb49c8c M 553da4b8131bce33a0242d625eca264a68aaf8ae +M 557bfc8a53164dbf6f7be4ad3b320c7854f2f8b6 M 55816278ef52db1170e4ed5bdb1a32007c9e496b M 562414e034b6a88bdfbbe2eef89b7dc6276c463d M 57999b80bbdb93016dd8b336f671d83f3eaf3c8c @@ -537,6 +545,7 @@ M e493398886b19b1a6dd75f2bc99a2914ddb63441 M e4a3e2493825ebae748ef8cd6e2f8c148fd4303d M e4d5c200a8e2b4df6c05c3ac6306e5d6384b81dc M e585d86008e96cfe8d1e88c0b415a97fa8b02690 +M e58ecdbb73ba6814f0ddd9e21c4a84149aafe74d M e628555f18f3bb82fc1f29f04cbf293dd0ad8175 M e69f153f8a39278209c40badd3caf0465c9b1f1b M e6cbcec142d36ac8e4c58b719bdffe906df266a7 @@ -545,6 +554,7 @@ M e88b6f5d0f6f1a40311317ed18f204073ac66556 M e8ea9fbbff58bde7dac7c8336a25c9bb92bad62e M ea012b527e5fac40dc2245705232d7cfd16e11da M ea334cd2a0fbe25d570138a7c937c64c5e304a36 +M ea898ab26784732eb355053260859577fa4e4392 M ebd7af749e389b3e93fdaee1831f6c24c7da72b1 M ec6d7253edf1f33decd2c2accefc98fa3bb8dc60 M ec9a65c12886611620d06a402f85d98e7936d66d @@ -552,6 +562,7 @@ M ed102a26c22b5376ace2951d508485457f1f606b M edea785abd33bbc363bb3a9af926a1dbf7956cd1 M f00ca03f0852b8be195adbcee20c164a189e8b6e M f03c3b0f9dccf7ebec8e1016247091cb363344ea +M f05bdcfeafebdbe93c6d189514e084ae1d40cac0 M f125c9675817f159fbfc565c0cc0406dcfd2216d M f2ad3c15f9ed98cdbc7cb2abdaa0afda13faae24 M f3ff0735a7e0d8816bf0b43f5d97b54d5f034ff5
[cxf] branch 3.6.x-fixes updated (facc79ab85 -> ca4753067f)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from facc79ab85 CXF-8886: Support scraping javadocs generated by Java 17 (restore more strict visibility levels) (#1302) new 5b69dd06a6 [CXF-8885] Make an attempt to get the HttpClient selector threads to shutdown sooner Technically, they should shut themselves down about 3 seconds after a garbage collection assuming the client they are associated with is cleaned up and released. However, if many clients are used, this may be too long and thus we'll make an attempt (via some hacks) to get the thread to shutdown sooner. It's a shame HttpClient doesn't implement Closeable. :( new 800ec5225f Recording .gitmergeinfo Changes new ca4753067f Fix checkstyle The 3 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 | 11 +++ .../cxf/transport/http/HttpClientHTTPConduit.java | 37 ++ .../cxf/systest/jaxws/JaxWsClientThreadTest.java | 86 ++ 3 files changed, 134 insertions(+)
[cxf] 03/03: Fix checkstyle
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ca4753067f489ce45a300ad7e462883a8dc377b7
Author: Daniel Kulp
AuthorDate: Tue Jun 13 13:39:28 2023 -0400
Fix checkstyle
---
.../cxf/transport/http/HttpClientHTTPConduit.java | 5 +
.../cxf/systest/jaxws/JaxWsClientThreadTest.java | 18 +-
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index af7c81b2ec..f836903431 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -25,7 +25,6 @@ import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.PushbackInputStream;
-import java.lang.reflect.InvocationTargetException;
import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -34,7 +33,6 @@ import java.net.ProxySelector;
import java.net.SocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URLConnection;
import java.net.UnknownHostException;
import java.net.http.HttpClient;
import java.net.http.HttpClient.Redirect;
@@ -73,7 +71,6 @@ import javax.net.ssl.SSLSession;
import org.apache.cxf.Bus;
import org.apache.cxf.common.util.PropertyUtils;
-import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.helpers.JavaUtils;
@@ -137,7 +134,7 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
}
try {
ThreadGroup rootGroup = Thread.currentThread().getThreadGroup();
-Thread threads[] = new Thread[rootGroup.activeCount()];
+Thread[] threads = new Thread[rootGroup.activeCount()];
int cnt = rootGroup.enumerate(threads);
for (int x = 0; x < cnt; x++) {
if (threads[x].getName().contains(n)) {
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
index e853b0bf11..f5ef046053 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
@@ -224,7 +224,7 @@ public class JaxWsClientThreadTest extends AbstractCXFTest {
public void testMultiGreeterThreadSafety() throws Throwable {
URL url = getClass().getResource("/wsdl/hello_world.wsdl");
-final jakarta.xml.ws.Service s = jakarta.xml.ws.Service.create(url,
serviceName);
+final javax.xml.ws.Service s = javax.xml.ws.Service.create(url,
serviceName);
final int numThreads = 50;
final Throwable[] errorHolder = new Throwable[numThreads];
@@ -237,15 +237,15 @@ public class JaxWsClientThreadTest extends
AbstractCXFTest {
int start = rootGroup.activeCount();
Thread[] threads = new Thread[numThreads];
-for (int i = 0; i < numThreads; i++) {
-final int tid = i;
+for (int t = 0; t < numThreads; t++) {
+final int tid = t;
Runnable r = new Runnable() {
public void run() {
final Greeter greeter = s.getPort(portName, Greeter.class);
-try (AutoCloseable c = (AutoCloseable)greeter){
+try (AutoCloseable c = (AutoCloseable)greeter) {
final InvocationHandler handler =
Proxy.getInvocationHandler(greeter);
-Map requestContext =
((BindingProvider)handler).getRequestContext();
-
+Map requestContext =
((BindingProvider)handler).getRequestContext();
+
final String protocol = "http-" +
Thread.currentThread().getId();
for (int i = 0; i < 10; i++) {
String threadSpecificaddress = protocol +
"://localhost:80/" + i;
@@ -277,7 +277,7 @@ public class JaxWsClientThreadTest extends AbstractCXFTest {
}
}
};
-threads[i] = new Thread(r);
+threads[t] = new Thread(r);
}
for (int i = 0; i < numThreads; i++) {
threads[i].start();
@@ -301,8 +301,8 @@ public class JaxWsClientThreadTest extends AbstractCXFTest {
System.out.p
[cxf] branch main updated: [CXF-8885] Make an attempt to get the HttpClient selector threads to shutdown sooner Technically, they should shut themselves down about 3 seconds after a garbage collection
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 65711680af [CXF-8885] Make an attempt to get the HttpClient selector
threads to shutdown sooner Technically, they should shut themselves down about
3 seconds after a garbage collection assuming the client they are associated
with is cleaned up and released. However, if many clients are used, this may
be too long and thus we'll make an attempt (via some hacks) to get the thread
to shutdown sooner. It's a shame HttpClient doesn't implement Closeable. :(
65711680af is described below
commit 65711680af99de16f56cbaa819d207edb9428e8a
Author: Daniel Kulp
AuthorDate: Tue Jun 13 13:27:57 2023 -0400
[CXF-8885] Make an attempt to get the HttpClient selector threads to
shutdown sooner
Technically, they should shut themselves down about 3 seconds after a
garbage collection assuming the client they are associated with is cleaned up
and released. However, if many clients are used, this may be too long and
thus we'll make an attempt (via some hacks) to get the thread to shutdown
sooner. It's a shame HttpClient doesn't implement Closeable. :(
---
.../cxf/transport/http/HttpClientHTTPConduit.java | 40 ++
.../cxf/systest/jaxws/JaxWsClientThreadTest.java | 86 ++
2 files changed, 126 insertions(+)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index 2546e24bac..af7c81b2ec 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.PushbackInputStream;
+import java.lang.reflect.InvocationTargetException;
import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
@@ -33,6 +34,7 @@ import java.net.ProxySelector;
import java.net.SocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.URLConnection;
import java.net.UnknownHostException;
import java.net.http.HttpClient;
import java.net.http.HttpClient.Redirect;
@@ -71,6 +73,7 @@ import javax.net.ssl.SSLSession;
import org.apache.cxf.Bus;
import org.apache.cxf.common.util.PropertyUtils;
+import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.helpers.JavaUtils;
@@ -110,6 +113,43 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
|| lastURL.getPort() != url.getPort();
}
+/**
+ * Close the conduit
+ */
+public void close() {
+if (client != null) {
+String name = client.toString();
+client = null;
+tryToShutdownSelector(name);
+}
+defaultAddress = null;
+super.close();
+}
+private synchronized void tryToShutdownSelector(String n) {
+// it can take three seconds (or more) for the JVM to determine the
client
+// is unreferenced and then shutdown the selector thread, we'll try
and speed that
+// up. This is somewhat of a complete hack.
+int idx = n.lastIndexOf('(');
+if (idx > 0) {
+n = n.substring(idx + 1);
+n = n.substring(0, n.length() - 1);
+n = "HttpClient-" + n + "-SelectorManager";
+}
+try {
+ThreadGroup rootGroup = Thread.currentThread().getThreadGroup();
+Thread threads[] = new Thread[rootGroup.activeCount()];
+int cnt = rootGroup.enumerate(threads);
+for (int x = 0; x < cnt; x++) {
+if (threads[x].getName().contains(n)) {
+threads[x].interrupt();
+}
+}
+} catch (Throwable t) {
+//ignore, nothing we can do except wait for the garbage collection
+//and then the three seconds for the timeout
+}
+}
+
@Override
protected void setupConnection(Message message, Address address,
HTTPClientPolicy csPolicy) throws IOException {
URI uri = address.getURI();
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
index 921169dbc7..223faba554 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsClientThreadTest.java
+++
b/systests/jaxws/src/test/j
svn commit: r62388 - in /release/cxf: 3.6.1/ 4.0.2/
Author: dkulp Date: Mon Jun 12 21:17:17 2023 New Revision: 62388 Log: 4.0.2 3.6.1 Added: release/cxf/3.6.1/ release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz (with props) release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz.asc release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz.sha256 release/cxf/3.6.1/apache-cxf-3.6.1-src.zip (with props) release/cxf/3.6.1/apache-cxf-3.6.1-src.zip.asc release/cxf/3.6.1/apache-cxf-3.6.1-src.zip.sha256 release/cxf/3.6.1/apache-cxf-3.6.1.tar.gz (with props) release/cxf/3.6.1/apache-cxf-3.6.1.tar.gz.asc release/cxf/3.6.1/apache-cxf-3.6.1.tar.gz.sha256 release/cxf/3.6.1/apache-cxf-3.6.1.zip (with props) release/cxf/3.6.1/apache-cxf-3.6.1.zip.asc release/cxf/3.6.1/apache-cxf-3.6.1.zip.sha256 release/cxf/4.0.2/ release/cxf/4.0.2/apache-cxf-4.0.2-src.tar.gz (with props) release/cxf/4.0.2/apache-cxf-4.0.2-src.tar.gz.asc release/cxf/4.0.2/apache-cxf-4.0.2-src.tar.gz.sha256 release/cxf/4.0.2/apache-cxf-4.0.2-src.zip (with props) release/cxf/4.0.2/apache-cxf-4.0.2-src.zip.asc release/cxf/4.0.2/apache-cxf-4.0.2-src.zip.sha256 release/cxf/4.0.2/apache-cxf-4.0.2.tar.gz (with props) release/cxf/4.0.2/apache-cxf-4.0.2.tar.gz.asc release/cxf/4.0.2/apache-cxf-4.0.2.tar.gz.sha256 release/cxf/4.0.2/apache-cxf-4.0.2.zip (with props) release/cxf/4.0.2/apache-cxf-4.0.2.zip.asc release/cxf/4.0.2/apache-cxf-4.0.2.zip.sha256 Added: release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz == Binary file - no diff available. Propchange: release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz.asc == --- release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz.asc (added) +++ release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz.asc Mon Jun 12 21:17:17 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEUbUtxd1FL5K+NCzChY/ExPQ4VqMFAmR/VekACgkQhY/ExPQ4 +VqODhw//U5I5ZQfbgWpashPk9zLd82f/F4/43MXONdIldShXGNBhB30wyClCi1sl +0/LEkyJtiLGtiTx3xyoXYw12fG/KOFxMjWx76Trc3uXCUteCkCeBo8iKwu+Dbub2 +z2VBpEAxEJr7kbIq5Ldw1OWGpW9bAqPYH+sWPW4I7KJ2upCKVgQ5gbvtl9UPaV9G +UqjADSfshW52Nv3mPQpmHEFm6BBczwQKR88zOZTVnXym+G/mF5dBwE5bs6562fzK +2IpxjouwK8IHKYaaQnaXGLC1zUPMoJZ6NNpqxZWVSqrCGuf/i3wY8LwTiDz+Wp/T +u+7rOf7UXlcmBNRHZvj8B6sQHMhJ4h4PrphTGg3VCPvxCN3pddJoR7OnsIFIRg+w +B8uAfnivdV1560jzQtb7QTiStgDjYT9lPzIVRg2JhEd/Frc6kEE3IOVMlH1yGyGC +MmI3Lb1KbZoRhIhIgWQxYnFiIPCrc852QrqlRkzM1pDRMERwN10Equ69vVCvx6Vw +wR5qKeJEj+Jkm2bl8v4TS3xVgbN9tJLEGIwYmplbwoQS09sIV8BuoIEC+0OyYyG8 +RMKd3HBmvjGeDSl57eyzwzAdYLGol9Iv6j3yne2K/qylN0ARYl6IRBIsJlekf0jj +gAi36LAMe94ioPIrJfz3xxEj9kYYPcZQtp8Xex85PuIuOuAvex0= +=IRuc +-END PGP SIGNATURE- Added: release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz.sha256 == --- release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz.sha256 (added) +++ release/cxf/3.6.1/apache-cxf-3.6.1-src.tar.gz.sha256 Mon Jun 12 21:17:17 2023 @@ -0,0 +1 @@ +a05bf41c63fe0044f221290e5d87ead9a02feefb60a7783ab21f6343fe796028 apache-cxf-3.6.1-src.tar.gz Added: release/cxf/3.6.1/apache-cxf-3.6.1-src.zip == Binary file - no diff available. Propchange: release/cxf/3.6.1/apache-cxf-3.6.1-src.zip -- svn:mime-type = application/octet-stream Added: release/cxf/3.6.1/apache-cxf-3.6.1-src.zip.asc == --- release/cxf/3.6.1/apache-cxf-3.6.1-src.zip.asc (added) +++ release/cxf/3.6.1/apache-cxf-3.6.1-src.zip.asc Mon Jun 12 21:17:17 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEUbUtxd1FL5K+NCzChY/ExPQ4VqMFAmR/VekACgkQhY/ExPQ4 +VqMh6g/+LPt8MwVyj03YHDdzhOvKn/mMIHmWYXnPuXDied12JnR0wCAHn/jTyeu+ +Kw7tWuQelKLO2G2EvnBzO0TDVXOM0TJ57yZiX7pEkTYCgVNKyhqAuO1kVfG+rwCr +iHwvh7DF5kcWENWlzAkzNn8QVzO+FPI/1/lC4aBLeZyzz3/CRdka+9b+BAvp8MZT +lDlc4TVZRQDljP18zPvbsLC8f50WhciQxESVX3c9tG0a6F6Ne0qKi8Aslm66mIl5 +T/HN+vbanH0fM07QAu2EjaF0kHNTk6RoDgchVhDGs31bLlCFm853zBW3wRXfEAml +C6572JAbUoC287vy+C6mKRY8m/cBfGsLEzNWWJVLoIY3tFW5BIsymAuhoPa/dNhV +6EsB974U/pz/dyhcAmA4QpjBt3RNDnNBn22jubd6xHmQe8xCLwcpZ2rpWIoP98Px +/QgXs8H41FGXPSuFiiSBJweVyDzKQDYSteJN1CNelaN0kvDCfY+CU1vfOaiHhUAC +75X803eIfWAyR5vcrlwZgzitrLEub7y1QnrpadYQdc+rnrMgFT4AFKZlAfxyRaHY +Hkq8kDSAh40l99dFJbkYxxu0QRW/RceWNnAupfL/Y0RnVmi8vHHVHxcaVcuqWHKU +5sDhJ645POwIvBX2Gv6/USZUMRwU4kCxaYnwdiJQAPpk0sKdhP8= +=IRpd +-END PGP SIGNATURE- Added: release/cxf/3.6.1/apache-cxf-3.6.1-src.zip.sha256
[cxf] annotated tag cxf-4.0.2 created (now 17b0fb2fc1)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-4.0.2 in repository https://gitbox.apache.org/repos/asf/cxf.git at 17b0fb2fc1 (tag) tagging ea8b32093020842261e395ebaa7cb458faa7bd07 (commit) replaces cxf-4.0.1 by Daniel Kulp on Tue Jun 6 12:42:02 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-4.0.2 --- No new revisions were added by this update.
[cxf] branch main updated (3bb3b0dbe5 -> ec1ffc66d1)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 3bb3b0dbe5 Bump buildnumber-maven-plugin from 3.1.0 to 3.2.0 (#1293) add e9d8422af7 Fix checkstyle add ec1ffc66d1 Update release notes No new revisions were added by this update. Summary of changes: BUILDING.txt | 5 +-- SECURITY.md| 5 +-- distribution/src/main/release/release_notes.txt| 40 ++ pom.xml| 2 +- .../org/apache/cxf/jaxrs/impl/ResponseImpl.java| 8 ++--- .../org/apache/cxf/jaxrs/model/ProviderInfo.java | 12 +++ 6 files changed, 27 insertions(+), 45 deletions(-)
[cxf] annotated tag cxf-3.6.1 created (now 5850306690)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-3.6.1 in repository https://gitbox.apache.org/repos/asf/cxf.git at 5850306690 (tag) tagging cec58e80d94e1e40d6f0948a8cdb8b9eadb6268d (commit) replaces cxf-3.6.0 by Daniel Kulp on Tue Jun 6 11:25:34 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-3.6.1 --- No new revisions were added by this update.
[cxf] branch 3.6.x-fixes updated: Update release notes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.6.x-fixes by this push: new f466c1d881 Update release notes f466c1d881 is described below commit f466c1d881a996e45267f3b2e3210f0ebccdfdd4 Author: Daniel Kulp AuthorDate: Tue Jun 6 11:14:17 2023 -0400 Update release notes --- BUILDING.txt| 2 +- SECURITY.md | 6 +++--- distribution/src/main/release/release_notes.txt | 20 +++- pom.xml | 2 +- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index a7fccabf6b..4d9bc0ea82 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -12,7 +12,7 @@ Initial Setup JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or $JAVA_HOME$/bin (unix). -3) Install Maven 3.1 or newer, which can be downloaded from +3) Install Maven 3.8 or newer, which can be downloaded from http://maven.apache.org/download.html. Make sure that your PATH includes the MVN_HOME/bin directory. diff --git a/SECURITY.md b/SECURITY.md index 04702d233d..9d234fab3f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,10 +4,10 @@ | Version | Supported | | --- | -- | +| 4.0.x | :white_check_mark: | +| 3.6.x | :white_check_mark: | | 3.5.x | :white_check_mark: | -| 3.4.x | :white_check_mark: | -| 3.3.x | :white_check_mark: | -| < 3.3.x | :x:| +| <= 3.4.x | :x:| ## Reporting a Vulnerability diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index 4ac57b6bf5..4bfe6796d5 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,4 +1,4 @@ -Apache CXF 3.6.0 Release Notes +Apache CXF 3.6.1 Release Notes 1. Overview @@ -24,6 +24,8 @@ http://cxf.apache.org/docs/36-migration-guide.html for further information and requirements for upgrading from earlier versions of CXF. +3.6.1 fixes over 5 issues reported by users. + 2. Installation Prerequisites @@ -61,3 +63,19 @@ http://issues.apache.org/jira/browse/CXF See the migration guide at: http://cxf.apache.org/docs/36-migration-guide.html for caveats when upgrading. + +7. Release Notes + +** Sub-task +* [CXF-8606] - Introduce HTTP/2 Transport: client-side support (Netty & HttpClient 5) + +** Bug +* [CXF-8881] - WSDLValidator link doesn't work +* [CXF-8882] - Apache HttpClient 5 async conduit does not handle authentication +* [CXF-8884] - Update commons-jexl3 to 3.3 + +** Improvement +* [CXF-8802] - Update to Maven Remote Resources Plugin 3.1.0 + + + diff --git a/pom.xml b/pom.xml index e796e85fb6..1b732780c8 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ false -4.0.2-SNAPSHOT +4.0.1 3.3.2 11 UTF-8
[cxf] 03/03: Fix checkstyle
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 91c97378d9a64166b3099cad6a9f842d18c5bcad
Author: Daniel Kulp
AuthorDate: Tue Jun 6 10:58:15 2023 -0400
Fix checkstyle
---
.../main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java| 8
.../main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java | 12 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index 7404c96a9e..a757ad4e32 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -635,8 +635,8 @@ public final class ResponseImpl extends Response {
@Override
public String toString() {
-return "ResponseImpl{" +
-"status=" + (status == null ? "null" : status.getStatusCode())
+
-'}';
+return "ResponseImpl{"
++ "status=" + (status == null ? "null" :
status.getStatusCode())
++ "}";
}
-}
\ No newline at end of file
+}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
index e0fc2c074b..acb7120976 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
@@ -108,11 +108,11 @@ public class ProviderInfo extends AbstractResourceInfo
{
@Override
public String toString() {
-return "ProviderInfo{" +
-"provider=" + provider.getClass().getName() +
-", custom=" + custom +
-", busGlobal=" + busGlobal +
-", root=" + root +
-'}';
+return "ProviderInfo{"
++ "provider=" + provider.getClass().getName()
++ ", custom=" + custom
++ ", busGlobal=" + busGlobal
++ ", root=" + root
++ "}";
}
}
[cxf] 01/03: Some toString methods to help with debugging
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5f01178a1fa46f35c7b75076742cbcef2e615152
Author: David Blevins
AuthorDate: Fri Dec 16 12:30:42 2022 -0800
Some toString methods to help with debugging
(cherry picked from commit d0d9d77a17883e863571c87626e46ae86958209e)
---
.../src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java | 11 +--
.../main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java| 9 +
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index f18e211983..7404c96a9e 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -556,10 +556,10 @@ public final class ResponseImpl extends Response {
protected void autoClose(Class cls, boolean exception) {
autoCloseWithHint(cls, false, exception);
}
-
+
protected void autoCloseWithHint(Class cls, boolean autoCloseHint,
boolean exception) {
if (!entityBufferred && !JAXRSUtils.isStreamingOutType(cls)
-&& (exception || MessageUtils.getContextualBoolean(outMessage,
+&& (exception || MessageUtils.getContextualBoolean(outMessage,
RESPONSE_STREAM_AUTO_CLOSE, autoCloseHint))) {
close();
}
@@ -632,4 +632,11 @@ public final class ResponseImpl extends Response {
return type.isPrimitive() || Number.class.isAssignableFrom(type) ||
Boolean.class.isAssignableFrom(type)
|| Character.class.isAssignableFrom(type);
}
+
+@Override
+public String toString() {
+return "ResponseImpl{" +
+"status=" + (status == null ? "null" : status.getStatusCode())
+
+'}';
+}
}
\ No newline at end of file
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
index c1e3923998..e0fc2c074b 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
@@ -106,4 +106,13 @@ public class ProviderInfo extends AbstractResourceInfo {
this.busGlobal = busGlobal;
}
+@Override
+public String toString() {
+return "ProviderInfo{" +
+"provider=" + provider.getClass().getName() +
+", custom=" + custom +
+", busGlobal=" + busGlobal +
+", root=" + root +
+'}';
+}
}
[cxf] 02/03: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 44b60ff6a49811ebfe2cd94b6aff64e785bd3767 Author: Daniel Kulp AuthorDate: Tue Jun 6 10:04:11 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 19 +++ 1 file changed, 19 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 377c5e2793..b37f5af84e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -13,6 +13,7 @@ B 0ecf85b387b5def229a997c60416f37cd987e8f3 B 0edc6a8f2e4051e24ccc65ee30dd05fe7f3b05c9 B 0f2a3fdf5ac92e4789f8099b75fe2fc841fdb048 B 0f2f9d35779a8e3387bb76d8d3b1ecd688a0c1da +B 0f43bd534763f9ebe6ac8c2a0746bd257f5edc30 B 145b3a3fd6b598693a155ba329c720265e72b08f B 14b45d215535f4c69261dc8cdc5342b93c3c1235 B 194f6aa32321826865293527d0511a965a83fd54 @@ -37,9 +38,11 @@ B 3983c304fcec6b40d60f3c804dd6537cf3b4d2c1 B 3a25cab6172083d26f2cc5f29a134c11214d5131 B 3a9583d5edf20a16dd2fa739a9fb8fbce8168a23 B 3b700961ead8a1c23ef945275bfe4defe22ea81d +B 3bb3b0dbe55e2d29b489ea983f6f15fd140bd010 B 3d5564dbff38b782837e291871cd210351acbfc2 B 419e1849157cfe0146227dfc3e8da7c693c71045 B 43e1aa22d5498bc0a324fc57292e241c42e7ea0c +B 448ce7865eae2f20208e238af2ad1e795d359ed7 B 48a2c301cdb8cc4ffce0480e670b694cca3e6249 B 49cf9ffa8aac88631b4ad16187812e3700069cd9 B 4a71fea3e7a826f8022bf59b113b1a27649f370e @@ -59,6 +62,7 @@ B 58ae0ed63c9361ad5e9591c5cf8bf6f34d1649fd B 5e88225f5b45ca03416e616e77f602e62b25ace5 B 60aa618e06d0bbaadd7bc65d3cd3503673e53a6b B 60f00a123ee85f6865e24ee35a91e4ec6eced62c +B 6266242cb5e720efdd0add51842ea953376494f9 B 634758b2e0352a489e39cb96c9b834369fcb444f B 647408469988d9e244086efc839b2f6ab5e42cd7 B 64d861dd27daa09363144f5b6d0de367dd369ae1 @@ -171,6 +175,7 @@ M 07d4d658494ab19860932d6ec83059c7ab9443cb M 0800f5d26a5d8671db7ce9035c86bffbefb0cdfe M 08f9a8e455896e005c508ab376a55d8edc2cc168 M 09211352a70bef5e309f9e93a9548eb9657e0673 +M 09322cd6b93f4b236f8ed030f65a232bebba9892 M 0973afd32b7a5990481eef2324a35cea02a71024 M 0a106ca8313663f324b57606a72ef6da76aa1ce0 M 0bfc8552e73a54cf5fe52633be18e81edf1a375d @@ -183,6 +188,7 @@ M 0f2a3fdf5ac92e4789f8099b75fe2fc841fdb048 M 0f2f9d35779a8e3387bb76d8d3b1ecd688a0c1da M 0faa7345c7ac6386e464a60436e71c4c63abc9a1 M 0fcbc5360a2a2ad6738874c46db48d63ff846a9a +M 101a68321fde9a9595dc15c799259025e0386cf4 M 1065c7070bb7d3ba5f1553956a308b316b2ea572 M 106c310b39a5b611cd8b8c2de4b4070e1d52b498 M 11502cd9e0f85ded3ae83b3df7226d2e107159ab @@ -226,6 +232,7 @@ M 24151890ce517fcd8cfb5db08251e9088f4d7e85 M 2419865a4d160ef5973d3fbb8adb3dd50472e6a3 M 24b749e191c51a1a6e509dfaef482380d0859120 M 253186a0d19c628e84e0558dd950a6d6b9e5be93 +M 2534e01ee84f47d5fd75af56c811b041d24b5234 M 254586ce54966d15dffd9933f76c6d7581142c18 M 27813a0523e1b4ab7cccd980ef63d7249627f4e8 M 278431e8adc631b7089f979d455fc54a721c7ab0 @@ -258,6 +265,7 @@ M 34552752819b0bad272fcb67537c8df1b4c1ba3c M 3510be0065382444daf8eaf728fdf0240fd03a9b M 360f80381d8fc44045a5dcf8fa276f56709d383d M 365932977e4c97b34ca6de47425fd60054d91511 +M 37537290932d3d399819a223142ab190fbafd3f4 M 383c9273a0b88931fef8117c6f0e481fa31734e4 M 396c32848ff70a7cd77bfcd5ea80a4b4abe4c20c M 3983c304fcec6b40d60f3c804dd6537cf3b4d2c1 @@ -277,7 +285,9 @@ M 461c06ea6087e60f4b5aa6d8985fb1177c851c9c M 464dd9a4d5ed3631865cbb7574158234ba6fb9e9 M 46ebe303e8efc5c2f31fa15619852b2abd080d5e M 46fff187395f52cf5be098b208f3b0a939b80bff +M 470e03a82c05c5f353dde861c2b5442acad4f9ad M 474317828798de64b29483f212a43ec03ecf1d39 +M 48595425eb69a8db662233991a409fb4e2b38149 M 48a2c301cdb8cc4ffce0480e670b694cca3e6249 M 49b9b597344089ec143129b441eed62e959c81f8 M 4b96bea6a3a2241ce891196fd6eacb34dce0e91d @@ -330,6 +340,7 @@ M 66f581222723f7fb3aaf8b7c0f50a117db6b0ea6 M 671cf75bcf3eb169eb98cbe398131ad9f9551529 M 683e2b1bbd5f629d2d6d5726849f6f8d16298202 M 688e0c16e8a760c839c52f01e210998c947c0037 +M 6b4d9482558bab1538aa375424a8b7a430e91395 M 6bb1a69c531ec15a521bd736db6195e9506a4679 M 6c56c4c41492b9e7660474867f7ff2d69ffb3727 M 6cc5829898b4c2324732ac98a885ea9ea1a50662 @@ -359,6 +370,7 @@ M 8038d267a217c1d3f41d4e6655b7a60c4a4486bc M 804ce3a646dfd81e90b2cd78d9c6b7b21cae3b86 M 80cf0d301fc3381b680538b0b4fae6c67efd4045 M 81532faf1c2b8b08a09f90b1a658605f3158e5f9 +M 8196761b0336ab21d94d5601c4b296beaa460f6e M 8207f6bf9c0e4f1833ba20ba61adb6bff0921253 M 8394701f3327adaac409d950a1756eca9fc7a0c8 M 84e897dfbda3bff1d6be3c3b44ef36c039cb8c92 @@ -376,6 +388,7 @@ M 8d07a7698748190367bc81faa6b67396eae42b5b M 8dbb29c3ff09f320c90da5af1e74bb79e66b1328 M 8e1c471c27dffdb10c262b7af7dd7991c5d3dc7c M 8e7283f3c9369991787f63f8601e23013afe63bb +M 8ed5a0d4a801f63ce4673d0e3f6e3707c9916901 M 8f4d3d46413666d07c903ef622fb617b1be1385f M 8f81fd87c458a87f9871231b5e8eef3c7d5840a1 M 8ffec0eb10eab9894ea62152e1e6f3eb962beca9 @@ -415,6 +428,7 @@ M a54e2dbe6e4dc2d74472e2db523a5290378da325 M a64ce3f9d03e18d2f26bdd0ca39d442591b14ff3 M
[cxf] branch 3.6.x-fixes updated (d899b59bb9 -> 91c97378d9)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from d899b59bb9 Bump buildnumber-maven-plugin from 3.1.0 to 3.2.0 (#1293) new 5f01178a1f Some toString methods to help with debugging new 44b60ff6a4 Recording .gitmergeinfo Changes new 91c97378d9 Fix checkstyle The 3 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 | 19 +++ .../java/org/apache/cxf/jaxrs/impl/ResponseImpl.java | 13 ++--- .../java/org/apache/cxf/jaxrs/model/ProviderInfo.java | 9 + 3 files changed, 38 insertions(+), 3 deletions(-)
[cxf] branch main updated (0f43bd5347 -> d6d29ddea0)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 0f43bd5347 Remove duplicate properties add d6d29ddea0 CXF-8879: OSGi bundle manifest are broken (fixing a few missed ones) No new revisions were added by this update. Summary of changes: rt/transports/websocket/pom.xml| 9 ++ rt/ws/addr/pom.xml | 5 rt/ws/eventing/pom.xml | 7 + rt/ws/mex/pom.xml | 5 rt/ws/policy/pom.xml | 5 rt/ws/rm/pom.xml | 6 rt/ws/security/pom.xml | 10 +++ rt/wsdl/pom.xml| 4 +++ services/sts/sts-core/pom.xml | 13 services/ws-discovery/ws-discovery-api/pom.xml | 9 ++ services/ws-discovery/ws-discovery-service/pom.xml | 1 + services/wsn/wsn-api/pom.xml | 13 services/wsn/wsn-core/pom.xml | 32 services/wsn/wsn-osgi/pom.xml | 35 ++ services/xkms/xkms-client/pom.xml | 8 + services/xkms/xkms-common/pom.xml | 5 services/xkms/xkms-x509-handlers/pom.xml | 3 ++ testutils/pom.xml | 8 + tools/common/pom.xml | 4 +++ tools/corba/pom.xml| 3 ++ tools/javato/ws/pom.xml| 5 tools/validator/pom.xml| 7 + tools/wsdlto/core/pom.xml | 3 ++ tools/wsdlto/frontend/jaxws/pom.xml| 5 24 files changed, 205 insertions(+)
[cxf] branch main updated (9393d08995 -> 0f43bd5347)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 9393d08995 CXF-8879: OSGi bundle manifest are broken add 0f43bd5347 Remove duplicate properties No new revisions were added by this update. Summary of changes: parent/pom.xml | 8 1 file changed, 8 deletions(-)
[cxf] branch main updated (d0d9d77a17 -> 9393d08995)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from d0d9d77a17 Some toString methods to help with debugging add 9393d08995 CXF-8879: OSGi bundle manifest are broken No new revisions were added by this update. Summary of changes: core/pom.xml| 32 +++-- integration/cdi/pom.xml | 9 + integration/tracing/tracing-brave/pom.xml | 5 +++ integration/tracing/tracing-opentracing/pom.xml | 5 +++ parent/pom.xml | 41 + pom.xml | 2 +- rt/bindings/coloc/pom.xml | 4 +++ rt/bindings/corba/pom.xml | 6 rt/bindings/soap/pom.xml| 7 rt/bindings/xml/pom.xml | 3 ++ rt/databinding/aegis/pom.xml| 5 +++ rt/databinding/jaxb/pom.xml | 4 +++ rt/features/clustering/pom.xml | 3 ++ rt/frontend/jaxrs/pom.xml | 47 + rt/frontend/jaxws/pom.xml | 16 + rt/frontend/js/pom.xml | 3 ++ rt/frontend/simple/pom.xml | 5 +++ rt/management/pom.xml | 4 +++ rt/rs/client/pom.xml| 4 +++ rt/rs/description-common-openapi/pom.xml| 4 +++ rt/rs/description-openapi-v3/pom.xml| 4 +++ rt/rs/description-swagger-ui/pom.xml| 3 ++ rt/rs/description/pom.xml | 4 +++ rt/rs/extensions/providers/pom.xml | 4 +++ rt/rs/extensions/search/pom.xml | 5 +++ rt/rs/http-sci/pom.xml | 3 ++ rt/rs/microprofile-client/pom.xml | 21 +++ rt/rs/security/cors/pom.xml | 3 ++ rt/rs/security/jose-parent/jose-jaxrs/pom.xml | 4 +++ rt/rs/security/oauth-parent/oauth2-saml/pom.xml | 3 ++ rt/rs/security/oauth-parent/oauth2/pom.xml | 6 rt/rs/security/sso/oidc/pom.xml | 3 ++ rt/rs/security/sso/saml/pom.xml | 7 rt/rs/security/xml/pom.xml | 3 ++ rt/rs/sse/pom.xml | 3 ++ rt/security-saml/pom.xml| 3 ++ rt/transports/http-hc/pom.xml | 3 ++ rt/transports/http-jetty/pom.xml| 10 ++ rt/transports/http-netty/netty-client/pom.xml | 4 +++ rt/transports/http-netty/netty-server/pom.xml | 10 ++ rt/transports/http-undertow/pom.xml | 8 + rt/transports/http/pom.xml | 14 rt/transports/jms/pom.xml | 5 +++ 43 files changed, 339 insertions(+), 3 deletions(-)
[cxf] branch main updated: Some toString methods to help with debugging
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new d0d9d77a17 Some toString methods to help with debugging
d0d9d77a17 is described below
commit d0d9d77a17883e863571c87626e46ae86958209e
Author: David Blevins
AuthorDate: Fri Dec 16 12:30:42 2022 -0800
Some toString methods to help with debugging
---
.../src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java | 11 +--
.../main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java| 9 +
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index be51d582c7..50be66c91f 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -556,10 +556,10 @@ public final class ResponseImpl extends Response {
protected void autoClose(Class cls, boolean exception) {
autoCloseWithHint(cls, false, exception);
}
-
+
protected void autoCloseWithHint(Class cls, boolean autoCloseHint,
boolean exception) {
if (!entityBufferred && !JAXRSUtils.isStreamingOutType(cls)
-&& (exception || MessageUtils.getContextualBoolean(outMessage,
+&& (exception || MessageUtils.getContextualBoolean(outMessage,
RESPONSE_STREAM_AUTO_CLOSE, autoCloseHint))) {
close();
}
@@ -632,4 +632,11 @@ public final class ResponseImpl extends Response {
return type.isPrimitive() || Number.class.isAssignableFrom(type) ||
Boolean.class.isAssignableFrom(type)
|| Character.class.isAssignableFrom(type);
}
+
+@Override
+public String toString() {
+return "ResponseImpl{" +
+"status=" + (status == null ? "null" : status.getStatusCode())
+
+'}';
+}
}
\ No newline at end of file
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
index c1e3923998..e0fc2c074b 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ProviderInfo.java
@@ -106,4 +106,13 @@ public class ProviderInfo extends AbstractResourceInfo {
this.busGlobal = busGlobal;
}
+@Override
+public String toString() {
+return "ProviderInfo{" +
+"provider=" + provider.getClass().getName() +
+", custom=" + custom +
+", busGlobal=" + busGlobal +
+", root=" + root +
+'}';
+}
}
[cxf] branch main updated: Restore osgi bundle name, not really sure if this helps
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 448ce7865e Restore osgi bundle name, not really sure if this helps
448ce7865e is described below
commit 448ce7865eae2f20208e238af2ad1e795d359ed7
Author: Daniel Kulp
AuthorDate: Fri Jun 2 17:12:02 2023 -0400
Restore osgi bundle name, not really sure if this helps
---
core/pom.xml | 6 ++
parent/pom.xml | 8
2 files changed, 14 insertions(+)
diff --git a/core/pom.xml b/core/pom.xml
index debf890720..57b38aa30b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -32,6 +32,10 @@
org.apache.cxf.core
+
+org.slf4j.impl;resolution:=optional,
+com.sun.*;resolution:=optional
+
@@ -80,11 +84,13 @@
org.slf4j
slf4j-jdk14
+true
test
org.slf4j
jcl-over-slf4j
+true
test
diff --git a/parent/pom.xml b/parent/pom.xml
index e6080ea11f..6bec5e7b88 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -57,6 +57,14 @@
asm
9.5
5.1.0
+
+
+
+lazy
+
+
+
${project.groupId}.${project.artifactId}
+
2.28.0
[cxf] branch main updated: Actually test that failover occured, fix failover with HttpClient based conduit
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 3753729093 Actually test that failover occured, fix failover with
HttpClient based conduit
3753729093 is described below
commit 37537290932d3d399819a223142ab190fbafd3f4
Author: Daniel Kulp
AuthorDate: Fri May 26 11:55:47 2023 -0400
Actually test that failover occured, fix failover with HttpClient based
conduit
---
.../java/org/apache/cxf/clustering/FailoverTargetSelector.java| 8 +---
.../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java | 3 +++
.../java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java | 8 +---
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
index f14d968acb..1b4466cf1d 100644
---
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
+++
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
@@ -305,9 +305,11 @@ public class FailoverTargetSelector extends
AbstractConduitSelector {
private Exception getExceptionIfPresent(Exchange exchange) {
Message outMessage = exchange.getOutMessage();
-return outMessage.get(Exception.class) != null
-? outMessage.get(Exception.class)
-: exchange.get(Exception.class);
+Exception ex = outMessage.get(Exception.class);
+if (ex == null) {
+ex = outMessage.getContent(Exception.class);
+}
+return ex != null ? ex : exchange.get(Exception.class);
}
/**
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 83fc672244..33b6157559 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -1217,6 +1217,9 @@ public abstract class HTTPConduit
} catch (Throwable e) {
((PhaseInterceptorChain)outMessage.getInterceptorChain()).abort();
outMessage.setContent(Exception.class, e);
+if (e instanceof Exception) {
+outMessage.put(Exception.class, (Exception)e);
+}
((PhaseInterceptorChain)outMessage.getInterceptorChain()).unwind(outMessage);
MessageObserver mo =
outMessage.getInterceptorChain().getFaultObserver();
if (mo == null) {
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
index 8bc5cfef0e..90671aaa35 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
@@ -37,6 +37,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class JaxwsAsyncFailOverTest extends AbstractBusClientServerTestBase {
@@ -105,12 +106,13 @@ public class JaxwsAsyncFailOverTest extends
AbstractBusClientServerTestBase {
Response response = proxy.greetMeAsync("cxf");
int waitCount = 0;
-while (!response.isDone() && waitCount < 15) {
-Thread.sleep(1000);
+while (!response.isDone() && waitCount < 150) {
+Thread.sleep(100);
waitCount++;
}
assertTrue("Response still not received.", response.isDone());
-
+//make sure we actually got a proper response and not an exception
+assertEquals("CXF", response.get().getResponseType());
}
}
[cxf] branch 3.6.x-fixes updated: Fix checkstyle
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 9ebf3d40ac Fix checkstyle
9ebf3d40ac is described below
commit 9ebf3d40ac6db1dc51aa49fd9e3a5c3129b252c9
Author: Daniel Kulp
AuthorDate: Fri May 26 11:58:15 2023 -0400
Fix checkstyle
---
.../test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
index ef91332e86..7abe0ed7ca 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
@@ -38,8 +38,8 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
public class JaxwsAsyncFailOverTest extends AbstractBusClientServerTestBase {
static final String PORT = allocatePort(ServerNoBodyParts.class, 1);
[cxf] branch 3.6.x-fixes updated: Actually test that failover occured, fix failover with HttpClient based conduit
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 84e8e3bbad Actually test that failover occured, fix failover with
HttpClient based conduit
84e8e3bbad is described below
commit 84e8e3bbad1d69321aa4e783c2930ef1cc3ec32c
Author: Daniel Kulp
AuthorDate: Fri May 26 11:55:47 2023 -0400
Actually test that failover occured, fix failover with HttpClient based
conduit
---
.../java/org/apache/cxf/clustering/FailoverTargetSelector.java| 8 +---
.../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java | 3 +++
.../java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java | 8 +---
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
index 46ab74f3ba..6f7e11b2ce 100644
---
a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
+++
b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
@@ -305,9 +305,11 @@ public class FailoverTargetSelector extends
AbstractConduitSelector {
private Exception getExceptionIfPresent(Exchange exchange) {
Message outMessage = exchange.getOutMessage();
-return outMessage.get(Exception.class) != null
-? outMessage.get(Exception.class)
-: exchange.get(Exception.class);
+Exception ex = outMessage.get(Exception.class);
+if (ex == null) {
+ex = outMessage.getContent(Exception.class);
+}
+return ex != null ? ex : exchange.get(Exception.class);
}
/**
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 83fc672244..33b6157559 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -1217,6 +1217,9 @@ public abstract class HTTPConduit
} catch (Throwable e) {
((PhaseInterceptorChain)outMessage.getInterceptorChain()).abort();
outMessage.setContent(Exception.class, e);
+if (e instanceof Exception) {
+outMessage.put(Exception.class, (Exception)e);
+}
((PhaseInterceptorChain)outMessage.getInterceptorChain()).unwind(outMessage);
MessageObserver mo =
outMessage.getInterceptorChain().getFaultObserver();
if (mo == null) {
diff --git
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
index df8e9d5636..ef91332e86 100644
---
a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
+++
b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxwsAsyncFailOverTest.java
@@ -39,6 +39,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
public class JaxwsAsyncFailOverTest extends AbstractBusClientServerTestBase {
static final String PORT = allocatePort(ServerNoBodyParts.class, 1);
@@ -106,12 +107,13 @@ public class JaxwsAsyncFailOverTest extends
AbstractBusClientServerTestBase {
Response response = proxy.greetMeAsync("cxf");
int waitCount = 0;
-while (!response.isDone() && waitCount < 15) {
-Thread.sleep(1000);
+while (!response.isDone() && waitCount < 150) {
+Thread.sleep(100);
waitCount++;
}
assertTrue("Response still not received.", response.isDone());
-
+//make sure we actually got a proper response and not an exception
+assertEquals("CXF", response.get().getResponseType());
}
}
[cxf] branch main updated: HttpClient will throw an exception for various restricted headers
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 333e8b0b1c HttpClient will throw an exception for various restricted
headers
333e8b0b1c is described below
commit 333e8b0b1c0ae2081392c2872595d15d9c86c5e2
Author: Daniel Kulp
AuthorDate: Thu May 25 12:17:11 2023 -0400
HttpClient will throw an exception for various restricted headers
---
.../apache/cxf/transport/http/HttpClientHTTPConduit.java | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index 01fd631afc..2546e24bac 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -55,6 +55,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Flow;
@@ -83,7 +85,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
public class HttpClientHTTPConduit extends URLConnectionHTTPConduit {
-
+private static final Set RESTRICTED_HEADERS =
getRestrictedHeaders();
volatile HttpClient client;
volatile int lastTlsHash = -1;
volatile URI sslURL;
@@ -96,7 +98,12 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
super(b, ei, t);
}
-
+private static Set getRestrictedHeaders() {
+Set headers = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+headers.addAll(Set.of("Connection", "Content-Length", "Expect",
"Host", "Upgrade"));
+return headers;
+}
+
private boolean isSslTargetDifferent(URI lastURL, URI url) {
return !lastURL.getScheme().equals(url.getScheme())
|| !lastURL.getHost().equals(url.getHost())
@@ -313,8 +320,8 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
for (Map.Entry> head :
h.headerMap().entrySet()) {
List headerList = head.getValue();
String header = head.getKey();
-if ("Connection".equals(header)) {
-//HttpClient does not allow the Connection header
+if (RESTRICTED_HEADERS.contains(header)) {
+//HttpClient does not allow some restricted headers
continue;
}
if (HttpHeaderHelper.CONTENT_TYPE.equalsIgnoreCase(header)) {
[cxf] branch 3.6.x-fixes updated: HttpClient will throw an exception for various restricted headers
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 395cba5b5a HttpClient will throw an exception for various restricted
headers
395cba5b5a is described below
commit 395cba5b5a6b6725e6a54d41ee9b3b1675ffbb43
Author: Daniel Kulp
AuthorDate: Thu May 25 12:17:11 2023 -0400
HttpClient will throw an exception for various restricted headers
---
.../apache/cxf/transport/http/HttpClientHTTPConduit.java | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index 01fd631afc..2546e24bac 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -55,6 +55,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Flow;
@@ -83,7 +85,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
public class HttpClientHTTPConduit extends URLConnectionHTTPConduit {
-
+private static final Set RESTRICTED_HEADERS =
getRestrictedHeaders();
volatile HttpClient client;
volatile int lastTlsHash = -1;
volatile URI sslURL;
@@ -96,7 +98,12 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
super(b, ei, t);
}
-
+private static Set getRestrictedHeaders() {
+Set headers = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
+headers.addAll(Set.of("Connection", "Content-Length", "Expect",
"Host", "Upgrade"));
+return headers;
+}
+
private boolean isSslTargetDifferent(URI lastURL, URI url) {
return !lastURL.getScheme().equals(url.getScheme())
|| !lastURL.getHost().equals(url.getHost())
@@ -313,8 +320,8 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
for (Map.Entry> head :
h.headerMap().entrySet()) {
List headerList = head.getValue();
String header = head.getKey();
-if ("Connection".equals(header)) {
-//HttpClient does not allow the Connection header
+if (RESTRICTED_HEADERS.contains(header)) {
+//HttpClient does not allow some restricted headers
continue;
}
if (HttpHeaderHelper.CONTENT_TYPE.equalsIgnoreCase(header)) {
[cxf] branch 3.6.x-fixes updated: Use a little bit of reflection to allow services to still run with jetty9 (in Karaf for example) as well as jetty 10.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 2ff1093580 Use a little bit of reflection to allow services to still
run with jetty9 (in Karaf for example) as well as jetty 10.
2ff1093580 is described below
commit 2ff109358027653d1afd6f252cf6f25048cafbb9
Author: Daniel Kulp
AuthorDate: Thu May 25 10:44:33 2023 -0400
Use a little bit of reflection to allow services to still run with jetty9
(in Karaf for example) as well as jetty 10.
---
parent/pom.xml | 1 +
.../http_jetty/JettyHTTPServerEngine.java | 61 +-
.../NoUpgradeHTTP2CServerConnectionFactory.java| 44
.../http_jetty/JettyHTTPDestinationTest.java | 20 +++
4 files changed, 91 insertions(+), 35 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index fd7a5af5cc..61f41e9624 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -153,6 +153,7 @@
1.5.4
[9.2,11)
10.0.15
+9.4.51.v20230217
${cxf.jetty10.version}
3.2.1
2.10.10
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 2cfe49fdba..658f155e8a 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -23,6 +23,7 @@ import java.io.Closeable;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.io.Writer;
+import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
@@ -56,13 +57,9 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.transport.HttpUriMapper;
import org.apache.cxf.transport.http.HttpServerEngineSupport;
import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
-import org.eclipse.jetty.http.BadMessageException;
-import org.eclipse.jetty.http.HttpFields.Mutable;
import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;
import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory;
-import org.eclipse.jetty.io.Connection;
-import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.security.SecurityHandler;
import org.eclipse.jetty.server.AbstractConnector;
import org.eclipse.jetty.server.ConnectionFactory;
@@ -608,7 +605,13 @@ public class JettyHTTPServerEngine implements
ServerEngine, HttpServerEngineSupp
try {
Container container = getContainer(server);
-container.addEventListener(mBeanContainer);
+Method[] methods =
ReflectionUtil.getDeclaredMethods(container.getClass());
+for (Method m : methods) {
+if ("addEventListener".equals(m.getName())) {
+ReflectionUtil.setAccessible(m).invoke(container,
mBeanContainer);
+}
+}
+//container.addEventListener(mBeanContainer);
mBeanContainer.beanAdded(null, server);
} catch (RuntimeException rex) {
throw rex;
@@ -693,9 +696,18 @@ public class JettyHTTPServerEngine implements
ServerEngine, HttpServerEngineSupp
// additional dependency.
final ALPNServerConnectionFactory alpn = new
ALPNServerConnectionFactory();
alpn.setDefaultProtocol(httpFactory.getProtocol());
+
+Constructor[] cons
+=
ReflectionUtil.getDeclaredConstructors(SslConnectionFactory.class);
+for (Constructor c : cons) {
+if (c.getParameterCount() == 2
+&& c.getParameterTypes()[1] == String.class
+&& c.getParameterTypes()[0].isInstance(sslcf))
{
+SslConnectionFactory scf =
c.newInstance(sslcf, alpn.getProtocol());
+connectionFactories.add(scf);
+}
+}
-final SslConnectionFactory scf = new
SslConnectionFactory(sslcf, alpn.getProtocol());
-connectionFactories.add(scf);
connectionFactories.add(alpn);
connectionFactories.add(new
HTTP2ServerConnectionFactory(httpConfig));
} catch (Throwable ex) {
@@ -705,8 +717,16 @@ public class JettyHTTPServerEngin
[cxf] branch 3.6.x-fixes updated: Fix jetty osgi version range
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new ca648669c4 Fix jetty osgi version range
ca648669c4 is described below
commit ca648669c438c08da251b1bdc176a53dda555738
Author: Daniel Kulp
AuthorDate: Tue May 23 09:00:42 2023 -0400
Fix jetty osgi version range
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9be3c5d24a..fd7a5af5cc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -151,7 +151,7 @@
1.1.1
1.0
1.5.4
-[9.2,10)
+[9.2,11)
10.0.15
${cxf.jetty10.version}
3.2.1
svn commit: r1083150 - in /websites/production/cxf/content/javadoc: ./ latest-3.6.x/ latest-3.6.x/legal/ latest-3.6.x/org/ latest-3.6.x/org/apache/ latest-3.6.x/org/apache/cxf/ latest-3.6.x/org/apache
Author: dkulp Date: Tue May 9 16:43:46 2023 New Revision: 1083150 Log: Latest javadocs [This commit notification would consist of 537 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 0c9f103d1697561b3c077aac73f242981bd43c8f Author: Daniel Kulp AuthorDate: Tue May 9 11:21:37 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 6 ++ 1 file changed, 6 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 10daab0890..34674ee707 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -49,6 +49,7 @@ B 4b96bea6a3a2241ce891196fd6eacb34dce0e91d B 4bb4154125648a04d88cb7999f4d054a00e5c79b B 4d7faf61a0a3a06146581f6f6d1611d3ff812e23 B 4e3b0f1d80a8d534f5d89f2818a13083fdae1164 +B 5010c700f1ec564ff54f6ea6549712b4e2521e5e B 51031dd3921322e9f7f9f51b3d5d2d0adf3e8224 B 517c8c2ba083e884125d153be02482101bd7dc72 B 538a3869e3edef90ca7c32929ca1911e60ab941f @@ -61,6 +62,7 @@ B 60f00a123ee85f6865e24ee35a91e4ec6eced62c B 634758b2e0352a489e39cb96c9b834369fcb444f B 647408469988d9e244086efc839b2f6ab5e42cd7 B 64d861dd27daa09363144f5b6d0de367dd369ae1 +B 69cb869d65cc2db3e804f6c8b735ac29fcbbe706 B 6c3110c4277f47f6854734182be1ece4a2a2f623 B 6d3286cb9fa4810d5ad8e24581fb6bddf800f584 B 6dfaa3dc68347b418bab519bff3247a0551655fa @@ -81,9 +83,11 @@ B 95ce55cf1d7a405c209d3a858a82b4279f24bd91 B 9723e32190d3a820e0eecf19177561155399c867 B 98fee994fc05cf2d6a563f995aeaae4f25e54d35 B 990d3332d34fbfff4291256d0cd5eadedb510bc2 +B 9b97793fa0ba0fccefdd82bcbe7322d354d43c8c B 9d8e7d5131deb3056e14e6e63bad67c87bc7bd9a B 9e15038746a2eded8345243e9eaa112bc56da463 B a25da60afef8051cab6b8b0a733346dad718f65a +B a3bd17dc5476c2f200a80207ae33674ac906b992 B a43d30df5cc78535812339bec9663c4d60241d79 B a6501f782cd2b392f09edb4ccb99a83acd2e75a2 B a7bdc11a62b1810b436ce70e60fcc252ab41337d @@ -109,10 +113,12 @@ B c2a879df66b70c02e4196ea11861c43fe92ac7c3 B c4ae7ea784051f36b6a79bfc4cc0e7de6c3a9881 B c4f3d9665f242bfcf143388933ddb89dd725bd3b B c56c9797b8bc92570d48e6618fe8f450a0d188db +B c788d82cb02b3257d3ec560de0df4a6130ba93e9 B c7b4aa0adcf465b43f5088a9be6ec5969e47a6db B cad4f0b76bb79f82a5ef4bc7e435e93996eb884b B cb00226811f39d36b4f91106be94fd889c426005 B cd2a2a2f6663c5c401f1a7ba35e520503edc2e94 +B ce00f5b861c4dd87b225ee761d4919aa49244b5f B ceaef931fcbe62d64007a371abc38409e15d5dd6 B cf3d2a8efd76b6385a8aeaa5060e3ad3efe6ec77 B cfc5049c2e3205fcdc0cf2c04b9fb80cc2aa431f
[cxf] branch 3.6.x-fixes updated (40c04c10f9 -> 0c9f103d16)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 40c04c10f9 Recording .gitmergeinfo Changes new 9ea53266ba Wrong javadoc version new 0c9f103d16 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 | 6 ++ pom.xml | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)
[cxf] 01/02: Wrong javadoc version
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 9ea53266ba0b51a43344b9dcc2e020bac26dfd4d Author: Daniel Kulp AuthorDate: Tue May 9 11:20:54 2023 -0400 Wrong javadoc version (cherry picked from commit ba48a66c051d1e458d33d68dbcef9b9d203d673a) --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index dcdb91f50d..cf700f76bf 100644 --- a/pom.xml +++ b/pom.xml @@ -469,7 +469,6 @@ false true none -1.8.0
[cxf] branch main updated (cfbe112430 -> ba48a66c05)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from cfbe112430 Update maven-surefire-plugin and maven-surefire-report-plugin to 3.1.0 add ba48a66c05 Wrong javadoc version No new revisions were added by this update. Summary of changes: pom.xml | 1 - 1 file changed, 1 deletion(-)
svn commit: r61743 - in /release/cxf: 3.5.6/ 3.6.0/ 4.0.1/
Author: dkulp Date: Mon May 8 19:17:03 2023 New Revision: 61743 Log: CXF 3.5.6/3.6.0/4.0.1 Added: release/cxf/3.5.6/ release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz (with props) release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz.asc release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz.sha256 release/cxf/3.5.6/apache-cxf-3.5.6-src.zip (with props) release/cxf/3.5.6/apache-cxf-3.5.6-src.zip.asc release/cxf/3.5.6/apache-cxf-3.5.6-src.zip.sha256 release/cxf/3.5.6/apache-cxf-3.5.6.tar.gz (with props) release/cxf/3.5.6/apache-cxf-3.5.6.tar.gz.asc release/cxf/3.5.6/apache-cxf-3.5.6.tar.gz.sha256 release/cxf/3.5.6/apache-cxf-3.5.6.zip (with props) release/cxf/3.5.6/apache-cxf-3.5.6.zip.asc release/cxf/3.5.6/apache-cxf-3.5.6.zip.sha256 release/cxf/3.6.0/ release/cxf/3.6.0/apache-cxf-3.6.0-src.tar.gz (with props) release/cxf/3.6.0/apache-cxf-3.6.0-src.tar.gz.asc release/cxf/3.6.0/apache-cxf-3.6.0-src.tar.gz.sha256 release/cxf/3.6.0/apache-cxf-3.6.0-src.zip (with props) release/cxf/3.6.0/apache-cxf-3.6.0-src.zip.asc release/cxf/3.6.0/apache-cxf-3.6.0-src.zip.sha256 release/cxf/3.6.0/apache-cxf-3.6.0.tar.gz (with props) release/cxf/3.6.0/apache-cxf-3.6.0.tar.gz.asc release/cxf/3.6.0/apache-cxf-3.6.0.tar.gz.sha256 release/cxf/3.6.0/apache-cxf-3.6.0.zip (with props) release/cxf/3.6.0/apache-cxf-3.6.0.zip.asc release/cxf/3.6.0/apache-cxf-3.6.0.zip.sha256 release/cxf/4.0.1/ release/cxf/4.0.1/apache-cxf-4.0.1-src.tar.gz (with props) release/cxf/4.0.1/apache-cxf-4.0.1-src.tar.gz.asc release/cxf/4.0.1/apache-cxf-4.0.1-src.tar.gz.sha256 release/cxf/4.0.1/apache-cxf-4.0.1-src.zip (with props) release/cxf/4.0.1/apache-cxf-4.0.1-src.zip.asc release/cxf/4.0.1/apache-cxf-4.0.1-src.zip.sha256 release/cxf/4.0.1/apache-cxf-4.0.1.tar.gz (with props) release/cxf/4.0.1/apache-cxf-4.0.1.tar.gz.asc release/cxf/4.0.1/apache-cxf-4.0.1.tar.gz.sha256 release/cxf/4.0.1/apache-cxf-4.0.1.zip (with props) release/cxf/4.0.1/apache-cxf-4.0.1.zip.asc release/cxf/4.0.1/apache-cxf-4.0.1.zip.sha256 Added: release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz == Binary file - no diff available. Propchange: release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz.asc == --- release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz.asc (added) +++ release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz.asc Mon May 8 19:17:03 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEUbUtxd1FL5K+NCzChY/ExPQ4VqMFAmRRWz4ACgkQhY/ExPQ4 +VqOoSA/7BZ0weV4znmi2zxQY2Q++IrREmI8BgQhhZHB2VJhzDRY2JSwL2h6gTvYD +t+s1lqDXNeA4LvEuD1ZjOiD5ppRTQzrlgNZo5nGSeoIeVlwdfCaj8+3iIZTsXG7H +mJHHia7oTLDEuUhzupx1yNKkJHsRTPZGdYf5DTJduPF9tfB7qX0Xn8qAelCZ4FTT +LNC+Dr1l961ebDEsxAW/KdY0W7O5fouyX/Qz8u8Iz5Gi1EpePORCK+FyfcjaFId9 +7cyagiytKTzSjLpxL2MQQwhvN7llqoEQEQ9F7MFz4/czITkbtWXCcWlcJTOWOzvb +st+1lntN//HF7aKZLi7g7umRSvlqTa1Rw+aSCYYh6l74SFqxTLvBIklvVx/rVuOv +x3yvrawrAWjtdclm0VOQz0ELUtIh39F51zHeZh3gVCZtEgMVvyAkNld7Sk7u7Gq9 +T6ce3dhYb/zCQvsVxurxKP6HbQj55rWzhkLn49kyyAbEid0NhmwU+iDpITYEp8xP +SLLT/D0AcVvdrgTNXS3XDT9/XWRHF5Y1tu4XTyYi1gKiY8S5AiyDmX7nBfF8IHv8 +MkQgkh9dg5T0chwqkm4psNzplqciq0sGa+FJQdbpyXkb6akNb7b7tjmxILXN2pqo +P4J8EFaSOorwLrBrPit5If+5EbEYkeAkEsUDRc6lQDm/nFm8zg4= +=Zgqg +-END PGP SIGNATURE- Added: release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz.sha256 == --- release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz.sha256 (added) +++ release/cxf/3.5.6/apache-cxf-3.5.6-src.tar.gz.sha256 Mon May 8 19:17:03 2023 @@ -0,0 +1 @@ +454b229610bc3142a7249aef3e5caf9a484bcfc7d1476bf7c610d06ee98b7a2c apache-cxf-3.5.6-src.tar.gz Added: release/cxf/3.5.6/apache-cxf-3.5.6-src.zip == Binary file - no diff available. Propchange: release/cxf/3.5.6/apache-cxf-3.5.6-src.zip -- svn:mime-type = application/octet-stream Added: release/cxf/3.5.6/apache-cxf-3.5.6-src.zip.asc == --- release/cxf/3.5.6/apache-cxf-3.5.6-src.zip.asc (added) +++ release/cxf/3.5.6/apache-cxf-3.5.6-src.zip.asc Mon May 8 19:17:03 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEUbUtxd1FL5K+NCzChY/ExPQ4VqMFAmRRWz4ACgkQhY/ExPQ4 +VqPUjg//RDLaat9zDnE3ZNdIBUtxNXGpsCnWirGlWSymonwfU1Ktx2ZOE6iD0RwG +MAyo6J5qlF+P2ssWfndqzUWFLgTXL4TAMan/R2y2B5P1PtBcNFNCd62wqpO2iDCv
[cxf] annotated tag cxf-4.0.1 created (now 0918c5d8c9)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-4.0.1 in repository https://gitbox.apache.org/repos/asf/cxf.git at 0918c5d8c9 (tag) tagging ce00f5b861c4dd87b225ee761d4919aa49244b5f (commit) replaces cxf-4.0.0 by Daniel Kulp on Tue May 2 16:14:44 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-4.0.1 --- No new revisions were added by this update.
[cxf] branch main updated (f8d1850dc9 -> ce00f5b861)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from f8d1850dc9 Bump download-maven-plugin from 1.6.8 to 1.7.0 (#1258) new 5010c700f1 Update release notes new ce00f5b861 [maven-release-plugin] prepare release cxf-4.0.1 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: bom/pom.xml| 2 +- core/pom.xml | 2 +- distribution/javadoc/pom.xml | 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml | 2 +- distribution/src/main/release/release_notes.txt| 105 - .../src/main/release/samples/aegis/pom.xml | 10 +- .../main/release/samples/aegis_standalone/pom.xml | 4 +- .../src/main/release/samples/callback/pom.xml | 8 +- .../samples/configuration_interceptor/pom.xml | 8 +- .../src/main/release/samples/corba/bank/pom.xml| 2 +- .../samples/corba/bank_ws_addressing/pom.xml | 2 +- .../main/release/samples/corba/hello_world/pom.xml | 8 +- .../release/samples/groovy_spring_support/pom.xml | 2 +- .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 2 +- .../samples/java_first_jaxws_factory_bean/pom.xml | 8 +- .../main/release/samples/java_first_jms/pom.xml| 6 +- .../main/release/samples/java_first_pojo/pom.xml | 8 +- .../samples/java_first_spring_support/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic/pom.xml | 8 +- .../samples/jax_rs/basic_http2_jetty/pom.xml | 2 +- .../samples/jax_rs/basic_http2_netty/pom.xml | 2 +- .../samples/jax_rs/basic_http2_undertow/pom.xml| 2 +- .../release/samples/jax_rs/basic_https/pom.xml | 2 +- .../main/release/samples/jax_rs/basic_oidc/pom.xml | 2 +- .../main/release/samples/jax_rs/big_query/pom.xml | 2 +- .../samples/jax_rs/content_negotiation/pom.xml | 10 +- .../pom.xml| 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml | 2 +- .../jax_rs/description_openapi_v3_spring/pom.xml | 2 +- .../jax_rs/description_openapi_v3_web/pom.xml | 2 +- .../release/samples/jax_rs/graalvm_basic/pom.xml | 2 +- .../src/main/release/samples/jax_rs/odata/pom.xml | 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +-- .../release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml| 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../spring_boot_scan/eureka-registry/pom.xml | 2 +- .../release/samples/jax_rs/spring_security/pom.xml | 8 +- .../main/release/samples/jax_rs/sse_cdi/pom.xml| 2 +- .../main/release/samples/jax_rs/sse_client/pom.xml | 2 +- .../main/release/samples/jax_rs/sse_spring/pom.xml | 2 +- .../main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +- .../release/samples/jax_rs/tracing_brave/pom.xml | 4 +- .../samples/jax_rs/tracing_opentracing/pom.xml | 14 +-- .../main/release/samples/jax_rs/websocket/pom.xml | 10 +- .../release/samples/jax_rs/websocket_web/pom.xml | 2 +- .../samples/jax_server_aegis_client/pom.xml| 10 +- .../src/main/release/samples/jaxws_async/pom.xml | 10 +- .../samples/jaxws_dispatch_provider/pom.xml| 8 +- .../src/main/release/samples/jaxws_graalvm/pom.xml | 2 +- .../samples/jaxws_graalvm_dynamic/client/pom.xml | 2 +- .../samples/jaxws_graalvm_dynamic/server/pom.xml | 2 +- .../main/release/samples/jaxws_handlers/pom.xml| 8 +- .../main/release/samples/jaxws_spring_boot/pom.xml | 2 +- .../src/main/release/samples/jms_pubsub/pom.xml| 4 +- .../src/main/release/samples/jms_queue/pom.xml | 6 +- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +- .../main/release/samples/jms_spring_config/pom.xml | 2 +- .../samples/js_browser_client_java_first/pom.xml | 10 +- .../samples/js_browser_client_simple/pom.xml | 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml | 8 +- distribution/src/main/release/samples/mtom/pom.xml | 8 +- distribution/src/main/release/samples/pom.xml | 2 +- .../main/release/samples/restful_dispatch/pom.xml | 10 +- .../release/samples/ruby_spring_support/pom.xml| 2 +- .../src/main/release/samples/soap_header/pom.xml | 8 +- distribution/src/main/release/samples/sts/pom.xml | 2 +- .../src/main/release/samples/throttling/pom.xml| 2 +- .../src/
[cxf] 01/02: Update release notes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git commit 5010c700f1ec564ff54f6ea6549712b4e2521e5e Author: Daniel Kulp AuthorDate: Tue May 2 16:07:27 2023 -0400 Update release notes --- distribution/src/main/release/release_notes.txt | 105 +++- 1 file changed, 84 insertions(+), 21 deletions(-) diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index 88165a63f5..fe5b2fb6e8 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,42 +1,36 @@ -Apache CXF 3.5.0 Release Notes +Apache CXF 4.0.1 Release Notes 1. Overview -The 3.5.x versions of Apache CXF is a significant new version of CXF +The 4.0.x versions of Apache CXF is a significant new version of CXF that provides several new features and enhancements. New features include: -* Support for Java 17 -* Many updated dependencies. We've updated to the latest versions of most - dependencies. Some may be incompatible with previous versions. - Some notables that may impact applications include: -* ehCache upgraded to 3.9.x -* Jackson to 2.13.x -* Mozilla Rhino upgraded to 1.7.13 (groupId/artifactId changed, be careful) -* WSS4j 2.4.x -* Spring Boot 2.6.x / Spring Framework 5.3.x base line -* Apache Karaf 4.3.x base line -* Apache HttpClient 5 support (Asynchronous Client HTTP Transport) -* HTTP/2 support (server-side only) -* JUnit 5 support +* The release is based on JakartaEE 9.1: the javax.* packages are migrated to jakarta.* +* Support of Spring Framework 6 / Spring Boot 3 +* HTTP/2 support Important notes: -* 3.5 is the last branch of CXF that will support Java 8. Future - non-patch releases of CXF will require Java 11 or newer. -* The old OATH 1.0 module was removed +* Many features of CXF 4.x now require Java 17. While CXF is compiled for Java 11, +many of the dependencies require Java 17 and thus various features may only +work with Java 17. Users are encouraged to review the migration guide at: -http://cxf.apache.org/docs/34-migration-guide.html +https://cxf.apache.org/docs/40-migration-guide.html for further information and requirements for upgrading from earlier versions of CXF. +4.0.1 fixes over 20 JIRA issues reported by users and the community. + + + 2. Installation Prerequisites Before installing Apache CXF, make sure the following products, with the specified versions, are installed on your system: -* Java 8 Development Kit +* Java 17 Development Kit * Apache Maven 3.x to build the samples @@ -65,5 +59,74 @@ http://issues.apache.org/jira/browse/CXF 6. Migration notes: See the migration guide at: -http://cxf.apache.org/docs/35-migration-guide.html +http://cxf.apache.org/docs/40-migration-guide.html for caveats when upgrading. + +7. Specific issues, features, and improvements fixed in this version + + +** Sub-task +* [CXF-8606] - Introduce HTTP/2 Transport: client-side support +* [CXF-8815] - Fix org.apache.cxf.transport.http.asyncclient.hc5.AsyncHTTPConduitTest.testResponseSameBufferSize +* [CXF-8830] - Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce +** Bug +* [CXF-8666] - Spring6 for JSR 250 annotations isn't disabled for jakarta.xml.ws.WebServiceContext +* [CXF-8669] - Multipart annotation not working 3.4.6 onwards. +* [CXF-8745] - MemoryLeak when using SpringBus in a spring context which has a reusable parent context +* [CXF-8797] - NameBinding ignored when implementing interface +* [CXF-8813] - CXF v4: NoClassDefFoundError: jakarta/xml/bind/Validator +* [CXF-8816] - Deflater and Inflater initialized with different 'nowrap' value +* [CXF-8818] - wsdl2java fails in 4.0.0 due to incorrect versions in Manifest +* [CXF-8821] - Remove org.eclipse.tycho plugins since OSGi support is removed +* [CXF-8822] - AsyncHTTPConduit removes query-parameters when path is empty +* [CXF-8824] - CDI beans produced by @Produces methods are generated twice +* [CXF-8826] - AsyncHTTPConduit (hc5) - Unexpected EOF during response processing +* [CXF-8833] - GZIPInInterceptor, when processing HTTP 204 empty response, throws EOFException +* [CXF-8837] - Allow P11 RSA Keys within JwsUtils +* [CXF-8838] - Regression in cxf-codegen-plugin wsdl2java 4.0.0 +* [CXF-8839] - Missing dependency on plexus-utils in cxf-wsdl-validator-plugin + +** Improvement +* [CXF-8758] - Migration path for Wiremock (Jetty 11/JakartaEE) +* [CXF-8788] - Remove the 'jakarta' profile (which enables the Spring milestone repositories) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[cxf] annotated tag cxf-3.6.0 created (now 90805d2b29)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-3.6.0 in repository https://gitbox.apache.org/repos/asf/cxf.git at 90805d2b29 (tag) tagging 4cf375c5436f3e806293a73a5bb6a8510f7ac961 (commit) replaces cxf-3.5.0 by Daniel Kulp on Tue May 2 15:09:47 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-3.6.0 --- No new revisions were added by this update.
[cxf-build-utils] branch main updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git The following commit(s) were added to refs/heads/main by this push: new ace3b60 [maven-release-plugin] prepare for next development iteration ace3b60 is described below commit ace3b6092cee19d922e13c4f234e2103ce6f5672 Author: Daniel Kulp AuthorDate: Tue May 2 15:00:03 2023 -0400 [maven-release-plugin] prepare for next development iteration --- buildtools/pom.xml | 2 +- pom.xml| 4 ++-- xml2fastinfoset-plugin/pom.xml | 2 +- xml2fastinfoset-test/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index a52e266..566d09d 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,7 +20,7 @@ org.apache.cxf.build-utils cxf-build-utils -4.0.1 +4.0.2-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index b6f8924..4bc8d13 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.apache.cxf.build-utils cxf-build-utils -4.0.1 +4.0.2-SNAPSHOT Apache CXF Build Utilities https://cxf.apache.org pom @@ -47,7 +47,7 @@ scm:git:https://gitbox.apache.org/repos/asf/cxf-build-utils.git scm:git:https://gitbox.apache.org/repos/asf/cxf-build-utils.git - cxf-build-utils-4.0.1 + HEAD diff --git a/xml2fastinfoset-plugin/pom.xml b/xml2fastinfoset-plugin/pom.xml index 8fae8b5..05b7dd7 100644 --- a/xml2fastinfoset-plugin/pom.xml +++ b/xml2fastinfoset-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.build-utils cxf-build-utils - 4.0.1 + 4.0.2-SNAPSHOT diff --git a/xml2fastinfoset-test/pom.xml b/xml2fastinfoset-test/pom.xml index d8776b2..6df8772 100644 --- a/xml2fastinfoset-test/pom.xml +++ b/xml2fastinfoset-test/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.build-utils cxf-build-utils -4.0.1 +4.0.2-SNAPSHOT 4.0.0
[cxf-build-utils] annotated tag cxf-build-utils-4.0.1 created (now 8270fdf)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-build-utils-4.0.1 in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git at 8270fdf (tag) tagging 158a994b13ce8a0f0ec1582be03bbd8d98a33011 (commit) replaces cxf-build-utils-4.0.0 by Daniel Kulp on Tue May 2 14:59:59 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-build-utils-4.0.1 --- No new revisions were added by this update.
[cxf-build-utils] branch main updated: [maven-release-plugin] prepare release cxf-build-utils-4.0.1
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-build-utils.git The following commit(s) were added to refs/heads/main by this push: new 158a994 [maven-release-plugin] prepare release cxf-build-utils-4.0.1 158a994 is described below commit 158a994b13ce8a0f0ec1582be03bbd8d98a33011 Author: Daniel Kulp AuthorDate: Tue May 2 14:59:55 2023 -0400 [maven-release-plugin] prepare release cxf-build-utils-4.0.1 --- buildtools/pom.xml | 2 +- pom.xml| 4 ++-- xml2fastinfoset-plugin/pom.xml | 2 +- xml2fastinfoset-test/pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 567b6a8..a52e266 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -20,7 +20,7 @@ org.apache.cxf.build-utils cxf-build-utils -4.0.1-SNAPSHOT +4.0.1 4.0.0 diff --git a/pom.xml b/pom.xml index e2cb521..b6f8924 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.apache.cxf.build-utils cxf-build-utils -4.0.1-SNAPSHOT +4.0.1 Apache CXF Build Utilities https://cxf.apache.org pom @@ -47,7 +47,7 @@ scm:git:https://gitbox.apache.org/repos/asf/cxf-build-utils.git scm:git:https://gitbox.apache.org/repos/asf/cxf-build-utils.git - HEAD + cxf-build-utils-4.0.1 diff --git a/xml2fastinfoset-plugin/pom.xml b/xml2fastinfoset-plugin/pom.xml index 99ba507..8fae8b5 100644 --- a/xml2fastinfoset-plugin/pom.xml +++ b/xml2fastinfoset-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.cxf.build-utils cxf-build-utils - 4.0.1-SNAPSHOT + 4.0.1 diff --git a/xml2fastinfoset-test/pom.xml b/xml2fastinfoset-test/pom.xml index 49aadd1..d8776b2 100644 --- a/xml2fastinfoset-test/pom.xml +++ b/xml2fastinfoset-test/pom.xml @@ -22,7 +22,7 @@ org.apache.cxf.build-utils cxf-build-utils -4.0.1-SNAPSHOT +4.0.1 4.0.0
[cxf] 01/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 048c1c3f7193fd8c5b26e6a94f331baa11744b40 Author: Daniel Kulp AuthorDate: Tue May 2 14:53:43 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 6 ++ 1 file changed, 6 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 8a11819d89..7cb81c6561 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -38,8 +38,10 @@ B 3a25cab6172083d26f2cc5f29a134c11214d5131 B 3a9583d5edf20a16dd2fa739a9fb8fbce8168a23 B 3b700961ead8a1c23ef945275bfe4defe22ea81d B 3d5564dbff38b782837e291871cd210351acbfc2 +B 419e1849157cfe0146227dfc3e8da7c693c71045 B 43e1aa22d5498bc0a324fc57292e241c42e7ea0c B 48a2c301cdb8cc4ffce0480e670b694cca3e6249 +B 49cf9ffa8aac88631b4ad16187812e3700069cd9 B 4a71fea3e7a826f8022bf59b113b1a27649f370e B 4ab7b061ba3b944f6c22842c3f4be10bfcf4efc0 B 4b63dbb428488f3a6d0b7114632404b31458a521 @@ -105,6 +107,7 @@ B c15479e7c0fca6a1e3d097f4ec09a7044eb2b57f B c2760bd0a4776fa61402349af7bc94c3bd050873 B c2a879df66b70c02e4196ea11861c43fe92ac7c3 B c4ae7ea784051f36b6a79bfc4cc0e7de6c3a9881 +B c4f3d9665f242bfcf143388933ddb89dd725bd3b B c56c9797b8bc92570d48e6618fe8f450a0d188db B c7b4aa0adcf465b43f5088a9be6ec5969e47a6db B cad4f0b76bb79f82a5ef4bc7e435e93996eb884b @@ -119,6 +122,7 @@ B d31e1a35f56b28c7c06800364434b10aee90ce24 B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8 B dc5e818f5a8387e7009bc4471b5a032428cfb3cc B ddcc93f12758a13cb4ce98c3d76a68f207ba674f +B de2de41e48fca5743d206d1fb9426fb6ccae5061 B df7fe8b569a7b8825ab6181a3ea0aab2a2493858 B e0da0e4af33fa0d5e0ccad3093eee26eb3be140c B e277f0c2bb0e09b8dc550e0eddcda9d8362eb09a @@ -133,6 +137,8 @@ B f16a87bdd0cedd82af9d62729c0d7418aa0e81a0 B f35d8ae18b51088f7238a0af6b9caaca4da8ef95 B f3e15e52c7d27d5734d3716dc3beb9a19f879387 B f51d661070bef444f4bf85010b4d0cb5ab906e69 +B f6e974e2eb317c610b440d13c4bc7cc3294e7ed0 +B f8d1850dc906be4ac45e2630ae30961b20228938 B f8d9f35ba6986a13fb65eadd50b701b7cbf70113 B faefc09e44b6d53e857763f28b0a0636d901fe7f B fd2d04c9e6d53577887d479a701404d7e478458d
[cxf] 02/02: Update release notes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit cff5795b28b8a5970fb7a00960ff14aa618e62f4 Author: Daniel Kulp AuthorDate: Tue May 2 14:59:13 2023 -0400 Update release notes --- distribution/src/main/release/release_notes.txt | 28 ++--- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index 88165a63f5..4ac57b6bf5 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,32 +1,26 @@ -Apache CXF 3.5.0 Release Notes +Apache CXF 3.6.0 Release Notes 1. Overview -The 3.5.x versions of Apache CXF is a significant new version of CXF +The 3.6.x versions of Apache CXF is a significant new version of CXF that provides several new features and enhancements. New features include: -* Support for Java 17 +* Support for Spring Boot 2.7 and Spring Security 5.8 * Many updated dependencies. We've updated to the latest versions of most dependencies. Some may be incompatible with previous versions. Some notables that may impact applications include: -* ehCache upgraded to 3.9.x -* Jackson to 2.13.x -* Mozilla Rhino upgraded to 1.7.13 (groupId/artifactId changed, be careful) -* WSS4j 2.4.x -* Spring Boot 2.6.x / Spring Framework 5.3.x base line -* Apache Karaf 4.3.x base line -* Apache HttpClient 5 support (Asynchronous Client HTTP Transport) -* HTTP/2 support (server-side only) +* Jetty upgraded to 10.x +* Haxelcast to 5.2.x +* Apache HttpClient 5.2.x support (Asynchronous Client HTTP Transport) +* HTTP/2 support, new HttpClient based conduit for client side * JUnit 5 support Important notes: -* 3.5 is the last branch of CXF that will support Java 8. Future - non-patch releases of CXF will require Java 11 or newer. -* The old OATH 1.0 module was removed +* 3.6 no longer supports Java 8. Java11+ is required. Users are encouraged to review the migration guide at: -http://cxf.apache.org/docs/34-migration-guide.html +http://cxf.apache.org/docs/36-migration-guide.html for further information and requirements for upgrading from earlier versions of CXF. @@ -36,7 +30,7 @@ versions of CXF. Before installing Apache CXF, make sure the following products, with the specified versions, are installed on your system: -* Java 8 Development Kit +* Java 11 Development Kit * Apache Maven 3.x to build the samples @@ -65,5 +59,5 @@ http://issues.apache.org/jira/browse/CXF 6. Migration notes: See the migration guide at: -http://cxf.apache.org/docs/35-migration-guide.html +http://cxf.apache.org/docs/36-migration-guide.html for caveats when upgrading.
[cxf] branch 3.6.x-fixes updated (02373789b6 -> cff5795b28)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 02373789b6 Fixed PMD violation for cxf-systests-cdi-base new 048c1c3f71 Recording .gitmergeinfo Changes new cff5795b28 Update release notes 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 | 6 ++ distribution/src/main/release/release_notes.txt | 28 ++--- 2 files changed, 17 insertions(+), 17 deletions(-)
[cxf] annotated tag cxf-3.5.6 created (now 3ed8e7a48e)
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a change to annotated tag cxf-3.5.6 in repository https://gitbox.apache.org/repos/asf/cxf.git at 3ed8e7a48e (tag) tagging eb7a2133a5974efc128a58ad4ed239385da3f5fc (commit) replaces cxf-3.5.5 by Daniel Kulp on Tue May 2 14:25:54 2023 -0400 - Log - [maven-release-plugin] copy for tag cxf-3.5.6 --- No new revisions were added by this update.
[cxf] branch 3.5.x-fixes updated: Update release notes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.5.x-fixes by this push: new 59a81c9512 Update release notes 59a81c9512 is described below commit 59a81c9512e1d7b9be59a21a1c7e4dedbfad0eea Author: Daniel Kulp AuthorDate: Tue May 2 14:19:04 2023 -0400 Update release notes --- distribution/src/main/release/release_notes.txt | 35 ++--- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index 690639a141..64c9292298 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,4 +1,4 @@ -Apache CXF 3.5.5 Release Notes +Apache CXF 3.5.6 Release Notes 1. Overview @@ -31,7 +31,7 @@ for further information and requirements for upgrading from earlier versions of CXF. -3.5.5 fixes over 9 JIRA issues reported by users and the community. +3.5.6 fixes over 15 JIRA issues reported by users and the community. 2. Installation Prerequisites @@ -73,19 +73,24 @@ for caveats when upgrading. 7. Specific issues, features, and improvements fixed in this version -** Bug -* [CXF-8706] - CXF MTOM handler allow content injection -* [CXF-8761] - DigestAuthSupplier: Must not decode URL encoded URI parts -* [CXF-8771] - Fix SortedArraySet remove method -* [CXF-8776] - Version 3.5.4 contains security vulnerable woodstox version -* [CXF-8777] - cxf-codegen-plugin : 3.5.4 : commons-text :1.9 -* [CXF-8796] - IllegalArgumentException: argument type mismatch with code first RPC when parameter omitted -* [CXF-8798] - UDPDestination throws NPE under some conditions -* [CXF-8799] - Unxepected URLEncode in MTOM Content-Id - -** Improvement -* [CXF-8785] - Make Jsonb lazy initializable in the JsrJsonbProvider - +** Sub-task +* [CXF-8815] - Fix org.apache.cxf.transport.http.asyncclient.hc5.AsyncHTTPConduitTest.testResponseSameBufferSize +* [CXF-8830] - Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce +** Bug +* [CXF-8669] - Multipart annotation not working 3.4.6 onwards. +* [CXF-8745] - MemoryLeak when using SpringBus in a spring context which has a reusable parent context +* [CXF-8797] - NameBinding ignored when implementing interface +* [CXF-8810] - Exception on cxf-rt-transports-http-hc Osgi startup +* [CXF-8816] - Deflater and Inflater initialized with different 'nowrap' value +* [CXF-8822] - AsyncHTTPConduit removes query-parameters when path is empty +* [CXF-8824] - CDI beans produced by @Produces methods are generated twice +* [CXF-8826] - AsyncHTTPConduit (hc5) - Unexpected EOF during response processing +* [CXF-8833] - GZIPInInterceptor, when processing HTTP 204 empty response, throws EOFException +* [CXF-8837] - Allow P11 RSA Keys within JwsUtils +* [CXF-8839] - Missing dependency on plexus-utils in cxf-wsdl-validator-plugin +** Improvement +* [CXF-8809] - Migrate LDAP systest cases from ApacheDS to UnboundID LDAP +* [CXF-8835] - Upgrade to Spring 5.3.26
[cxf] branch 3.5.x-fixes updated: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. dkulp pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.5.x-fixes by this push: new 36529fe366 Recording .gitmergeinfo Changes 36529fe366 is described below commit 36529fe3662f2544bd1f3a17c6a8400010e53890 Author: Daniel Kulp AuthorDate: Tue May 2 14:05:41 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 119 ++ 1 file changed, 119 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 89b4359fe3..52c71d2311 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -3,61 +3,115 @@ origin/3.6.x-fixes B 00bbab65e59b8f27366335aec19e50129b7759f0 B 0233bbf8fb5599639978d8c60b6df12e668d7d6b B 026e79a86c47387ad3461210e53cd0dc0034ccbe +B 04086372b7b0be8475699ffa1dac908e7fff6bff B 044b280cf89fad58502cc27e66022e517d5de577 +B 069b9ec61876f81ed78b87ed0927a3033a5603f2 +B 06fbea7c992e05c6f074f592303cef3416b43801 +B 09533cb78f2017377a73cd5a70c42feaece7a77f +B 0ad55be391eaaec243bca311bb3e4c220949783c +B 0ae2d5596481b09ec195cfae96af3f63b2ca479e +B 0b20ca6a6c3fa3f8a0a6961b51373025279b5810 +B 0b7b00cadf2765d1d5419af95e0249ef0db32905 B 0d7fee252e18fe544cf54244d6638c9a30a32bd6 B 0da7f36a16fe1bcbcd9b2a64d0bfe2c19d5c319c B 0e9ba6cfe143f156721d6f8a1fd38d84946b5e8d B 0fd59b2a26240e290fdc646decc4c5c467875f62 +B 10c14830cf25e286917af9dd6f4da67af012dda5 +B 1279d3d05b2533365b8e98b0bf211f1424e3f712 B 12a68910220a3af6fe2d0419a3556320b75c3523 B 12b4e3a4d9d2f3d8cc380e998b9e44f43e2a8479 +B 137df3a5340e0f940ef7e5634468414fdcde4664 B 14fde35cbb22f301217be8e1b56ef405eab70682 +B 163b3fe30093c41d605c84df76867a89c5c45443 +B 16abd42faf056ed43e3310a45ce1a42f75b446cf +B 1a1a7aa30b1f95eff90588181863119df9c9a1e0 +B 1abade949dd09d2c4d301c65fc237a01ef870e34 +B 1b2d8b7c2b5354f915c18c1006ccc714f91139bb +B 1b65f3f0945d8c8d011a76cb7239ddfc16fb50d9 +B 1becd29db3bdb4106b4e7104e4212b0c83d4ff55 +B 1bfb87f1c028a36b617435ae19b15aaedcb8b0ba +B 1c053052adf61adb14073fb2be9bbe73ae40505f +B 1d12d535fafc758640fb4c0a9e6acf47b4ff3cd2 +B 1e7169c627d6908118f99dc98d774ffb53dd38c6 +B 1fccd47727c76524ca32714ff35f060aa37e1a9a B 210cd832ef91c2f95569859b45b59c846d54ff97 B 2138d98dc708e883f638e35abc53065f99b9961b B 21531a4049139798c4f4efd546235648b8084c53 +B 217199b43ad12ba6986d291230ef39de5a72619c B 21afd81b648cebe854ba567cbebd22a4ce386992 B 21bf42d906765fffb015f86d49e7b535d927bc56 +B 223aa652a4e39bf511ed7cf0fe32556fc140d476 +B 2279fcb96413302d9875d450283d9231bf0ce31b B 22d817d86fb576479f6095a43d8f64521350b53d B 2438f7ebd983959935f5fb770caa4ad48ed3b0fb +B 264b9a1dfa2241d7dc4d30a5520ef405fd36e9c9 B 26aa8c8cfc103a5c51aed74a657880c6724c25a5 B 295243b58b774ecb0304913ef6dbdef51a820e20 +B 29f4825ed3b086867ff4ff286c6008104efed067 B 2af064bc7025d815cd02ba979eeb4eccc7775a6a B 2b4a9f3abe30c92542e217d1077ea5c77119f328 +B 2b8842320a6cabcb95aec8476e34fdc4ce4525e1 B 2ba0d3038c9542ad59ec671bc17a6c0bac749f11 B 2c48413cfa4dbd746b49b4b08b0d15eb8077a7d6 B 31034cadab36e45a3348fd4b8f2726b01714abe1 +B 31ae3578f0a2e840ecb886cd6fe435f5e659abd4 B 335b7880918b3ba148d9e239421aedb5de4db814 B 33e606c55927f34f3a2414bd1386931745357f38 B 3428dd1423198b22d7662dcc8d9553a58835c130 B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4 +B 3678d853f696a7c23de57b2c68dcf0e738c24cd2 B 3795fbc8740c882d8f276b6e9cbaf0cab107edef B 38582a2b8d91502cd598029104b0f87c0255d86c +B 386d9ba162eb6233b1d270303624cd9d18e5eff5 B 399a35267366297a4e2b9e7e8c53972edfa24591 B 3b1c2fe16231f7844969981d92132464a9f99452 B 3bd832d9d0efac926e59a613919604e9beb1efab +B 3c08e505cd219365a9473bd98a460c93041c358f B 3c0bc31cf4f6c754c21115b83c846ca17548817d B 3e7d45d5ff4b026dcea4e6a8196f6534750c9acd +B 3f1f055bc59754cde7f94bd38c8c366bff3b3974 B 44919916b3747beb059cadd95a34e0bf15202a0d B 450be91e2fa03528baae61006a188d3624c19565 +B 4a7a8b57e712dd05e187cf4de6fd58b9b1236847 B 4b63dbb428488f3a6d0b7114632404b31458a521 +B 4e49ccab53e40384a5bc3cd966b7a8f2636dcbb3 +B 504c3b5890dc251f7fc2d75dc462610d7e0d4bdb B 517bbbdb62c44b32c660bfbd0fdb53609b8759cb +B 526ecd8e23add39d60647da80d48ed9149bd263a +B 53d4d8fca1a5681296f3c4a6190b7618e448a6fa B 55534e4d391793e88df3515867224f80a12b312c +B 56b9c7017c30cda588bd446aa9a22b60c6aae416 +B 56ee7acf496ff8c45ab0b4a5b909c4380fe01da8 B 5794ddf9809aa6f8a67c43bd5edeff71be275fd3 B 592cf5b16d5988ab68187af5369541ead7b4292a +B 59b33d4a326016f2b4a861e408c7de06cd895362 +B 5a599c199dc62fdd884162572d293185ffed10e5 B 5aa91d092fd31039e7f2aeed8f6dee0e06321ce7 B 5ab347d6a7189d5c8536d06a50cbaf13632ed756 B 5b85f10bd469ced686ef5284e725cf57a683edcc B 5b92e502c1a5e97fbe2093969deafc7d2aa92b1f +B 5b94f07f24035393aef95d11a6eb0bd646bb139b B 5bfcf58aeb8bd4825fd84d4ea10a5d2c4072798f B 5c08fbd9c0494cd8b355590477278adb45c389c0 B 5d6eedf32fd49a7f9cedc916084ad44dbec74846 +B 5e7433512c2b4ca1d0dc3329926ed154e9678924 +B 5e7f4272c98df43c37a7a96bbf3cbb3a321cb871 +B
