From 748feea0f8885de29ac8b7383023d67eaacb49f6 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 14 Jul 2017 11:11:50 -0400 Subject: [PATCH] Upgrade to SD Kay B-S and fix MongoDB accordingly https://build.spring.io/browse/INT-FATS5IC-229/ --- build.gradle | 8 ++++---- .../store/AbstractConfigurableMongoDbMessageStore.java | 2 +- .../integration/mongodb/store/MongoDbMessageStore.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 59c131deb2..e2ca0bba3a 100644 --- a/build.gradle +++ b/build.gradle @@ -131,10 +131,10 @@ subprojects { subproject -> slf4jVersion = "1.7.25" smackVersion = '4.1.9' springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.M4' - springDataJpaVersion = '2.0.0.M4' - springDataMongoVersion = '2.0.0.M4' - springDataRedisVersion = '2.0.0.M4' - springGemfireVersion = '2.0.0.M4' + springDataJpaVersion = '2.0.0.BUILD-SNAPSHOT' + springDataMongoVersion = '2.0.0.BUILD-SNAPSHOT' + springDataRedisVersion = '2.0.0.BUILD-SNAPSHOT' + springGemfireVersion = '2.0.0.BUILD-SNAPSHOT' springSecurityVersion = '5.0.0.BUILD-SNAPSHOT' springSocialTwitterVersion = '2.0.0.M2' springRetryVersion = '1.2.0.RELEASE' diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java index 1cb3571e9a..ae05cd8cba 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/AbstractConfigurableMongoDbMessageStore.java @@ -34,12 +34,12 @@ import org.springframework.dao.DuplicateKeyException; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.data.mongodb.core.FindAndModifyOptions; -import org.springframework.data.mongodb.core.IndexOperations; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver; import org.springframework.data.mongodb.core.convert.MappingMongoConverter; import org.springframework.data.mongodb.core.convert.MongoCustomConversions; import org.springframework.data.mongodb.core.index.Index; +import org.springframework.data.mongodb.core.index.IndexOperations; import org.springframework.data.mongodb.core.mapping.MongoMappingContext; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java index 75f1c13836..14ec8e8570 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java @@ -49,12 +49,12 @@ import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.data.mongodb.core.BulkOperations; import org.springframework.data.mongodb.core.FindAndModifyOptions; -import org.springframework.data.mongodb.core.IndexOperations; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver; import org.springframework.data.mongodb.core.convert.MappingMongoConverter; import org.springframework.data.mongodb.core.convert.MongoCustomConversions; import org.springframework.data.mongodb.core.index.Index; +import org.springframework.data.mongodb.core.index.IndexOperations; import org.springframework.data.mongodb.core.mapping.MongoMappingContext; import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;