bump versions for mongo matrix, driver versions

MorphiaOrg · Aug 26, 2023 · 26807ca · 26807ca
1 parent 398f359
commit 26807ca
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 35 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,40 +23,43 @@ jobs:
       - Build
     strategy:
       matrix:
-        java: [ 20, 11 ]
-        mongo: [ 6, 5, 4.4, 4.2, 4.0 ]
-        driver: [ 4.9.1 ]
+        java: [ 20, 17 ]
+        mongo: [ 7, 6, 5 ]
+        driver: [ 4.10.2 ]
         include:
-          - java: 11
-            mongo: 6
-            driver: 4.8.1
-          - java: 11
-            mongo: 6
+          - java: 17
+            mongo: 7
+            driver: 4.9.1
+          - java: 17
+            mongo: 7
+            driver: 4.8.2
+          - java: 17
+            mongo: 7
             driver: 4.7.2
-          - java: 11
-            mongo: 6
+          - java: 17
+            mongo: 7
             driver: 4.6.1
-          - java: 11
-            mongo: 6
+          - java: 17
+            mongo: 7
             driver: 4.5.1
-          - java: 11
-            mongo: 6
+          - java: 17
+            mongo: 7
             driver: 4.4.2
             optional: true
-          - java: 11
-            mongo: 6
+          - java: 17
+            mongo: 7
             driver: 4.3.4
             optional: true
-          - java: 11
-            mongo: 6
+          - java: 17
+            mongo: 7
             driver: 4.2.3
             optional: true
-          - java: 11
-            mongo: 6
+          - java: 17
+            mongo: 7
             driver: 4.1.2
             optional: true
-          - java: 11
-            mongo: 6
+          - java: 17
+            mongo: 7
             driver: 4.0.6
             optional: true
 

diff --git a/core/src/test/java/dev/morphia/test/Versions.java b/core/src/test/java/dev/morphia/test/Versions.java
@@ -14,6 +14,12 @@
 import static com.github.zafarkhaja.semver.Version.forIntegers;
 
 public enum Versions {
+    Version7 {
+        @Override
+        Version version() {
+            return forIntegers(7).setBuildMetadata("latest");
+        }
+    },
     Version6 {
         @Override
         Version version() {
@@ -55,15 +61,6 @@ public static Versions find(Version target) {
         return null;
     }
 
-    public String withMinorVersion() {
-        String minor = String.valueOf(version().getMajorVersion());
-        if (version().getMinorVersion() != -1) {
-            minor += "." + version().getMinorVersion();
-        }
-
-        return minor;
-    }
-
     private boolean matches(Version target) {
         boolean latest = version().getBuildMetadata().equals("latest");
         return target.getMajorVersion() == version().getMajorVersion()

diff --git a/kotlin/src/main/kotlin/dev/morphia/mapping/codec/ReadWritePropertyCodecProvider.kt b/kotlin/src/main/kotlin/dev/morphia/mapping/codec/ReadWritePropertyCodecProvider.kt
@@ -10,9 +10,8 @@ import org.bson.codecs.pojo.PropertyCodecRegistry
 import org.bson.codecs.pojo.TypeWithTypeParameters
 
 /**
- * @hidden
- * @morphia.internal
  * @since 2.2
+ * @hidden @morphia.internal
  */
 @MorphiaInternal
 @Suppress("UNCHECKED_CAST")

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.antwerkz</groupId>
         <artifactId>antwerkz-parent</artifactId>
-        <version>6</version>
+        <version>20</version>
     </parent>
 
     <groupId>dev.morphia.morphia</groupId>
@@ -23,7 +23,7 @@
 
     <properties>
         <awaitility.version>1.7.0</awaitility.version>
-        <driver.version>4.9.0</driver.version>
+        <driver.version>4.10.2</driver.version>
         <driver.minor.version>4.7</driver.minor.version>
         <jackson.version>2.14.2</jackson.version>
         <json.assert.version>1.5.1</json.assert.version>