Merge pull request #1429 from ammachado

* pr/1479:
  Polish "Upgrade to WSS4J 4.0.0"
  Upgrade to WSS4J 4.0.0

Closes gh-1429

Author: snicoll

gradle/plugins/conventions-plugin/src/main/java/org/springframework/ws/gradle/conventions/JavaBasePluginConventions.java

@@ -43,6 +43,14 @@ void apply(Project project) {
 
 	private void configureRepositories(Project project) {
 		project.getRepositories().mavenCentral();
+		project.getRepositories().maven((repository) -> {
+			repository.setName("Shibboleth Releases");
+			repository.setUrl("https://build.shibboleth.net/nexus/content/repositories/releases");
+			repository.content((content) -> {
+				content.includeGroup("org.opensaml");
+				content.includeGroup("net.shibboleth");
+			});
+		});
 		String version = project.getVersion().toString();
 		if (version.contains("-")) {
 			project.getRepositories().maven((repository) -> {

spring-ws-platform/build.gradle

@@ -34,8 +34,8 @@ dependencies {
 		api("org.apache.commons:commons-collections4:4.4")
 		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.santuario:xmlsec:4.0.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")

spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java

@@ -142,8 +142,9 @@
  * @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 {
 

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;

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;

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;