From f12722b70f0e446292480cc1eba1754afcd04666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Till-Andr=C3=A9=20Diegeler?= Date: Fri, 13 Dec 2024 14:10:19 +0100 Subject: [PATCH] Update Jackson to 2.18.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A minor change in a test class was necessary; cf. https://github.com/FasterXML/jackson-databind/issues/4499 Co-authored-by: Till-André Diegeler --- gradle/dependencies.gradle | 2 +- scm-webapp/build.gradle | 2 +- .../src/test/java/sonia/scm/search/LuceneQueryBuilderTest.java | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index d52900be22..f6f1f46114 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -3,7 +3,7 @@ ext { guiceVersion = '7.0.0' resteasyVersion = '6.2.5.Final' - jacksonVersion = '2.15.2' + jacksonVersion = '2.18.2' legmanVersion = '2.0.3' diff --git a/scm-webapp/build.gradle b/scm-webapp/build.gradle index e3527aa1fd..8509fdbc6a 100644 --- a/scm-webapp/build.gradle +++ b/scm-webapp/build.gradle @@ -34,7 +34,7 @@ configurations { dependencies.add(project.getDependencies().create("jakarta.ws.rs:jakarta.ws.rs-api:3.1.0")) dependencies.add(project.getDependencies().create("jakarta.servlet:jakarta.servlet-api:6.0.0")) dependencies.add(project.getDependencies().create("io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.19")) - dependencies.add(project.getDependencies().create("com.fasterxml.jackson.core:jackson-core:2.15.2")) + dependencies.add(project.getDependencies().create("com.fasterxml.jackson.core:jackson-core:2.18.2")) } }) } diff --git a/scm-webapp/src/test/java/sonia/scm/search/LuceneQueryBuilderTest.java b/scm-webapp/src/test/java/sonia/scm/search/LuceneQueryBuilderTest.java index 36e7cd27a8..af0f23a224 100644 --- a/scm-webapp/src/test/java/sonia/scm/search/LuceneQueryBuilderTest.java +++ b/scm-webapp/src/test/java/sonia/scm/search/LuceneQueryBuilderTest.java @@ -19,6 +19,7 @@ package sonia.scm.search; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import lombok.Getter; import org.apache.lucene.analysis.standard.StandardAnalyzer; @@ -468,6 +469,7 @@ class LuceneQueryBuilderTest { QueryResult result = query(InetOrgPerson.class, "Arthur"); ObjectMapper mapper = new ObjectMapper(); + mapper.registerModule(new Jdk8Module()); JsonNode root = mapper.valueToTree(result); assertThat(root.get("totalHits").asInt()).isOne(); @@ -496,6 +498,7 @@ class LuceneQueryBuilderTest { ObjectMapper mapper = new ObjectMapper(); mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); mapper.registerModule(new JavaTimeModule()); + mapper.registerModule(new Jdk8Module()); JsonNode root = mapper.valueToTree(result); JsonNode fields = root.get("hits").get(0).get("fields");