Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump versions of dependencies. (#1411)

Browse Source 
Update test for newer AssertJ.
This commit is contained in:
Corneil du Plessis
2024-05-09 12:38:16 +02:00
committed by GitHub
parent d208dc926a
commit e938c7cc7e
6 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.mvn/gradle-enterprise.xml → .mvn/develocity.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<gradleEnterprise
xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
<develocity
xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
<server>
<url>https://ge.spring.io</url>
</server>
@@ -28,4 +27,4 @@
<storeEnabled>#{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null and env['GRADLE_ENTERPRISE_CACHE_PASSWORD'] != null}</storeEnabled>
</remote>
</buildCache>
</gradleEnterprise>
</develocity>

6
.mvn/extensions.xml
View File

@@ -2,12 +2,12 @@
<extensions>
<extension>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<version>1.18.1</version>
<artifactId>develocity-maven-extension</artifactId>
<version>1.21.3</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
<artifactId>common-custom-user-data-maven-extension</artifactId>
<version>1.12.2</version>
<version>2.0</version>
</extension>
</extensions>

46
pom.xml
View File

@@ -92,22 +92,22 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
<activemq.version>2.28.0</activemq.version>
<aspectj.version>1.9.6</aspectj.version>
<assertj.version>3.9.0</assertj.version>
<activemq.version>2.33.0</activemq.version>
<aspectj.version>1.9.22</aspectj.version>
<assertj.version>3.25.3</assertj.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-io.version>2.11.0</commons-io.version>
<commons-io.version>2.16.1</commons-io.version>
<dom4j.version>1.6.1</dom4j.version>
<easymock.version>4.3</easymock.version>
<eclipse-angus-mail.version>1.1.0</eclipse-angus-mail.version>
<ehcache.version>2.10.9.2</ehcache.version>
<greenmail.version>2.0.0-alpha-2</greenmail.version>
<httpclient.version>4.5.3</httpclient.version>
<httpclient5.version>5.2.1</httpclient5.version>
<greenmail.version>2.0.1</greenmail.version>
<httpclient.version>4.5.14</httpclient.version>
<httpclient5.version>5.2.3</httpclient5.version>
<jakarta-annotation.version>2.1.1</jakarta-annotation.version>
<jakarta-jms.version>3.1.0</jakarta-jms.version>
<jakarta-mail-api.version>2.1.3</jakarta-mail-api.version>
<jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
<jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
<jakarta-servlet.version>6.0.0</jakarta-servlet.version>
<jakarta-soap.version>3.0.1</jakarta-soap.version>
<jakarta-xml-bind.version>4.0.2</jakarta-xml-bind.version>
@@ -115,41 +115,41 @@
<jaxen.version>1.1.6</jaxen.version>
<jdom2.version>2.0.6.1</jdom2.version>
<jetty.version>11.0.12</jetty.version>
<junit.version>5.9.1</junit.version>
<junit.version>5.9.3</junit.version>
<log4j2.version>2.19.0</log4j2.version>
<mail.version>1.4.7</mail.version>
<mockito.version>4.0.0</mockito.version>
<mockito.version>4.11.0</mockito.version>
<saaj-impl.version>3.0.3</saaj-impl.version>
<slf4j.version>2.0.6</slf4j.version>
<smack.version>4.3.5</smack.version>
<!-- Spring Framework/Spring Security baseline -->
<spring.version>6.0.18</spring.version> <!-- TODO: Ensure smoke-tests matches, also check spring-next-gen -->
<spring-security.version>6.0.8</spring-security.version>
<spring-security.version>6.1.9</spring-security.version>
<!-- Spring Framework/Spring Security baseline-SNAPSHOT -->
<spring-snapshot.version>6.0.19-SNAPSHOT</spring-snapshot.version>
<spring-security-snapshot.version>6.0.9-SNAPSHOT</spring-security-snapshot.version>
<spring-security-snapshot.version>6.1.10-SNAPSHOT</spring-security-snapshot.version>
<!-- Spring Framework/Spring Security Next Gen -->
<spring-next-gen.version>6.1.5</spring-next-gen.version>
<spring-security-next-gen.version>6.2.3</spring-security-next-gen.version>
<spring-next-gen.version>6.1.6</spring-next-gen.version>
<spring-security-next-gen.version>6.2.4</spring-security-next-gen.version>
<!-- Spring Framework/Spring Security Next Gen-SNAPSHOT -->
<spring-next-gen-snapshot.version>6.1.6-SNAPSHOT</spring-next-gen-snapshot.version>
<spring-security-next-gen-snapshot.version>6.2.4-SNAPSHOT</spring-security-next-gen-snapshot.version>
<spring-next-gen-snapshot.version>6.1.7-SNAPSHOT</spring-next-gen-snapshot.version>
<spring-security-next-gen-snapshot.version>6.2.5-SNAPSHOT</spring-security-next-gen-snapshot.version>
<spring-hateos.version>2.1.4</spring-hateos.version>
<spring-hateos.version>2.1.5</spring-hateos.version>
<sun-mail.version>2.0.1</sun-mail.version>
<stax.version>2.1.0</stax.version>
<woodstox.version>6.5.1</woodstox.version>
<wsdl4j.version>1.6.3</wsdl4j.version>
<wss4j.version>2.4.3</wss4j.version>
<wss4j-next.version>3.0.0</wss4j-next.version>
<xmlsec.version>3.0.3</xmlsec.version>
<xml-schema-core.version>2.2.2</xml-schema-core.version>
<xmlsec.version>3.0.4</xmlsec.version>
<xml-schema-core.version>2.3.1</xml-schema-core.version>
<xmlunit1.version>1.6</xmlunit1.version>
<xmlunit.version>2.9.0</xmlunit.version>
<xmlunit.version>2.10.0</xmlunit.version>
<xom.version>1.3.7</xom.version>
<bouncycastle.version>1.77</bouncycastle.version>
<spring-asciidoctor-backends.version>0.0.3</spring-asciidoctor-backends.version>
@@ -326,9 +326,9 @@
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>gradle-enterprise-maven-extension</artifactId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<gradleEnterprise>
<develocity>
<normalization>
<runtimeClassPath>
<ignoredFiles>
@@ -336,7 +336,7 @@
</ignoredFiles>
</runtimeClassPath>
</normalization>
</gradleEnterprise>
</develocity>
</configuration>
</plugin>
</plugins>

7
spring-ws-test/pom.xml
View File

@@ -33,11 +33,10 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>${xmlunit1.version}</version>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-legacy</artifactId>
<version>${xmlunit.version}</version>
</dependency>
<dependency>

6
spring-xml/pom.xml
View File

@@ -38,6 +38,12 @@
<version>${jaxen.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
<scope>test</scope>
</dependency>
</dependencies>

22
spring-xml/src/test/java/org/springframework/xml/namespace/SimpleNamespaceContextTest.java
View File

@@ -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();
}
}