Spring/spring-session-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to MongoDB 4.0.0-beta1.

Browse Source 
Resolves #127.
This commit is contained in:
Greg Turnquist
2020-01-29 17:01:12 -06:00
parent 18aa2ef8c0
commit 163e122784
2 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pom.xml
View File

@@ -75,8 +75,8 @@
<jsr305.version>3.0.2</jsr305.version>
<junit-bom.version>5.6.0</junit-bom.version>
<mockito.version>2.28.2</mockito.version>
<mongo.version>3.11.2</mongo.version>
<mongo-reactivestreams.version>1.12.0</mongo-reactivestreams.version>
<mongo.version>4.0.0-beta1</mongo.version>
<mongo-reactivestreams.version>4.0.0-beta1</mongo-reactivestreams.version>
<reactor-bom.version>Dysprosium-SR4</reactor-bom.version>
<spring-bom.version>5.2.3.RELEASE</spring-bom.version>
<spring-data-bom.version>Neumann-M2</spring-data-bom.version>
@@ -496,11 +496,11 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver</artifactId>
<artifactId>mongodb-driver-core</artifactId>
<version>${mongo.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
@@ -543,6 +543,13 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-sync</artifactId>
<version>${mongo.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
@@ -640,24 +647,11 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-async</artifactId>
<version>${mongo.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-reactivestreams</artifactId>
<version>${mongo-reactivestreams.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver-async</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

8
src/test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java
View File

@@ -18,7 +18,6 @@ package org.springframework.session.data.mongo.integration;
import static org.assertj.core.api.Assertions.*;
import java.io.IOException;
import java.net.UnknownHostException;
import java.time.Duration;
import java.time.Instant;
import java.util.Map;
@@ -42,7 +41,8 @@ import org.springframework.session.data.mongo.MongoIndexedSessionRepository;
import org.springframework.session.data.mongo.MongoSession;
import org.springframework.util.SocketUtils;
import com.mongodb.MongoClient;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
/**
* Abstract base class for {@link MongoIndexedSessionRepository} tests.
@@ -399,9 +399,9 @@ abstract public class AbstractMongoRepositoryITest extends AbstractITest {
@Bean
@DependsOn("embeddedMongoServer")
public MongoOperations mongoOperations() throws UnknownHostException {
public MongoOperations mongoOperations() {
MongoClient mongo = new MongoClient("localhost", this.embeddedMongoPort);
MongoClient mongo = MongoClients.create("mongodb://localhost:" + this.embeddedMongoPort);
return new MongoTemplate(mongo, "test");
}