[cxf] branch dependabot/maven/ch.qos.logback-logback-classic-1.4.7 created (now a0c80df339)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/ch.qos.logback-logback-classic-1.4.7 in repository https://gitbox.apache.org/repos/asf/cxf.git at a0c80df339 Bump logback-classic from 1.4.6 to 1.4.7 No new revisions were added by this update.
[cxf] branch 3.4.x-fixes updated (49e3c62e53 -> 8402cfa82a)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 49e3c62e53 Fix JDK-11 API usage (post-merge issue) new 932876f601 CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214) new 22ab64130a Fix Apache Maven warning that some plugin dependencies are in wrong scope new a86487d6b1 Fix JDK-11 API usage (post-merge issue) new a3bf9d39a6 Recording .gitmergeinfo Changes new 8402cfa82a Fix Apache Maven warning that some plugin dependencies are in wrong scope 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 | 1 + maven-plugins/corba/pom.xml| 2 +- maven-plugins/java2swagger-plugin/pom.xml | 5 + maven-plugins/java2wadl-plugin/pom.xml | 5 + parent/pom.xml | 10 ++ .../hc5/CXFHttpAsyncResponseConsumer.java | 2 + .../http/netty/client/NettyHttpClientHandler.java | 2 +- .../http/netty/client/NettyHttpConduit.java| 166 - .../http/netty/client/NettyHttpConduitTest.java| 3 + 9 files changed, 127 insertions(+), 69 deletions(-)
[cxf] 03/05: Fix JDK-11 API usage (post-merge issue)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit a86487d6b1803389e60a4ba93d4e3f2ba7537945 Author: Andriy Redko AuthorDate: Wed Apr 19 13:51:00 2023 -0400 Fix JDK-11 API usage (post-merge issue) (cherry picked from commit 2f62c5d62fe6eae1a1bda1741e8be0e0a6b88628) --- .../transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java index 5808de4870..f59b566b33 100644 --- a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java +++ b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java @@ -83,7 +83,7 @@ public class CXFHttpAsyncResponseConsumer implements AsyncResponseConsumer
[cxf] 01/05: CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 932876f601ce92d98c009b7fc0f980a8dfc19a13 Author: Andriy Redko AuthorDate: Wed Apr 19 07:59:29 2023 -0400 CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214) (cherry picked from commit 9cb9eb0cfc3c6628793129c7660e0e6de557c963) (cherry picked from commit 362d16cc0d71445521e319126845a0943cff7447) (cherry picked from commit 0a72fb59a9b55695aff172228c7d2eb1eca7d7cf) --- .../hc5/CXFHttpAsyncResponseConsumer.java | 2 + .../http/netty/client/NettyHttpClientHandler.java | 2 +- .../http/netty/client/NettyHttpConduit.java| 166 - .../http/netty/client/NettyHttpConduitTest.java| 3 + 4 files changed, 105 insertions(+), 68 deletions(-) diff --git a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java index d8851635ba..5808de4870 100644 --- a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java +++ b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java @@ -82,6 +82,8 @@ public class CXFHttpAsyncResponseConsumer implements AsyncResponseConsumer
[cxf] 05/05: Fix Apache Maven warning that some plugin dependencies are in wrong scope
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8402cfa82a95efca3147eab4f448274be2769682
Author: Andriy Redko
AuthorDate: Wed Apr 19 16:24:36 2023 -0400
Fix Apache Maven warning that some plugin dependencies are in wrong scope
---
maven-plugins/corba/pom.xml| 2 +-
maven-plugins/java2wadl-plugin/pom.xml | 5 +
parent/pom.xml | 10 ++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/maven-plugins/corba/pom.xml b/maven-plugins/corba/pom.xml
index bddbf45628..41470f2932 100644
--- a/maven-plugins/corba/pom.xml
+++ b/maven-plugins/corba/pom.xml
@@ -58,7 +58,7 @@
org.apache.maven
maven-plugin-api
-compile
+provided
junit
diff --git a/maven-plugins/java2wadl-plugin/pom.xml
b/maven-plugins/java2wadl-plugin/pom.xml
index 7ae6f9a3c3..74d9adabdf 100644
--- a/maven-plugins/java2wadl-plugin/pom.xml
+++ b/maven-plugins/java2wadl-plugin/pom.xml
@@ -57,6 +57,7 @@
org.apache.maven
maven-compat
+provided
org.apache.maven
@@ -104,6 +105,10 @@
org.apache.maven.plugins
maven-javadoc-plugin
+
+org.apache.maven
+maven-model
+
org.apache.maven
maven-project
diff --git a/parent/pom.xml b/parent/pom.xml
index cb17850f23..512fc9584b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -867,6 +867,10 @@
javax.enterprise
cdi-api
+
+javax.annotation
+javax.annotation-api
+
@@ -991,6 +995,12 @@
maven-core
provided
${cxf.maven.core.version}
+
+
+javax.annotation
+javax.annotation-api
+
+
org.apache.maven
[cxf] 04/05: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit a3bf9d39a690ad4a0a27552a61f8ba4c0f5674f1 Author: Andriy Redko AuthorDate: Wed Apr 19 16:15:56 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 4fc11b6808..74c4807684 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -203,6 +203,7 @@ B b913b8d366af27a07d5c9cb80f10bf7fbf0ee5f2 B bad8f7cfb19b041e71875e45408902f616e691b2 B bbfd114ccc7bdbe9c09f1048a8fac13ece19d61e B bcde2712f577c400c03d6acf8c33877510505e0e +B bde0fc203909b7a79058dbbd82116f69ec06a938 B beebba09bcd47f8905edb34d3170dc92cfa4db67 B bfd64d8112f211ed3c2409d8b1b04355ce75c8bc B c035185add363a99fbacbeb8970dab1a7833c054
[cxf] 02/05: Fix Apache Maven warning that some plugin dependencies are in wrong scope
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 22ab64130a182499dcf5c33bdecac77c1adbe3d8 Author: Andriy Redko AuthorDate: Wed Apr 19 09:31:03 2023 -0400 Fix Apache Maven warning that some plugin dependencies are in wrong scope (cherry picked from commit f336f9ba21884e5ff94cce40d4bebf9c71e11ed8) (cherry picked from commit 88317d28fae6ee167e33f9ec4563d7229d27af1a) --- maven-plugins/java2swagger-plugin/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/maven-plugins/java2swagger-plugin/pom.xml b/maven-plugins/java2swagger-plugin/pom.xml index 674e1d8e46..ef1e194426 100644 --- a/maven-plugins/java2swagger-plugin/pom.xml +++ b/maven-plugins/java2swagger-plugin/pom.xml @@ -62,6 +62,7 @@ org.apache.maven maven-compat +provided org.sonatype.sisu @@ -115,6 +116,10 @@ org.apache.maven.plugins maven-javadoc-plugin + +org.apache.maven +maven-model + org.apache.maven maven-project
[cxf] branch 3.5.x-fixes updated: Fix JDK-11 API usage (post-merge issue)
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 The following commit(s) were added to refs/heads/3.5.x-fixes by this push: new 2f62c5d62f Fix JDK-11 API usage (post-merge issue) 2f62c5d62f is described below commit 2f62c5d62fe6eae1a1bda1741e8be0e0a6b88628 Author: Andriy Redko AuthorDate: Wed Apr 19 13:51:00 2023 -0400 Fix JDK-11 API usage (post-merge issue) --- .../transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java index 5808de4870..f59b566b33 100644 --- a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java +++ b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java @@ -83,7 +83,7 @@ public class CXFHttpAsyncResponseConsumer implements AsyncResponseConsumer
[cxf] 01/03: CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214)
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 0a72fb59a9b55695aff172228c7d2eb1eca7d7cf Author: Andriy Redko AuthorDate: Wed Apr 19 07:59:29 2023 -0400 CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214) (cherry picked from commit 9cb9eb0cfc3c6628793129c7660e0e6de557c963) (cherry picked from commit 362d16cc0d71445521e319126845a0943cff7447) --- .../hc5/CXFHttpAsyncResponseConsumer.java | 2 + .../http/netty/client/NettyHttpClientHandler.java | 2 +- .../http/netty/client/NettyHttpConduit.java| 166 - .../http/netty/client/NettyHttpConduitTest.java| 3 + 4 files changed, 105 insertions(+), 68 deletions(-) diff --git a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java index d8851635ba..5808de4870 100644 --- a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java +++ b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java @@ -82,6 +82,8 @@ public class CXFHttpAsyncResponseConsumer implements AsyncResponseConsumer
[cxf] branch 3.5.x-fixes updated (09d3b4e8aa -> bde0fc2039)
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 09d3b4e8aa [CXF-8837] check algorithm instead of class instance type (#1239) new 0a72fb59a9 CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214) new 88317d28fa Fix Apache Maven warning that some plugin dependencies are in wrong scope new bde0fc2039 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 | 2 + maven-plugins/java2swagger-plugin/pom.xml | 5 + .../hc5/CXFHttpAsyncResponseConsumer.java | 2 + .../http/netty/client/NettyHttpClientHandler.java | 2 +- .../http/netty/client/NettyHttpConduit.java| 166 - .../http/netty/client/NettyHttpConduitTest.java| 3 + 6 files changed, 112 insertions(+), 68 deletions(-)
[cxf] 02/03: Fix Apache Maven warning that some plugin dependencies are in wrong scope
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 88317d28fae6ee167e33f9ec4563d7229d27af1a Author: Andriy Redko AuthorDate: Wed Apr 19 09:31:03 2023 -0400 Fix Apache Maven warning that some plugin dependencies are in wrong scope (cherry picked from commit f336f9ba21884e5ff94cce40d4bebf9c71e11ed8) --- maven-plugins/java2swagger-plugin/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/maven-plugins/java2swagger-plugin/pom.xml b/maven-plugins/java2swagger-plugin/pom.xml index 86afe0d89a..1e8cca3985 100644 --- a/maven-plugins/java2swagger-plugin/pom.xml +++ b/maven-plugins/java2swagger-plugin/pom.xml @@ -62,6 +62,7 @@ org.apache.maven maven-compat +provided org.sonatype.sisu @@ -115,6 +116,10 @@ org.apache.maven.plugins maven-javadoc-plugin + +org.apache.maven +maven-model + org.apache.maven maven-project
[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 bde0fc203909b7a79058dbbd82116f69ec06a938 Author: Andriy Redko AuthorDate: Wed Apr 19 10:53:08 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index fcddc7fbc7..89b4359fe3 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -25,6 +25,7 @@ B 2b4a9f3abe30c92542e217d1077ea5c77119f328 B 2ba0d3038c9542ad59ec671bc17a6c0bac749f11 B 2c48413cfa4dbd746b49b4b08b0d15eb8077a7d6 B 31034cadab36e45a3348fd4b8f2726b01714abe1 +B 335b7880918b3ba148d9e239421aedb5de4db814 B 33e606c55927f34f3a2414bd1386931745357f38 B 3428dd1423198b22d7662dcc8d9553a58835c130 B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4 @@ -187,6 +188,7 @@ M 4aa61e9f22fb328c9f67c60ff20cc5a57be680b8 M 4b51a9540867466a4e966df9f6e15387919da7bc M 4ef710250f5bb21bbcd3c5fd672543b06c1acb73 M 4f128130f7ce73089f2cc7079beb3e608dbe2af9 +M 4f5cb0b82ca992b2c996770f0ebe88749b73ea73 M 512d8c7050eaf9696e73eaf029760fe12a65a5d3 M 518cde6d3edf59738908ef967dd67caa38ecbca4 M 519add3aedb7b9a058c70a9535446be745448d7b
[cxf] 01/03: CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214)
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 362d16cc0d71445521e319126845a0943cff7447 Author: Andriy Redko AuthorDate: Wed Apr 19 07:59:29 2023 -0400 CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214) (cherry picked from commit 9cb9eb0cfc3c6628793129c7660e0e6de557c963) --- .../hc5/CXFHttpAsyncResponseConsumer.java | 2 + .../http/netty/client/NettyHttpClientHandler.java | 2 +- .../http/netty/client/NettyHttpConduit.java| 166 - .../http/netty/client/NettyHttpConduitTest.java| 3 + 4 files changed, 105 insertions(+), 68 deletions(-) diff --git a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java index d8851635ba..5808de4870 100644 --- a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java +++ b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java @@ -82,6 +82,8 @@ public class CXFHttpAsyncResponseConsumer implements AsyncResponseConsumer
[cxf] 02/03: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 335b7880918b3ba148d9e239421aedb5de4db814 Author: Andriy Redko AuthorDate: Wed Apr 19 09:19:40 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index ad357ab12b..8b7a76cb9d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -103,6 +103,7 @@ M 2083c29ed066576be424b99b57dfea9cdd90c581 M 227e81b07f547106af5e76af7e526fc6c3c8ffc2 M 230fc881ed63bc56dbcb9b86f7e5a9eda4e15466 M 24151890ce517fcd8cfb5db08251e9088f4d7e85 +M 2419865a4d160ef5973d3fbb8adb3dd50472e6a3 M 24b749e191c51a1a6e509dfaef482380d0859120 M 27813a0523e1b4ab7cccd980ef63d7249627f4e8 M 278431e8adc631b7089f979d455fc54a721c7ab0 @@ -220,6 +221,7 @@ M 9a9d8da3eadb36ac32716988e28db544980c8e64 M 9b804a79de17ccd24f1999f673e1b4d4d25aaaec M 9c3dc283369f6c829b040920cbb93002daf3d440 M 9c93695b123a1de0f93d85e04d31b6e6abd81130 +M 9cb9eb0cfc3c6628793129c7660e0e6de557c963 M 9fdf22dfd1ed21a776d935754f1dd02aef67ce95 M a293a80333443ac39c960aea695e65fc260d8bdd M a2d821e682a7c48e7ef1784a0da6218bee003cd1
[cxf] 03/03: Fix Apache Maven warning that some plugin dependencies are in wrong scope
This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit f336f9ba21884e5ff94cce40d4bebf9c71e11ed8 Author: Andriy Redko AuthorDate: Wed Apr 19 09:31:03 2023 -0400 Fix Apache Maven warning that some plugin dependencies are in wrong scope --- maven-plugins/java2swagger-plugin/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/maven-plugins/java2swagger-plugin/pom.xml b/maven-plugins/java2swagger-plugin/pom.xml index 0fb292450e..09cbe8b95c 100644 --- a/maven-plugins/java2swagger-plugin/pom.xml +++ b/maven-plugins/java2swagger-plugin/pom.xml @@ -62,6 +62,7 @@ org.apache.maven maven-compat +provided org.sonatype.sisu @@ -115,6 +116,10 @@ org.apache.maven.plugins maven-javadoc-plugin + +org.apache.maven +maven-model + org.apache.maven maven-project
[cxf] branch 3.6.x-fixes updated (9fea073fdb -> f336f9ba21)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 9fea073fdb [CXF-8837] check algorithm instead of class instance type (#1239) new 362d16cc0d CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214) new 335b788091 Recording .gitmergeinfo Changes new f336f9ba21 Fix Apache Maven warning that some plugin dependencies are in wrong scope 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 | 2 + maven-plugins/java2swagger-plugin/pom.xml | 5 + .../hc5/CXFHttpAsyncResponseConsumer.java | 2 + .../http/netty/client/NettyHttpClientHandler.java | 2 +- .../http/netty/client/NettyHttpConduit.java| 166 - .../http/netty/client/NettyHttpConduitTest.java| 3 + 6 files changed, 112 insertions(+), 68 deletions(-)
[cxf] branch main updated (9cb9eb0cfc -> 8e1c471c27)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 9cb9eb0cfc CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214) add 8e1c471c27 Bump woodstox-core from 6.5.0 to 6.5.1 (#1240) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[cxf] branch dependabot/maven/com.fasterxml.woodstox-woodstox-core-6.5.1 updated (defc1b7a04 -> 6c32cd61c4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.fasterxml.woodstox-woodstox-core-6.5.1 in repository https://gitbox.apache.org/repos/asf/cxf.git discard defc1b7a04 Bump woodstox-core from 6.5.0 to 6.5.1 add 5de5c79b4b [CXF-8837] check algorithm instead of class instance type (#1239) add 9cb9eb0cfc CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214) add 6c32cd61c4 Bump woodstox-core from 6.5.0 to 6.5.1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (defc1b7a04) \ N -- N -- N refs/heads/dependabot/maven/com.fasterxml.woodstox-woodstox-core-6.5.1 (6c32cd61c4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/cxf/rs/security/jose/jws/JwsUtils.java | 10 +- .../hc5/CXFHttpAsyncResponseConsumer.java | 2 + .../http/netty/client/NettyHttpClientHandler.java | 2 +- .../http/netty/client/NettyHttpConduit.java| 166 - .../http/netty/client/NettyHttpConduitTest.java| 3 + 5 files changed, 110 insertions(+), 73 deletions(-)
[cxf] branch main updated: CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214)
This is an automated email from the ASF dual-hosted git repository. reta 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 9cb9eb0cfc CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214) 9cb9eb0cfc is described below commit 9cb9eb0cfc3c6628793129c7660e0e6de557c963 Author: Andriy Redko AuthorDate: Wed Apr 19 07:59:29 2023 -0400 CXF-8830: Fix org.apache.cxf.transport.http.netty.client.NettyHttpConduitTest.testCallAsyncCallbackInvokedOnlyOnce (#1214) --- .../hc5/CXFHttpAsyncResponseConsumer.java | 2 + .../http/netty/client/NettyHttpClientHandler.java | 2 +- .../http/netty/client/NettyHttpConduit.java| 166 - .../http/netty/client/NettyHttpConduitTest.java| 3 + 4 files changed, 105 insertions(+), 68 deletions(-) diff --git a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java index d8851635ba..5808de4870 100644 --- a/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java +++ b/rt/transports/http-hc5/src/main/java/org/apache/cxf/transport/http/asyncclient/hc5/CXFHttpAsyncResponseConsumer.java @@ -82,6 +82,8 @@ public class CXFHttpAsyncResponseConsumer implements AsyncResponseConsumer
[cxf] branch 3.5.x-fixes updated: [CXF-8837] check algorithm instead of class instance type (#1239)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 09d3b4e8aa [CXF-8837] check algorithm instead of class instance type
(#1239)
09d3b4e8aa is described below
commit 09d3b4e8aae1a4c0c1c37c036ce17ca2857bf62c
Author: Jan Bernhardt
AuthorDate: Wed Apr 19 09:00:06 2023 +0200
[CXF-8837] check algorithm instead of class instance type (#1239)
---
.../java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
index cf45d0603f..a3699acee4 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
@@ -114,12 +114,12 @@ public final class JwsUtils {
LOG.warning("No signature algorithm was defined");
throw new JwsException(JwsException.Error.ALGORITHM_NOT_SET);
}
-if (key instanceof ECPrivateKey) {
+if (JsonWebKey.KEY_TYPE_ELLIPTIC.equals(key.getAlgorithm())) {
return new EcDsaJwsSignatureProvider((ECPrivateKey)key, algo);
-} else if (key instanceof RSAPrivateKey) {
+} else if (JsonWebKey.KEY_TYPE_RSA.equals(key.getAlgorithm())) {
return new PrivateKeyJwsSignatureProvider(key, algo);
}
-
+
return null;
}
public static JwsSignatureProvider getHmacSignatureProvider(String
encodedKey, SignatureAlgorithm algo) {
@@ -178,9 +178,9 @@ public final class JwsUtils {
throw new JwsException(JwsException.Error.ALGORITHM_NOT_SET);
}
-if (key instanceof RSAPublicKey) {
+if (JsonWebKey.KEY_TYPE_RSA.equals(key.getAlgorithm())) {
return new PublicKeyJwsSignatureVerifier(key, algo);
-} else if (key instanceof ECPublicKey) {
+} else if (JsonWebKey.KEY_TYPE_ELLIPTIC.equals(key.getAlgorithm())) {
return new EcDsaJwsSignatureVerifier(key, algo);
}
[cxf] branch 3.6.x-fixes updated: [CXF-8837] check algorithm instead of class instance type (#1239)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 9fea073fdb [CXF-8837] check algorithm instead of class instance type
(#1239)
9fea073fdb is described below
commit 9fea073fdb51b0fc6c2c6b99b83fcfedb60e5912
Author: Jan Bernhardt
AuthorDate: Wed Apr 19 09:00:06 2023 +0200
[CXF-8837] check algorithm instead of class instance type (#1239)
---
.../java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
index cf45d0603f..a3699acee4 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
@@ -114,12 +114,12 @@ public final class JwsUtils {
LOG.warning("No signature algorithm was defined");
throw new JwsException(JwsException.Error.ALGORITHM_NOT_SET);
}
-if (key instanceof ECPrivateKey) {
+if (JsonWebKey.KEY_TYPE_ELLIPTIC.equals(key.getAlgorithm())) {
return new EcDsaJwsSignatureProvider((ECPrivateKey)key, algo);
-} else if (key instanceof RSAPrivateKey) {
+} else if (JsonWebKey.KEY_TYPE_RSA.equals(key.getAlgorithm())) {
return new PrivateKeyJwsSignatureProvider(key, algo);
}
-
+
return null;
}
public static JwsSignatureProvider getHmacSignatureProvider(String
encodedKey, SignatureAlgorithm algo) {
@@ -178,9 +178,9 @@ public final class JwsUtils {
throw new JwsException(JwsException.Error.ALGORITHM_NOT_SET);
}
-if (key instanceof RSAPublicKey) {
+if (JsonWebKey.KEY_TYPE_RSA.equals(key.getAlgorithm())) {
return new PublicKeyJwsSignatureVerifier(key, algo);
-} else if (key instanceof ECPublicKey) {
+} else if (JsonWebKey.KEY_TYPE_ELLIPTIC.equals(key.getAlgorithm())) {
return new EcDsaJwsSignatureVerifier(key, algo);
}
[cxf] branch main updated: [CXF-8837] check algorithm instead of class instance type (#1239)
This is an automated email from the ASF dual-hosted git repository.
coheigea 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 5de5c79b4b [CXF-8837] check algorithm instead of class instance type
(#1239)
5de5c79b4b is described below
commit 5de5c79b4b969105893f05adf50dd1ecf4dc0470
Author: Jan Bernhardt
AuthorDate: Wed Apr 19 09:00:06 2023 +0200
[CXF-8837] check algorithm instead of class instance type (#1239)
---
.../java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
index cf45d0603f..a3699acee4 100644
---
a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
+++
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
@@ -114,12 +114,12 @@ public final class JwsUtils {
LOG.warning("No signature algorithm was defined");
throw new JwsException(JwsException.Error.ALGORITHM_NOT_SET);
}
-if (key instanceof ECPrivateKey) {
+if (JsonWebKey.KEY_TYPE_ELLIPTIC.equals(key.getAlgorithm())) {
return new EcDsaJwsSignatureProvider((ECPrivateKey)key, algo);
-} else if (key instanceof RSAPrivateKey) {
+} else if (JsonWebKey.KEY_TYPE_RSA.equals(key.getAlgorithm())) {
return new PrivateKeyJwsSignatureProvider(key, algo);
}
-
+
return null;
}
public static JwsSignatureProvider getHmacSignatureProvider(String
encodedKey, SignatureAlgorithm algo) {
@@ -178,9 +178,9 @@ public final class JwsUtils {
throw new JwsException(JwsException.Error.ALGORITHM_NOT_SET);
}
-if (key instanceof RSAPublicKey) {
+if (JsonWebKey.KEY_TYPE_RSA.equals(key.getAlgorithm())) {
return new PublicKeyJwsSignatureVerifier(key, algo);
-} else if (key instanceof ECPublicKey) {
+} else if (JsonWebKey.KEY_TYPE_ELLIPTIC.equals(key.getAlgorithm())) {
return new EcDsaJwsSignatureVerifier(key, algo);
}
