Merge remote-tracking branch 'origin/v5.4' into v6.0

ravendb · Mar 11, 2024 · 54632a1 · 54632a1
2 parents 3c21d64 + f5f3cf8
commit 54632a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.10.1</version>
+                <version>5.10.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -103,12 +103,12 @@
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-client</artifactId>
-            <version>9.4.53.v20231009</version>
+            <version>9.4.54.v20240208</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.16.1</version>
+            <version>2.16.2</version>
         </dependency>
 
 
@@ -121,7 +121,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.25.1</version>
+            <version>3.25.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/net/ravendb/client/primitives/SharpAwareJacksonAnnotationIntrospector.java b/src/main/java/net/ravendb/client/primitives/SharpAwareJacksonAnnotationIntrospector.java
@@ -17,6 +17,7 @@ public String[] findEnumValues(MapperConfig<?> config, AnnotatedClass annotatedC
         if (annotatedClass.getAnnotation(UseSharpEnum.class) != null) {
             return SharpEnum.values(enumValues);
         }
+
         return super.findEnumValues(config, annotatedClass, enumValues, names);
     }
-Original file line number
+Diff line change
@@ Expand Up @@
             if (annotatedClass.getAnnotation(UseSharpEnum.class) != null) {
                 return SharpEnum.values(enumValues);
             }
             return super.findEnumValues(config, annotatedClass, enumValues, names);
         }
@@ Expand Down @@