diff --git a/.mvn/gradle-enterprise.xml b/.mvn/develocity.xml
similarity index 69%
rename from .mvn/gradle-enterprise.xml
rename to .mvn/develocity.xml
index 135c1183..667e434c 100644
--- a/.mvn/gradle-enterprise.xml
+++ b/.mvn/develocity.xml
@@ -1,7 +1,6 @@
-
-
+
https://ge.spring.io
@@ -28,4 +27,4 @@
#{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null and env['GRADLE_ENTERPRISE_CACHE_PASSWORD'] != null}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 85a16c3a..854714ce 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -2,12 +2,12 @@
com.gradle
- gradle-enterprise-maven-extension
- 1.18.1
+ develocity-maven-extension
+ 1.21.3
com.gradle
common-custom-user-data-maven-extension
- 1.12.2
+ 2.0
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 56a339e2..c58c75b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,22 +92,22 @@
17
false
- 2.28.0
- 1.9.6
- 3.9.0
+ 2.33.0
+ 1.9.22
+ 3.25.3
3.1
- 2.11.0
+ 2.16.1
1.6.1
4.3
1.1.0
2.10.9.2
- 2.0.0-alpha-2
- 4.5.3
- 5.2.1
+ 2.0.1
+ 4.5.14
+ 5.2.3
2.1.1
3.1.0
2.1.3
- 2.1.2
+ 2.1.3
6.0.0
3.0.1
4.0.2
@@ -115,41 +115,41 @@
1.1.6
2.0.6.1
11.0.12
- 5.9.1
+ 5.9.3
2.19.0
1.4.7
- 4.0.0
+ 4.11.0
3.0.3
2.0.6
4.3.5
6.0.18
- 6.0.8
+ 6.1.9
6.0.19-SNAPSHOT
- 6.0.9-SNAPSHOT
+ 6.1.10-SNAPSHOT
- 6.1.5
- 6.2.3
+ 6.1.6
+ 6.2.4
- 6.1.6-SNAPSHOT
- 6.2.4-SNAPSHOT
+ 6.1.7-SNAPSHOT
+ 6.2.5-SNAPSHOT
- 2.1.4
+ 2.1.5
2.0.1
2.1.0
6.5.1
1.6.3
2.4.3
3.0.0
- 3.0.3
- 2.2.2
+ 3.0.4
+ 2.3.1
1.6
- 2.9.0
+ 2.10.0
1.3.7
1.77
0.0.3
@@ -326,9 +326,9 @@
com.gradle
- gradle-enterprise-maven-extension
+ develocity-maven-extension
-
+
@@ -336,7 +336,7 @@
-
+
diff --git a/spring-ws-test/pom.xml b/spring-ws-test/pom.xml
index 4ef23719..f905fbda 100644
--- a/spring-ws-test/pom.xml
+++ b/spring-ws-test/pom.xml
@@ -33,11 +33,10 @@
org.springframework
spring-context
-
- xmlunit
- xmlunit
- ${xmlunit1.version}
+ org.xmlunit
+ xmlunit-legacy
+ ${xmlunit.version}
diff --git a/spring-xml/pom.xml b/spring-xml/pom.xml
index 5daca08f..0a2d5c19 100644
--- a/spring-xml/pom.xml
+++ b/spring-xml/pom.xml
@@ -38,6 +38,12 @@
${jaxen.version}
true
+
+ org.apache.commons
+ commons-collections4
+ 4.4
+ test
+
diff --git a/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java b/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java
index 07de11c5..ccf91aea 100644
--- a/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java
+++ b/spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java
@@ -16,17 +16,19 @@
package org.springframework.xml.namespace;
-import static org.assertj.core.api.Assertions.*;
-
import java.util.Collections;
import java.util.Iterator;
import javax.xml.XMLConstants;
+import org.apache.commons.collections4.IteratorUtils;
import org.assertj.core.api.Condition;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
class SimpleNamespaceContextTest {
private SimpleNamespaceContext context;
@@ -71,7 +73,7 @@ class SimpleNamespaceContextTest {
assertPrefixes("defaultNamespaceURI", XMLConstants.DEFAULT_NS_PREFIX);
assertPrefixes("namespaceURI", "prefix");
- assertThat(context.getPrefixes("unbound")).isEmpty();
+ assertThat(context.getPrefixes("unbound").hasNext()).isFalse();
assertPrefixes(XMLConstants.XML_NS_URI, XMLConstants.XML_NS_PREFIX);
assertPrefixes(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, XMLConstants.XMLNS_ATTRIBUTE);
}
@@ -108,7 +110,7 @@ class SimpleNamespaceContextTest {
assertThat(result)
.has(new Condition<>(value -> value.equals("prefix1") || value.equals("prefix2"), "verify prefix"));
- assertThat(iterator).isEmpty();
+ assertThat(iterator.hasNext()).isFalse();
}
private void assertPrefixes(String namespaceUri, String prefix) {
@@ -121,7 +123,7 @@ class SimpleNamespaceContextTest {
String result = iterator.next();
assertThat(result).isEqualTo(prefix);
- assertThat(iterator).isEmpty();
+ assertThat(iterator.hasNext()).isFalse();
}
@Test
@@ -135,7 +137,7 @@ class SimpleNamespaceContextTest {
String result = iterator.next();
assertThat(result).isEqualTo("prefix");
- assertThat(iterator).isEmpty();
+ assertThat(iterator.hasNext()).isFalse();
}
@Test
@@ -158,15 +160,15 @@ class SimpleNamespaceContextTest {
context.bindNamespaceUri(prefix1, namespaceUri);
context.bindNamespaceUri(prefix2, namespaceUri);
- assertThat(context.getPrefixes(namespaceUri)).containsExactly(prefix1, prefix2);
+ assertThat(IteratorUtils.toList(context.getPrefixes(namespaceUri))).containsExactly(prefix1, prefix2);
context.removeBinding(prefix1);
- assertThat(context.getPrefixes(namespaceUri)).containsExactly(prefix2);
+ assertThat(IteratorUtils.toList(context.getPrefixes(namespaceUri))).containsExactly(prefix2);
context.removeBinding(prefix2);
- assertThat(context.getPrefixes(namespaceUri)).isEmpty();
+ assertThat(context.getPrefixes(namespaceUri).hasNext()).isFalse();
}
@Test
@@ -210,7 +212,7 @@ class SimpleNamespaceContextTest {
assertThat(result).has(new Condition<>(
value -> value.equals(XMLConstants.DEFAULT_NS_PREFIX) || value.equals("prefix"), "Verify prefix"));
- assertThat(iterator).isEmpty();
+ assertThat(iterator.hasNext()).isFalse();
}
}