Upgrade dependencies; fix deprecations

Author: artembilan

build.gradle

@@ -33,7 +33,7 @@ description = 'Spring Integration'
 ext {
 	linkHomepage = 'https://projects.spring.io/spring-integration'
 	linkCi = 'https://build.spring.io/browse/INT'
-	linkIssue = 'https://jira.spring.io/browse/INT'
+	linkIssue = 'https://github.com/spring-projects/spring-integration/issues'
 	linkScmUrl = 'https://github.com/spring-projects/spring-integration'
 	linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration.git'
 	linkScmDevConnection = 'scm:git:ssh://[email protected]:spring-projects/spring-integration.git'
@@ -76,26 +76,26 @@ ext {
 	junitJupiterVersion = '5.5.2'
 	jythonVersion = '2.7.0'
 	kryoShadedVersion = '4.0.2'
-	lettuceVersion = '5.1.8.RELEASE'
+	lettuceVersion = '5.2.0.RELEASE'
 	log4jVersion = '2.12.1'
 	micrometerVersion = '1.2.1'
 	mockitoVersion = '3.0.0'
-	mysqlVersion = '8.0.16'
+	mysqlVersion = '8.0.17'
 	pahoMqttClientVersion = '1.2.0'
-	postgresVersion = '42.2.6'
+	postgresVersion = '42.2.8'
 	reactorVersion = 'Dysprosium-RELEASE'
-	resilience4jVersion = '1.0.0'
+	resilience4jVersion = '1.1.0'
 	romeToolsVersion = '1.12.1'
-	rsocketVersion = '1.0.0-RC3'
+	rsocketVersion = '1.0.0-RC5'
 	servletApiVersion = '4.0.1'
 	smackVersion = '4.3.4'
 	springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.0.BUILD-SNAPSHOT'
-	springDataVersion = 'Moore-BUILD-SNAPSHOT'
+	springDataVersion = 'Moore-RELEASE'
 	springSecurityVersion = '5.2.0.BUILD-SNAPSHOT'
 	springRetryVersion = '1.2.4.RELEASE'
-	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.BUILD-SNAPSHOT'
+	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.RELEASE'
 	springWsVersion = '3.0.7.RELEASE'
-	tomcatVersion = "9.0.24"
+	tomcatVersion = "9.0.26"
 	xstreamVersion = '1.4.11.1'
 }
 

spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/dsl/MongoDbTests.java

@@ -34,7 +34,7 @@
 import org.springframework.data.mongodb.core.BulkOperations;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -53,10 +53,10 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClients;
 
 /**
- * @author Xavier Padr?
+ * @author Xavier Padro
  * @author Gary Russell
  * @author Artem Bilan
  *
@@ -326,7 +326,7 @@ public MessageChannel getResultChannel() {
 
 		@Bean
 		public MongoDbFactory mongoDbFactory() {
-			return new SimpleMongoDbFactory(new MongoClient(), "test");
+			return new SimpleMongoClientDbFactory(MongoClients.create(), "test");
 		}
 
 		@Bean

spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/rules/MongoDbAvailableTests.java

@@ -24,23 +24,23 @@
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.integration.mongodb.outbound.MessageCollectionCallback;
 import org.springframework.messaging.Message;
 
-import com.mongodb.MongoClient;
 import com.mongodb.MongoException;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 
 /**
  * Convenience base class that enables unit test methods to rely upon the {@link MongoDbAvailable} annotation.
  *
  * @author Oleg Zhurakousky
- * @author Xavier Padr?
+ * @author Xavier Padro
  * @author Artem Bilan
  *
  * @since 2.1
@@ -52,7 +52,7 @@ public abstract class MongoDbAvailableTests {
 
 
 	protected MongoDbFactory prepareMongoFactory(String... additionalCollectionsToDrop) {
-		MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new MongoClient(), "test");
+		MongoDbFactory mongoDbFactory = new SimpleMongoClientDbFactory(MongoClients.create(), "test");
 		cleanupCollections(mongoDbFactory, additionalCollectionsToDrop);
 		return mongoDbFactory;
 	}