Upgrade Jackson to 2.15.0 (#10039)

it aligns with Camel Kamelets catalog apache/camel-kamelets#1465 Note: there is an API break in transitive dependency with Snake Yaml which required one code change in Camel JBang. Signed-off-by: Aurélien Pupier <apupier@redhat.com>
apache · May 22, 2023 · f953055 · f953055
1 parent daf8384
commit f953055
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
@@ -238,8 +238,8 @@
         <ivy-version>2.5.1</ivy-version>
         <jackson-jq-version>1.0.0-preview.20230409</jackson-jq-version>
         <jackson-version>1.9.12</jackson-version>
-        <jackson2-version>2.14.3</jackson2-version>
-        <jackson2-module-scala-version>2.14.0</jackson2-module-scala-version>
+        <jackson2-version>2.15.1</jackson2-version>
+        <jackson2-module-scala-version>2.15.1</jackson2-module-scala-version>
         <jackrabbit-version>2.21.16</jackrabbit-version>
         <jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
         <jandex-version>3.1.1</jandex-version>

diff --git a/...-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java b/...-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
@@ -36,6 +36,7 @@
 import org.openapitools.codegen.ClientOptInput;
 import org.openapitools.codegen.DefaultGenerator;
 import org.openapitools.codegen.config.CodegenConfigurator;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 import picocli.CommandLine;
@@ -99,7 +100,7 @@ private JsonNode readNodeFromJson() throws Exception {
 
     private JsonNode readNodeFromYaml() throws FileNotFoundException {
         final ObjectMapper mapper = new ObjectMapper();
-        Yaml loader = new Yaml(new SafeConstructor());
+        Yaml loader = new Yaml(new SafeConstructor(new LoaderOptions()));
         Map map = loader.load(new FileInputStream(Paths.get(input).toFile()));
         return mapper.convertValue(map, JsonNode.class);
     }

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -233,8 +233,8 @@
         <ivy-version>2.5.1</ivy-version>
         <jackson-jq-version>1.0.0-preview.20230409</jackson-jq-version>
         <jackson-version>1.9.12</jackson-version>
-        <jackson2-version>2.14.3</jackson2-version>
-        <jackson2-module-scala-version>2.14.0</jackson2-module-scala-version>
+        <jackson2-version>2.15.1</jackson2-version>
+        <jackson2-module-scala-version>2.15.1</jackson2-module-scala-version>
         <jackrabbit-version>2.21.16</jackrabbit-version>
         <jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
         <jandex-version>3.1.1</jandex-version>