diff --git a/integration-tests/src/test/java/play/libs/ws/ahc/JsonRequestTest.java b/integration-tests/src/test/java/play/libs/ws/ahc/JsonRequestTest.java index 2e273dc0..19202d5e 100644 --- a/integration-tests/src/test/java/play/libs/ws/ahc/JsonRequestTest.java +++ b/integration-tests/src/test/java/play/libs/ws/ahc/JsonRequestTest.java @@ -7,7 +7,7 @@ import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.typesafe.config.ConfigFactory; import org.junit.Test; import play.libs.ws.*; diff --git a/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyReadables.java b/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyReadables.java index a677dd17..b8c7cb8a 100644 --- a/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyReadables.java +++ b/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyReadables.java @@ -4,10 +4,10 @@ package play.libs.ws; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; -import java.io.IOException; +import tools.jackson.core.JacksonException; /** * @@ -25,7 +25,7 @@ default BodyReadable json(ObjectMapper objectMapper) { // Jackson will automatically detect the correct encoding according to the rules in RFC-4627 try { return objectMapper.readTree(response.getBody()); - } catch(IOException e) { + } catch(JacksonException e) { throw new RuntimeException("Error parsing JSON from WS response wsBody", e); } }); diff --git a/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyWritables.java b/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyWritables.java index 22b3428c..ff18462f 100644 --- a/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyWritables.java +++ b/play-ws-standalone-json/src/main/java/play/libs/ws/JsonBodyWritables.java @@ -5,8 +5,8 @@ package play.libs.ws; import org.apache.pekko.util.ByteString; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; public interface JsonBodyWritables { diff --git a/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyWritables.scala b/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyWritables.scala index 05d7d300..00137dcc 100644 --- a/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyWritables.scala +++ b/play-ws-standalone-json/src/main/scala/play/api/libs/ws/JsonBodyWritables.scala @@ -5,8 +5,8 @@ package play.api.libs.ws import org.apache.pekko.util.ByteString -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.ObjectMapper +import tools.jackson.databind.JsonNode +import tools.jackson.databind.ObjectMapper import play.api.libs.json.JsValue import play.api.libs.json.Json diff --git a/play-ws-standalone-json/src/main/scala/play/libs/ws/DefaultObjectMapper.scala b/play-ws-standalone-json/src/main/scala/play/libs/ws/DefaultObjectMapper.scala index 2e01a6db..ff941781 100644 --- a/play-ws-standalone-json/src/main/scala/play/libs/ws/DefaultObjectMapper.scala +++ b/play-ws-standalone-json/src/main/scala/play/libs/ws/DefaultObjectMapper.scala @@ -4,7 +4,7 @@ package play.libs.ws -import com.fasterxml.jackson.databind.ObjectMapper +import tools.jackson.databind.ObjectMapper object DefaultObjectMapper { def instance(): ObjectMapper = play.api.libs.json.jackson.JacksonJson.get.mapper() diff --git a/project/Dependencies.scala b/project/Dependencies.scala index da3cbb9f..03e11da0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ import sbt._ object Dependencies { val scala213Version = "2.13.18" - val scala33LTSVersion = "3.3.8" + val scala33LTSVersion = "3.3.9" val scala39LTSVersion = "3.9.0" val scala3NextVersion = "3.10.0-RC3" @@ -38,7 +38,7 @@ object Dependencies { val junitInterface = Seq("com.github.sbt" % "junit-interface" % "0.13.3") - val playJson = Seq("org.playframework" %% "play-json" % "3.1.0-M10+108-69160600-SNAPSHOT") + val playJson = Seq("org.playframework" %% "play-json" % "3.1.0-M10+120-a3cbc9e1-SNAPSHOT") val slf4jApi = Seq("org.slf4j" % "slf4j-api" % "2.0.20")