You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/07/28 17:44:43 UTC
[cxf] branch 3.6.x-fixes updated (d9f4efab81 -> af5a03b481)
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 d9f4efab81 Recording .gitmergeinfo Changes
new 539186659b Bump cxf.netty.version from 4.1.95.Final to 4.1.96.Final (#1362)
new 7115cb3a63 CXF-8907: java.lang.NullPointerException at AsymmetricBindingHandler.java (#1361)
new af5a03b481 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 | 1 +
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java | 4 ++++
4 files changed, 7 insertions(+), 2 deletions(-)
[cxf] 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit af5a03b4812ea5797fb9b9c45a3107abc0297f76
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Jul 28 13:40:57 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 32ba490ba7..c7199bd649 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -393,6 +393,7 @@ M 797df326d9b73cdaa02851a9cdc7d07bc05aad2c
M 79da13fc29d7c94da41b7f4510eaceeb725885ab
M 7ae196bbff8a16ea9d9d52999c853e4ea40f4fa8
M 7aefb697f7b391170bb48faecf2638e6f72ab9b1
+M 7bbeae8c56ea40e92461388052c78cf0dd711fc9
M 7c9a063fc4e300e9787e19f42b86a9b7fdeda82a
M 7dc87bce5436a7aee3899c2bc67629cc56fc4623
M 7e317f44903968cba5a81ad6942372ac52332e79
[cxf] 01/03: Bump cxf.netty.version from 4.1.95.Final to 4.1.96.Final (#1362)
Posted by re...@apache.org.
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 539186659b20b60db89b9cb0d4786480ed57aa12
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Jul 28 12:08:52 2023 -0400
Bump cxf.netty.version from 4.1.95.Final to 4.1.96.Final (#1362)
Bumps `cxf.netty.version` from 4.1.95.Final to 4.1.96.Final.
Updates `io.netty:netty-codec-http` from 4.1.95.Final to 4.1.96.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.95.Final...netty-4.1.96.Final)
Updates `io.netty:netty-codec-http2` from 4.1.95.Final to 4.1.96.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.95.Final...netty-4.1.96.Final)
Updates `io.netty:netty-codec-socks` from 4.1.95.Final to 4.1.96.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.95.Final...netty-4.1.96.Final)
Updates `io.netty:netty-handler-proxy` from 4.1.95.Final to 4.1.96.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.95.Final...netty-4.1.96.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] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 7bbeae8c56ea40e92461388052c78cf0dd711fc9)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index ba6ef3eff5..e305e4f0c2 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -33,7 +33,7 @@
<spring.boot.version>2.7.13</spring.boot.version>
<spring.cloud.eureka.version>3.1.4</spring.cloud.eureka.version>
<cxf.jetty10.version>10.0.15</cxf.jetty10.version>
- <cxf.netty.version>4.1.95.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.96.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>5.1.3</cxf.swagger.ui.version>
<cxf.tika.version>2.7.0</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 35bdef98be..25528d6b58 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -178,7 +178,7 @@
<cxf.msv.version>2022.7</cxf.msv.version>
<cxf.neethi.version>3.2.0</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
- <cxf.netty.version>4.1.95.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.96.Final</cxf.netty.version>
<cxf.netty.tcnative.version>2.0.46.Final</cxf.netty.tcnative.version>
<cxf.olingo.version>2.0.12</cxf.olingo.version>
<cxf.openjpa.version>3.2.2</cxf.openjpa.version>
[cxf] 02/03: CXF-8907: java.lang.NullPointerException at AsymmetricBindingHandler.java (#1361)
Posted by re...@apache.org.
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 7115cb3a6389a73fe9879b382a48b57b077eb0ae
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Jul 28 12:26:45 2023 -0400
CXF-8907: java.lang.NullPointerException at AsymmetricBindingHandler.java (#1361)
(cherry picked from commit db6948da75549ca670799b4541fe09f818b3c50a)
---
.../ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index a944b99e0e..4f41282fa4 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -863,6 +863,10 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
List<WSHandlerResult> results = CastUtils.cast((List<?>)message.getExchange().getInMessage()
.get(WSHandlerConstants.RECV_RESULTS));
+ if (results == null) {
+ return null;
+ }
+
for (WSHandlerResult rResult : results) {
List<WSSecurityEngineResult> wsSecEngineResults = rResult.getResults();