(cxf) branch dependabot/maven/cxf.derby.version-10.17.1.0 created (now 8094308a52)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/cxf.derby.version-10.17.1.0 in repository https://gitbox.apache.org/repos/asf/cxf.git at 8094308a52 Bump cxf.derby.version from 10.16.1.1 to 10.17.1.0 No new revisions were added by this update.
(cxf) 03/03: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 66d4fc9eaaca69936b3152728c8f8f46352ebb6f Author: Andriy Redko AuthorDate: Sun Nov 12 09:48:53 2023 -0500 Recording .gitmergeinfo Changes --- .gitmergeinfo | 8 1 file changed, 8 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index bcf37cc74e..bacb63cc2c 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -82,6 +82,7 @@ B 2c48413cfa4dbd746b49b4b08b0d15eb8077a7d6 B 2e9a4e78e33eed61bac4b175a43b8a3536266fb2 B 2f9cc772e84b5563e82db73ef5f181978e725e83 B 31034cadab36e45a3348fd4b8f2726b01714abe1 +B 31a541e3f92493422efc0f7adec366539e9e60e9 B 31ae3578f0a2e840ecb886cd6fe435f5e659abd4 B 33459b852ea56c85f526e863deb52ccb3b33964f B 335b7880918b3ba148d9e239421aedb5de4db814 @@ -127,6 +128,7 @@ B 4ff95e740d46ff0a04adcbbc6b36b89e5acb89d0 B 504b98c4fd86b026f7bca7fd96b8b0320bf06638 B 504c3b5890dc251f7fc2d75dc462610d7e0d4bdb B 50a2a958995b6d8a6c6f25e3c5af8f76fa18a641 +B 511cb952c655222d256de26ecbcc84ab9a065684 B 517bbbdb62c44b32c660bfbd0fdb53609b8759cb B 51c8926f0329c29c2559e5c63a59b1c28b811c3d B 526ecd8e23add39d60647da80d48ed9149bd263a @@ -233,6 +235,7 @@ B 9652ad4297404686df2d9efc2b5b1cbb0bebd700 B 9723e32190d3a820e0eecf19177561155399c867 B 972af69bce584057637ee887432c5388eb7d8d8d B 9741a874147130334dea5ff6d8fa788eb11e822d +B 99dbbb12ea76b72d1a4312261854f4422567aa6f B 9a6a39f27c261f8bf00d94dd20db922c5675c6a5 B 9b7ce5889159569bcce447da2ed303ed26fc752a B 9bedf1086b69068942ebaf7fb973961912ef275f @@ -392,6 +395,7 @@ M 024240b5a6157dc632c346f79ee0ba8149112ff8 M 02be25361d4f90485cebcd32ce41df8aa4249cbb M 039ef658541017e2b8ddeaa0f49d771564e7d1f2 M 03e554cf370fc4543a1a611c525e787527e8a02f +M 03f5ea8eb1e1edd6502cb5df2d28b618422a572b M 04826f6520173b51bbb95b7a208e6a6662894ba3 M 058bacfe750631f987469b0e1141db158dbd97b4 M 069f602cb56f5164d8e926f5a0dd2a11b3caf004 @@ -586,6 +590,7 @@ M 7aa75bd3106998464daaf6f567afb569b13e3ef1 M 7b2e7af4f94bd26db08866fd24563df53af8977c M 7bfd4be162b1fb1408881912a452238acf809a66 M 7ce7ebb281c5cb9f335de28c30fdf97fac9b852c +M 7f68430d2cc69ed3f3ee532121eb45df1c45d2ab M 7fb5cdd08ab862f60bb867086e0d667bf4333f37 M 806b0be50b703fd6f7292a0afc716b1f7612b896 M 8108bd9bdbc5ec3d00d7dad8b775eff72689560d @@ -664,6 +669,7 @@ M ab710cf586810aab49db03be7495dc49ac0cc1c8 M ac0687fe6b83cb34bcf78cb215df4543cc55c6ed M ac4e5c1a5e4b57f58ed3129455f3fdc2a86d60cc M ac5210e61d5a8d40c2ee9a3512f3e2ce3adc7e4a +M ac7b514e336b7dfd3642c5140c24dca0fa7bdf6d M acc74209fd321f12fa27dac0f0854cd1841ba388 M ad8f02a3550cf5580a79dc5e2a03bf35b5dee33a M adb6d3b5565d83b7612f3eededd9723dd2d6b5f2 @@ -734,6 +740,7 @@ M d4dd039adf8bc4d797c792b18b24b19d0c28a60d M d4f4b7712b3c8c5c684fa4fa0a28758d9a27cef3 M d5d52ce1cab677a94d11beb90b724c61ea5cbdd7 M d5f1af819943bce3ede833e06ef5a70a9d049da4 +M d658d406d61c4c50320f7277a48fe3e05173aba2 M d705cd6f640c93a884c0c7d4aab42397b7785410 M d71f47f2224b0dc7747ea854e6725434a627810e M d72183fa21cb00b75bb643372e2256b1f46b72c0 @@ -784,6 +791,7 @@ M f76b1119d03504e2d26d7417e659e271f9db541f M f854e9db5d8d22939e38f48b21bae74d86487279 M f9066c935651e27f9d1bb0b3ebe8ffd7761f91f1 M f9e41c9a78d69d06e6552ab3df48e93250088709 +M fad9b72c7e9944d09b613e2c9e1e87c84f3991d8 M fb569f0c4936f7ac7b5197ce823ef9a725453376 M fb692ff3c6c34afbe17a083b6afdefe67a4dac78 M fb7dc28145a243e5e269536e1dc2ee9cea70f17c
(cxf) 02/03: CXF-8911:Allow wrapping AsyncHTTPConduit response processing (using new AsyncHttpResponseWrapperFactory bus extension) (#1510)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 501cf8bdfd1987288f224c24f7114da18a184b9a
Author: Andriy Redko
AuthorDate: Sat Nov 11 10:30:39 2023 -0500
CXF-8911:Allow wrapping AsyncHTTPConduit response processing (using new
AsyncHttpResponseWrapperFactory bus extension) (#1510)
(cherry picked from commit 74069a140737603a0a59435de308401c4351a80b)
(cherry picked from commit 03f5ea8eb1e1edd6502cb5df2d28b618422a572b)
---
.../http/asyncclient/AsyncHTTPConduit.java | 32 +
.../AsyncHttpResponseWrapperFactory.java | 55 ++
.../http/asyncclient/AsyncHTTPConduitTest.java | 38 ++-
.../http/asyncclient/hc5/AsyncHTTPConduit.java | 21 -
.../hc5/AsyncHttpResponseWrapperFactory.java | 55 ++
.../http/asyncclient/hc5/AsyncHTTPConduitTest.java | 38 ++-
6 files changed, 227 insertions(+), 12 deletions(-)
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index b0294ad7ee..e0a1122206 100755
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -66,6 +66,7 @@ import org.apache.cxf.transport.http.Address;
import org.apache.cxf.transport.http.Headers;
import org.apache.cxf.transport.http.URLConnectionHTTPConduit;
import
org.apache.cxf.transport.http.asyncclient.AsyncHTTPConduitFactory.UseAsyncPolicy;
+import
org.apache.cxf.transport.http.asyncclient.AsyncHttpResponseWrapperFactory.AsyncHttpResponseWrapper;
import org.apache.cxf.transport.https.HttpsURLConnectionInfo;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.apache.cxf.version.Version;
@@ -99,13 +100,15 @@ import org.apache.http.nio.util.HeapByteBufferAllocator;
public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
public static final String USE_ASYNC = "use.async.http.conduit";
-final AsyncHTTPConduitFactory factory;
-volatile int lastTlsHash = -1;
-volatile Object sslState;
-volatile URI sslURL;
-volatile SSLContext sslContext;
-volatile SSLSession session;
-volatile CloseableHttpAsyncClient client;
+private final AsyncHTTPConduitFactory factory;
+private final AsyncHttpResponseWrapperFactory
asyncHttpResponseWrapperFactory;
+
+private volatile int lastTlsHash = -1;
+private volatile Object sslState;
+private volatile URI sslURL;
+private volatile SSLContext sslContext;
+private volatile SSLSession session;
+private volatile CloseableHttpAsyncClient client;
public AsyncHTTPConduit(Bus b,
@@ -114,6 +117,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
AsyncHTTPConduitFactory factory) throws
IOException {
super(b, ei, t);
this.factory = factory;
+this.asyncHttpResponseWrapperFactory =
bus.getExtension(AsyncHttpResponseWrapperFactory.class);
}
public synchronized CloseableHttpAsyncClient getHttpAsyncClient() throws
IOException {
@@ -478,7 +482,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
return;
}
-CXFResponseCallback responseCallback = new CXFResponseCallback() {
+CXFResponseCallback delegate = new CXFResponseCallback() {
@Override
public void responseReceived(HttpResponse response) {
setHttpResponse(response);
@@ -486,6 +490,18 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
};
+CXFResponseCallback responseCallback = delegate;
+if (asyncHttpResponseWrapperFactory != null) {
+final AsyncHttpResponseWrapper wrapper =
asyncHttpResponseWrapperFactory.create();
+if (wrapper != null) {
+responseCallback = new CXFResponseCallback() {
+@Override
+public void responseReceived(HttpResponse response) {
+wrapper.responseReceived(response,
delegate::responseReceived);
+}
+};
+}
+}
FutureCallback callback = new FutureCallback() {
public void completed(Boolean result) {
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpResponseWrapperFactory.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpResponseWrapperFactory.java
new file mode 100644
index
(cxf) 01/03: Bump cxf.netty.version from 4.1.100.Final to 4.1.101.Final (#1514)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit a83d5112b93173a6961282d61e34e70dcd1f896d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Nov 10 07:38:46 2023 -0500 Bump cxf.netty.version from 4.1.100.Final to 4.1.101.Final (#1514) Bumps `cxf.netty.version` from 4.1.100.Final to 4.1.101.Final. Updates `io.netty:netty-codec-http` from 4.1.100.Final to 4.1.101.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.100.Final...netty-4.1.101.Final) Updates `io.netty:netty-codec-http2` from 4.1.100.Final to 4.1.101.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.100.Final...netty-4.1.101.Final) Updates `io.netty:netty-codec-socks` from 4.1.100.Final to 4.1.101.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.100.Final...netty-4.1.101.Final) Updates `io.netty:netty-handler-proxy` from 4.1.100.Final to 4.1.101.Final - [Commits](https://github.com/netty/netty/compare/netty-4.1.100.Final...netty-4.1.101.Final) --- updated-dependencies: - dependency-name: io.netty:netty-codec-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-codec-http2 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.netty:netty-codec-socks dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: io.netty:netty-handler-proxy dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit ddf893db202612ab4b4a156c4dd4de32c8c0f695) # Conflicts: # distribution/src/main/release/samples/pom.xml (cherry picked from commit fad9b72c7e9944d09b613e2c9e1e87c84f3991d8) # Conflicts: # distribution/src/main/release/samples/pom.xml --- distribution/src/main/release/samples/pom.xml | 1 - parent/pom.xml| 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 8e36eb7988..44dfaf111c 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -33,7 +33,6 @@ 2.6.15 3.1.7 9.4.53.v20231009 -4.1.100.Final 4.5.14 5.9.0 2.7.0 diff --git a/parent/pom.xml b/parent/pom.xml index f9c74cd4d3..cfdffae060 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -179,7 +179,7 @@ 2022.7 3.2.0 [4,5) -4.1.100.Final +4.1.101.Final 2.0.46.Final 2.0.12 3.2.2
(cxf) branch 3.5.x-fixes updated (cac0396188 -> 66d4fc9eaa)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from cac0396188 Updating Johnzon to 1.2.21 to fix CVE-2023-33008 (#1511) (#1515) new a83d5112b9 Bump cxf.netty.version from 4.1.100.Final to 4.1.101.Final (#1514) new 501cf8bdfd CXF-8911:Allow wrapping AsyncHTTPConduit response processing (using new AsyncHttpResponseWrapperFactory bus extension) (#1510) new 66d4fc9eaa Recording .gitmergeinfo Changes 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 | 8 distribution/src/main/release/samples/pom.xml | 1 - parent/pom.xml | 2 +- .../http/asyncclient/AsyncHTTPConduit.java | 32 + .../AsyncHttpResponseWrapperFactory.java | 55 ++ .../http/asyncclient/AsyncHTTPConduitTest.java | 38 ++- .../http/asyncclient/hc5/AsyncHTTPConduit.java | 21 - .../hc5/AsyncHttpResponseWrapperFactory.java | 55 ++ .../http/asyncclient/hc5/AsyncHTTPConduitTest.java | 38 ++- 9 files changed, 236 insertions(+), 14 deletions(-) create mode 100644 rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHttpResponseWrapperFactory.java create mode 100644 rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/AsyncHttpResponseWrapperFactory.java
