From 409671b669573eabde77b8dc8adbec21bac9d429 Mon Sep 17 00:00:00 2001
From: Adriano Machado <60320+ammachado@users.noreply.github.com>
Date: Sun, 1 Sep 2024 18:40:46 -0400
Subject: [PATCH] Upgrade to WSS4J 4.0.0

See gh-1429
---
 spring-ws-platform/build.gradle                                | 2 +-
 .../ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java      | 3 ++-
 .../ws/soap/security/wss4j2/callback/package-info.java         | 2 +-
 .../springframework/ws/soap/security/wss4j2/package-info.java  | 2 +-
 .../ws/soap/security/wss4j2/support/package-info.java          | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-ws-platform/build.gradle b/spring-ws-platform/build.gradle
index 1d479d70..73059d01 100644
--- a/spring-ws-platform/build.gradle
+++ b/spring-ws-platform/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 		api("org.apache.httpcomponents.client5:httpclient5:5.2.3")
 		api("org.apache.httpcomponents:httpclient:4.5.14")
 		api("org.apache.santuario:xmlsec:3.0.4")
-		api("org.apache.wss4j:wss4j-ws-security-dom:2.4.3")
+		api("org.apache.wss4j:wss4j-ws-security-dom:4.0.0")
 		api("org.apache.ws.xmlschema:xmlschema-core:2.3.1")
 		api("org.aspectj:aspectjrt:1.9.22")
 		api("org.aspectj:aspectjweaver:1.9.22")
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java
index fc913d6b..c965703d 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java
@@ -142,8 +142,9 @@ import org.springframework.ws.soap.security.wss4j2.callback.UsernameTokenPrincip
  * @author Jamin Hitchcock
  * @author Rob Leland
  * @author Lars Uffmann
+ * @author Andreas Winter
  * @since 2.3.0
- * @see <a href="http://ws.apache.org/wss4j/">Apache WSS4J 2.0</a>
+ * @see <a href="http://ws.apache.org/wss4j/">Apache WSS4J 2.0+</a>
  */
 public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor implements InitializingBean {
 
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/package-info.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/package-info.java
index 621cf55f..36f8d35a 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/package-info.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * Contains {@code CallbackHandler} implementations for WSS4J 2.0.
+ * Contains {@code CallbackHandler} implementations for WSS4J 2.0+.
  */
 package org.springframework.ws.soap.security.wss4j2.callback;
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/package-info.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/package-info.java
index caec0467..e3313c8f 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/package-info.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/package-info.java
@@ -16,6 +16,6 @@
 
 /**
  * Contains classes for using the <a href="http://ws.apache.org/wss4j/">Apache WSS4J
- * 2.0</a> WS-Security implementation within Spring-WS.
+ * 2.0+</a> WS-Security implementation within Spring-WS.
  */
 package org.springframework.ws.soap.security.wss4j2;
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/package-info.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/package-info.java
index 456cc673..b65aaa60 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/package-info.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * Contains support classes for working with WSS4J 2.0.
+ * Contains support classes for working with WSS4J 2.0+.
  */
 package org.springframework.ws.soap.security.wss4j2.support;