diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index b23a83c..1639aca 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,7 @@ +## 3.0-M4 + +* #2 Upgrade Mongo driver to 4.11.2 and Morphia to 2.4.13 + ## 3.0.M1 -* #1 Deterministic MongoTester \ No newline at end of file +* #1 Deterministic MongoTester diff --git a/bootique-mongo-morphia/src/main/java/io/bootique/mongo/morphia/AbstractMorphiaDao.java b/bootique-mongo-morphia/src/main/java/io/bootique/mongo/morphia/AbstractMorphiaDao.java index 15d23e1..74c5f11 100644 --- a/bootique-mongo-morphia/src/main/java/io/bootique/mongo/morphia/AbstractMorphiaDao.java +++ b/bootique-mongo-morphia/src/main/java/io/bootique/mongo/morphia/AbstractMorphiaDao.java @@ -19,7 +19,7 @@ package io.bootique.mongo.morphia; import dev.morphia.Datastore; -import dev.morphia.query.experimental.filters.Filters; +import dev.morphia.query.filters.Filters; import java.util.Optional; import java.util.stream.Stream; diff --git a/bootique-mongo-morphia/src/test/java/io/bootique/mongo/morphia/MongoMorphiaIT.java b/bootique-mongo-morphia/src/test/java/io/bootique/mongo/morphia/MongoMorphiaIT.java index b739d76..3a8ec93 100644 --- a/bootique-mongo-morphia/src/test/java/io/bootique/mongo/morphia/MongoMorphiaIT.java +++ b/bootique-mongo-morphia/src/test/java/io/bootique/mongo/morphia/MongoMorphiaIT.java @@ -21,7 +21,7 @@ import com.mongodb.client.MongoClient; import dev.morphia.Datastore; import dev.morphia.Morphia; -import dev.morphia.query.experimental.filters.Filters; +import dev.morphia.query.filters.Filters; import io.bootique.BQRuntime; import io.bootique.Bootique; import io.bootique.junit5.BQApp; @@ -36,7 +36,7 @@ @BQTest class MongoMorphiaIT { - private static final String DB_NAME = "ander-test"; + private static final String DB_NAME = "test"; @BQTestTool static final MongoTester mongoTester = MongoTester.create(); @@ -106,7 +106,7 @@ void testMorphiaWithSubObjects() { private Datastore getDatastore() { MongoClient client = app.getInstance(MongoClient.class); - var datastore = Morphia.createDatastore(client, DB_NAME); + Datastore datastore = Morphia.createDatastore(client, DB_NAME); datastore.getMapper().mapPackage(this.getClass().getPackageName()); datastore.ensureIndexes(); return datastore; diff --git a/pom.xml b/pom.xml index b668e03..2680726 100644 --- a/pom.xml +++ b/pom.xml @@ -45,8 +45,8 @@ ${project.version} - 4.6.0 - 2.2.6 + 4.11.2 + 2.4.13 1.26.1