Skip to content

Commit

Permalink
Upgrade to MongoDB 3
Browse files Browse the repository at this point in the history
This commit upgrades to MongoDB 3. Dependency management has been added
for the new and preferred mongodb-driver artifact. The starter has
been updated to use this new artifact rather than monogo-java-driver.
Dependency management for mongo-java-driver has been retained to avoid
causing problems for people who have declared the dependency explicitly.
The auto-configuration for Embedded Mongo has also been updated to
use 3.2.2 by default.

Closes gh-3011
  • Loading branch information
wilkinsona committed May 26, 2016
1 parent 44b4df2 commit 6f5bd2e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class EmbeddedMongoProperties {
/**
* Version of Mongo to use.
*/
private String version = "2.6.10";
private String version = "3.2.2";

private final Storage storage = new Storage();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void close() {

@Test
public void defaultVersion() {
assertVersionConfiguration(null, "2.6.10");
assertVersionConfiguration(null, "3.2.2");
}

@Test
Expand Down
7 changes: 6 additions & 1 deletion spring-boot-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<lombok.version>1.16.8</lombok.version>
<mariadb.version>1.4.4</mariadb.version>
<mockito.version>1.10.19</mockito.version>
<mongodb.version>2.14.2</mongodb.version>
<mongodb.version>3.2.2</mongodb.version>
<mysql.version>5.1.39</mysql.version>
<narayana.version>5.3.2.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version>
Expand Down Expand Up @@ -1893,6 +1893,11 @@
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongodb-driver</artifactId>
<version>${mongodb.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<artifactId>mongodb-driver</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
Expand Down

0 comments on commit 6f5bd2e

Please sign in to comment.