This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f9530558990 Upgrade Jackson to 2.15.0 (#10039)
f9530558990 is described below
commit f95305589904513b10b2cba5578451c0bedd422c
Author: Aurélien Pupier <apup...@redhat.com>
AuthorDate: Mon May 22 13:54:15 2023 +0200
Upgrade Jackson to 2.15.0 (#10039)
it aligns with Camel Kamelets catalog
https://github.com/apache/camel-kamelets/pull/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 <apup...@redhat.com>
---
camel-dependencies/pom.xml | 4 ++--
.../org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java | 3 ++-
parent/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index e88cced663f..e8617696692 100644
--- 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/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
index d7717433872..0760a59eb6b 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CodeRestGenerator.java
@@ -36,6 +36,7 @@ import org.apache.logging.log4j.core.config.Configurator;
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 @@ public class CodeRestGenerator extends CamelCommand {
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
index 1b06c279e7a..35cd4e19fc9 100644
--- 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>
