Merge branch '2.19' into 2.x

Author: cowtowncoder

build.sbt

@@ -136,8 +136,8 @@ libraryDependencies ++= jacksonDependencies ++ Seq(
   "com.thoughtworks.paranamer" % "paranamer" % "2.8.3",
   // test dependencies
   "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % jacksonNonCoreVersion % Test,
-  "com.fasterxml.jackson.datatype" % "jackson-datatype-guava" % jacksonCoreVersion % Test,
-  "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % jacksonCoreVersion % Test,
+  "com.fasterxml.jackson.datatype" % "jackson-datatype-guava" % jacksonNonCoreVersion % Test,
+  "com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % jacksonNonCoreVersion % Test,
   "com.fasterxml.jackson.jaxrs" % "jackson-jaxrs-json-provider" % jacksonNonCoreVersion % Test,
   "com.fasterxml.jackson.module" % "jackson-module-jsonSchema" % jacksonNonCoreVersion % Test,
   "javax.ws.rs" % "javax.ws.rs-api" % "2.1.1" % Test,

src/test/scala/com/fasterxml/jackson/module/scala/deser/CaseClassDeserializerTest.scala

@@ -4,7 +4,7 @@ package deser
 
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonSetter, Nulls}
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
-import com.fasterxml.jackson.databind.{DeserializationFeature, JsonMappingException, ObjectMapper, ObjectReader, PropertyNamingStrategy}
+import com.fasterxml.jackson.databind.{DeserializationFeature, JsonMappingException, ObjectMapper, ObjectReader, PropertyNamingStrategies}
 import com.fasterxml.jackson.module.scala.ser.{ClassWithOnlyUnitField, ClassWithUnitField}
 
 import java.time.LocalDateTime
@@ -150,7 +150,7 @@ class CaseClassDeserializerTest extends DeserializerTest {
 
   def propertyNamingStrategyMapper: ObjectMapper = new ObjectMapper() {
     registerModule(module)
-    setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
+    setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
   }
 
   it should "honor the property naming strategy" in {

src/test/scala/com/fasterxml/jackson/module/scala/ser/CaseClassSerializerTest.scala

@@ -2,7 +2,7 @@ package com.fasterxml.jackson.module.scala.ser
 
 import com.fasterxml.jackson.annotation.JsonProperty.Access
 import com.fasterxml.jackson.annotation._
-import com.fasterxml.jackson.databind.{ObjectMapper, PropertyNamingStrategy}
+import com.fasterxml.jackson.databind.{ObjectMapper, PropertyNamingStrategies}
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 
 import scala.beans.BeanProperty
@@ -136,7 +136,7 @@ class CaseClassSerializerTest extends SerializerTest {
 
   def propertyNamingStrategyMapper = new ObjectMapper() {
     registerModule(module)
-    setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
+    setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
   }
 
   it should "honor the property naming strategy" in {

src/test/scala/com/fasterxml/jackson/module/scala/ser/NamingStrategyTest.scala

@@ -2,7 +2,7 @@ package com.fasterxml.jackson
 package module.scala
 package ser
 
-import com.fasterxml.jackson.databind.{ObjectMapper, PropertyNamingStrategy}
+import com.fasterxml.jackson.databind.{ObjectMapper, PropertyNamingStrategies}
 import org.scalatest.Outcome
 import org.scalatest.flatspec.FixtureAnyFlatSpec
 import org.scalatest.matchers.should.Matchers
@@ -21,7 +21,7 @@ class NamingStrategyTest extends FixtureAnyFlatSpec with Matchers {
   protected def withFixture(test: OneArgTest): Outcome = {
     val mapper = new ObjectMapper()
     mapper.registerModule(DefaultScalaModule)
-    mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
+    mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
     test(mapper)
   }