Merge branch 'main' into fix/pulsar-doc-retry

quarkusio · May 13, 2024 · 8d04d73 · 8d04d73
2 parents b416228 + 436050a
commit 8d04d73
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 20 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -92,7 +92,7 @@
         <!-- GraalVM sdk 23.1.2 has a minimum JDK requirement of 17+ at runtime -->
         <graal-sdk.version>23.1.2</graal-sdk.version>
         <gizmo.version>1.8.0</gizmo.version>
-        <jackson-bom.version>2.17.0</jackson-bom.version>
+        <jackson-bom.version>2.17.1</jackson-bom.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <commons-lang3.version>3.14.0</commons-lang3.version>
         <commons-codec.version>1.17.0</commons-codec.version>

diff --git a/...ackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDefaultPoolTest.java b/...ackson/deployment/src/test/java/io/quarkus/jackson/deployment/JacksonDefaultPoolTest.java
diff --git a/...ntime/src/main/java/io/quarkus/jackson/runtime/VertxHybridPoolObjectMapperCustomizer.java b/...ntime/src/main/java/io/quarkus/jackson/runtime/VertxHybridPoolObjectMapperCustomizer.java
@@ -11,8 +11,9 @@ public class VertxHybridPoolObjectMapperCustomizer implements ObjectMapperCustom
     @Override
     public void customize(ObjectMapper objectMapper) {
         var existingMapperPool = objectMapper.getFactory()._getRecyclerPool();
-        // JsonRecyclerPools.defaultPool() by default should create a LockFreePool
-        if (existingMapperPool instanceof JsonRecyclerPools.LockFreePool) {
+        // if the recycler pool in use is the default jackson one it means that user hasn't
+        // explicitly chosen any, so we can replace it with the vert.x virtual thread friendly one
+        if (existingMapperPool.getClass() == JsonRecyclerPools.defaultPool().getClass()) {
             objectMapper.getFactory().setRecyclerPool(HybridJacksonPool.getInstance());
         }
     }

diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml
@@ -41,7 +41,7 @@
         <version.compiler.plugin>3.12.1</version.compiler.plugin>
         <version.enforcer.plugin>3.2.1</version.enforcer.plugin>
         <version.surefire.plugin>3.2.5</version.surefire.plugin>
-        <jackson-bom.version>2.17.0</jackson-bom.version>
+        <jackson-bom.version>2.17.1</jackson-bom.version>
         <smallrye-beanbag.version>1.4.1</smallrye-beanbag.version>
         <junit.jupiter.version>5.10.2</junit.jupiter.version>
     </properties>

diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
@@ -64,7 +64,7 @@
         <vertx.version>4.5.7</vertx.version>
         <rest-assured.version>5.4.0</rest-assured.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
-        <jackson-bom.version>2.17.0</jackson-bom.version>
+        <jackson-bom.version>2.17.1</jackson-bom.version>
         <smallrye-stork.version>2.6.0</smallrye-stork.version>
         <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
         <yasson.version>3.0.3</yasson.version>

diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
@@ -49,7 +49,7 @@
 
         <!-- Versions -->
         <assertj.version>3.25.3</assertj.version>
-        <jackson-bom.version>2.17.0</jackson-bom.version>
+        <jackson-bom.version>2.17.1</jackson-bom.version>
         <jakarta.enterprise.cdi-api.version>4.1.0</jakarta.enterprise.cdi-api.version>
         <junit.version>5.10.2</junit.version>
         <commons-compress.version>1.26.1</commons-compress.version>