Upgrade dependencies to the latest milestones

Author: artembilan

build.gradle

@@ -46,23 +46,23 @@ ext {
 			files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 
 	activeMqVersion = '5.16.0'
-	apacheSshdVersion = '2.5.0'
+	apacheSshdVersion = '2.5.1'
 	aspectjVersion = '1.9.6'
 	assertjVersion = '3.16.1'
 	assertkVersion = '0.22'
-	avroVersion = '1.9.2'
+	avroVersion = '1.10.0'
 	awaitilityVersion = '4.0.3'
 	commonsDbcp2Version = '2.7.0'
 	commonsIoVersion = '2.7'
-	commonsNetVersion = '3.6'
+	commonsNetVersion = '3.7'
 	curatorVersion = '4.3.0'
 	derbyVersion = '10.14.2.0'
 	ftpServerVersion = '1.1.1'
 	googleJsr305Version = '3.0.2'
-	groovyVersion = '3.0.4'
+	groovyVersion = '3.0.5'
 	hamcrestVersion = '2.2'
-	hazelcastVersion = '4.0.1'
-	hibernateVersion = '5.4.19.Final'
+	hazelcastVersion = '4.0.2'
+	hibernateVersion = '5.4.20.Final'
 	hsqldbVersion = '2.5.1'
 	h2Version = '1.4.200'
 	jacksonVersion = '2.11.2'
@@ -74,39 +74,39 @@ ext {
 	jmsApiVersion = '2.0.1'
 	jpa21ApiVersion = '1.0.2.Final'
 	jpaApiVersion = '2.2.1'
-	jrubyVersion = '9.2.11.1'
+	jrubyVersion = '9.2.13.0'
 	jschVersion = '0.1.55'
 	jsonpathVersion = '2.4.0'
 	junit4Version = '4.13'
 	junitJupiterVersion = '5.7.0-M1'
 	jythonVersion = '2.7.2'
 	kryoShadedVersion = '4.0.2'
-	lettuceVersion = '5.3.2.RELEASE'
+	lettuceVersion = '6.0.0.RC1'
 	log4jVersion = '2.13.3'
 	micrometerVersion = '1.5.3'
-	mockitoVersion = '3.3.3'
+	mockitoVersion = '3.4.6'
 	mongoDriverVersion = '4.1.0'
 	mysqlVersion = '8.0.21'
 	pahoMqttClientVersion = '1.2.4'
 	postgresVersion = '42.2.14'
-	reactorVersion = '2020.0.0-SNAPSHOT'
+	r2dbch2Version='0.8.4.RELEASE'
+	reactorVersion = '2020.0.0-M2'
 	resilience4jVersion = '1.5.0'
 	romeToolsVersion = '1.12.2'
-	rsocketVersion = '1.1.0-SNAPSHOT'
+	rsocketVersion = '1.1.0-M1'
 	saajVersion = '1.5.2'
 	servletApiVersion = '4.0.1'
 	smackVersion = '4.3.4'
 	soapVersion = '1.4.0'
 	springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.0-SNAPSHOT'
 	springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2020.0.0-SNAPSHOT'
 	springKafkaVersion = '2.6.0-SNAPSHOT'
-	springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.4.0-SNAPSHOT'
 	springRetryVersion = '1.3.0'
-	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-SNAPSHOT'
+	springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.4.0-RC1'
+	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-M2'
 	springWsVersion = '3.0.9.RELEASE'
 	tomcatVersion = "9.0.37"
 	xstreamVersion = '1.4.12'
-	r2dbch2Version='0.8.4.RELEASE'
 
 	javaProjects = subprojects - project(':spring-integration-bom')
 }

spring-integration-ws/src/test/java/org/springframework/integration/ws/MarshallingWebServiceIntegrationTests.java

@@ -30,9 +30,8 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -42,20 +41,19 @@
 import org.springframework.oxm.MarshallingFailureException;
 import org.springframework.oxm.Unmarshaller;
 import org.springframework.oxm.XmlMappingException;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.context.MessageContext;
 import org.springframework.xml.transform.StringSource;
 
 /**
  *
  * @author Iwein Fuld
+ * @author Artem Bilan
  *
  */
 
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
+@SpringJUnitConfig
 public class MarshallingWebServiceIntegrationTests {
 
 	private static final String input = "<hello/>";
@@ -78,13 +76,13 @@ public class MarshallingWebServiceIntegrationTests {
 
 	private Result stringResult = new StreamResult(output);
 
-	@Before
+	@BeforeEach
 	public void setupMocks() {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 	}
 
 	@Test
-	public void configOk() throws Exception {
+	public void configOk() {
 		// just flag invalid config
 	}
 
@@ -100,23 +98,20 @@ public void sendString() throws Exception {
 
 	public static class StubMarshaller implements Marshaller, Unmarshaller {
 
-		public void marshal(Object graph, Result result)
-				throws XmlMappingException, IOException {
+		public void marshal(Object graph, Result result) throws XmlMappingException {
 			Transformer transformer;
 			try {
 				transformer = TransformerFactory.newInstance().newTransformer();
 				StringSource stringSource = new StringSource(graph.toString());
 				transformer.transform(stringSource, result);
 			}
 			catch (Exception e) {
-				throw new MarshallingFailureException("Stub failed to marshal",
-						e);
+				throw new MarshallingFailureException("Stub failed to marshal", e);
 			}
 		}
 
 
-		@SuppressWarnings("rawtypes")
-		public boolean supports(Class clazz) {
+		public boolean supports(Class<?> clazz) {
 			return true;
 		}
 
@@ -125,6 +120,7 @@ public Object unmarshal(Source source) throws XmlMappingException,
 			//this is a hack, but we're not here to test marshalling
 			return input;
 		}
+
 	}
 
 	public static class StubEndpoint {
@@ -133,5 +129,7 @@ public static class StubEndpoint {
 		public Object handle(Object o) {
 			return o;
 		}
+
 	}
+
 }