Merge pull request #94 from ml054/v5.4

bumped versions in pom.xml
ravendb · Mar 11, 2024 · 7d14623 · 7d14623
2 parents 61886b7 + 5401797
commit 7d14623
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 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.0</version>
+                <version>5.10.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -58,12 +58,12 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.1.2-jre</version>
+            <version>33.0.0-jre</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.14.0</version>
+            <version>2.15.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -73,12 +73,12 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.13.0</version>
+            <version>3.14.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
@@ -98,12 +98,12 @@
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-client</artifactId>
-            <version>9.4.52.v20230823</version>
+            <version>9.4.54.v20240208</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.15.2</version>
+            <version>2.16.2</version>
         </dependency>
 
 
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.24.2</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
@@ -1,6 +1,8 @@
 package net.ravendb.client.primitives;
 
 import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.cfg.MapperConfig;
+import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 
 /**
@@ -10,13 +12,13 @@
  */
 public class SharpAwareJacksonAnnotationIntrospector extends JacksonAnnotationIntrospector {
 
-
     @Override
-    public String[] findEnumValues(Class<?> enumType, Enum<?>[] enumValues, String[] names) {
-        if (enumType.getAnnotation(UseSharpEnum.class) != null) {
+    public String[] findEnumValues(MapperConfig<?> config, AnnotatedClass annotatedClass, Enum<?>[] enumValues, String[] names) {
+        if (annotatedClass.getAnnotation(UseSharpEnum.class) != null) {
             return SharpEnum.values(enumValues);
         }
-        return super.findEnumValues(enumType, enumValues, names);
+
+        return super.findEnumValues(config, annotatedClass, enumValues, names);
     }
 
     @Override