From 22582a79dfdfa5f1b672ed08409c496bbc4be0e4 Mon Sep 17 00:00:00 2001 From: Alex Martel <13215031+manofthepeace@users.noreply.github.com> Date: Thu, 7 Dec 2023 15:16:40 -0500 Subject: [PATCH 1/3] Bump aws xray to 2.15.0 --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 6eedcbc1b8043..81e0ddea0794f 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -157,7 +157,7 @@ 2.13.12 1.2.3 3.11.3 - 2.14.0 + 2.15.0 2.2.0 1.0.0 1.9.21 From 7c67463ec90516d18aa1a0814b080fe95da69a47 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 24 Nov 2023 09:03:06 +0200 Subject: [PATCH 2/3] Add missing Jackson module for DevUI backend --- extensions/vertx-http/deployment/pom.xml | 4 ++++ .../quarkus/devui/deployment/jsonrpc/DevUIDatabindCodec.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/extensions/vertx-http/deployment/pom.xml b/extensions/vertx-http/deployment/pom.xml index ed3dd67a09031..14d44cbf77b92 100644 --- a/extensions/vertx-http/deployment/pom.xml +++ b/extensions/vertx-http/deployment/pom.xml @@ -60,6 +60,10 @@ com.fasterxml.jackson.core jackson-databind + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/jsonrpc/DevUIDatabindCodec.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/jsonrpc/DevUIDatabindCodec.java index 877c25a895a90..be209fded25fa 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/jsonrpc/DevUIDatabindCodec.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/devui/deployment/jsonrpc/DevUIDatabindCodec.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import io.quarkus.devui.runtime.jsonrpc.json.JsonMapper; import io.quarkus.devui.runtime.jsonrpc.json.JsonTypeAdapter; @@ -141,6 +142,7 @@ public JsonMapper create(JsonTypeAdapter> jsonObjectAdapt module.addSerializer(ByteArrayInputStream.class, new ByteArrayInputStreamSerializer()); module.addDeserializer(ByteArrayInputStream.class, new ByteArrayInputStreamDeserializer()); mapper.registerModule(module); + mapper.registerModule(new Jdk8Module()); SimpleModule runtimeModule = new SimpleModule("vertx-module-runtime"); addAdapterToObject(runtimeModule, jsonObjectAdapter); From 9249e1cd8ad7980386bc7c27df6cb7a5b9e3aac0 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 24 Nov 2023 08:54:26 +0200 Subject: [PATCH 3/3] Bump to Jackson 2.16 --- bom/application/pom.xml | 2 +- .../deployment/ZonedDateTimeObjectMapperCustomizer.java | 9 +++++++-- independent-projects/extension-maven-plugin/pom.xml | 2 +- independent-projects/resteasy-reactive/pom.xml | 2 +- independent-projects/tools/pom.xml | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 81e0ddea0794f..a9f44b0e2c4b7 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -91,7 +91,7 @@ 2.1.0 23.0.1 1.7.0 - 2.15.3 + 2.16.0 1.0.0.Final 3.14.0 1.16.0 diff --git a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ZonedDateTimeObjectMapperCustomizer.java b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ZonedDateTimeObjectMapperCustomizer.java index 950ecc5c60c96..a9ffa8bb49077 100644 --- a/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ZonedDateTimeObjectMapperCustomizer.java +++ b/extensions/resteasy-classic/rest-client-jackson/deployment/src/test/java/io/quarkus/restclient/jackson/deployment/ZonedDateTimeObjectMapperCustomizer.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.datatype.jsr310.ser.ZonedDateTimeSerializer; import io.quarkus.jackson.ObjectMapperCustomizer; @@ -21,9 +21,14 @@ @Singleton public class ZonedDateTimeObjectMapperCustomizer implements ObjectMapperCustomizer { + @Override + public int priority() { + return MINIMUM_PRIORITY; + } + @Override public void customize(ObjectMapper objectMapper) { - JavaTimeModule customDateModule = new JavaTimeModule(); + SimpleModule customDateModule = new SimpleModule(); customDateModule.addSerializer(ZonedDateTime.class, new ZonedDateTimeSerializer( new DateTimeFormatterBuilder().appendInstant(0).toFormatter().withZone(ZoneId.of("Z")))); customDateModule.addDeserializer(ZonedDateTime.class, new ZonedDateTimeEuropeLondonDeserializer()); diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml index 0d739ecfd75d2..46d34da8e3412 100644 --- a/independent-projects/extension-maven-plugin/pom.xml +++ b/independent-projects/extension-maven-plugin/pom.xml @@ -42,7 +42,7 @@ 3.2.1 3.1.2 3.10.2 - 2.15.3 + 2.16.0 1.3.2 5.10.1 diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index a2a9f7135c243..f5cce96962437 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -63,7 +63,7 @@ 4.4.6 5.3.2 1.0.0.Final - 2.15.3 + 2.16.0 2.4.0 3.0.2 3.0.3 diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index 6822bab5a2e96..20e306446b8b7 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -49,7 +49,7 @@ 3.24.2 - 2.15.3 + 2.16.0 4.0.1 5.10.1 1.25.0