You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/11/10 08:01:28 UTC
(camel) branch main updated: Upgrade SnakeYAML to 2.1 (#11962)
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 3fba9104042 Upgrade SnakeYAML to 2.1 (#11962)
3fba9104042 is described below
commit 3fba910404286741339129af9d962fc82e3f3360
Author: Zheng Feng <zh...@gmail.com>
AuthorDate: Fri Nov 10 16:01:22 2023 +0800
Upgrade SnakeYAML to 2.1 (#11962)
---
.../apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java | 9 ++++++++-
parent/pom.xml | 2 +-
.../camel/maven/generator/openapi/AbstractGenerateMojo.java | 9 ++++++++-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java
index 7a0b9d56a36..e817d6a3fc3 100644
--- a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java
+++ b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/SnakeYAMLDataFormat.java
@@ -47,7 +47,7 @@ import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.BaseConstructor;
import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.constructor.SafeConstructor;
-import org.yaml.snakeyaml.inspector.TrustedTagInspector;
+import org.yaml.snakeyaml.inspector.TagInspector;
import org.yaml.snakeyaml.nodes.Tag;
import org.yaml.snakeyaml.representer.Representer;
import org.yaml.snakeyaml.resolver.Resolver;
@@ -472,4 +472,11 @@ public final class SnakeYAMLDataFormat extends ServiceSupport implements DataFor
}
};
}
+
+ final class TrustedTagInspector implements TagInspector {
+ @Override
+ public boolean isGlobalTagAllowed(Tag tag) {
+ return true;
+ }
+ }
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 38422c76b1d..490bb273398 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -417,7 +417,7 @@
<smallrye-health-version>4.0.2</smallrye-health-version>
<smallrye-fault-tolerance-version>6.2.6</smallrye-fault-tolerance-version>
<smbj-version>0.12.2</smbj-version>
- <snakeyaml-version>2.0</snakeyaml-version>
+ <snakeyaml-version>2.1</snakeyaml-version>
<snakeyaml-engine-version>2.7</snakeyaml-engine-version>
<snmp4j-version>3.7.7</snmp4j-version>
<splunk-version>1.9.5_1</splunk-version>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
index d45363e069f..656e1d84bce 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
@@ -60,7 +60,8 @@ import org.twdata.maven.mojoexecutor.MojoExecutor;
import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
-import org.yaml.snakeyaml.inspector.TrustedTagInspector;
+import org.yaml.snakeyaml.inspector.TagInspector;
+import org.yaml.snakeyaml.nodes.Tag;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
@@ -415,4 +416,10 @@ abstract class AbstractGenerateMojo extends AbstractMojo {
return auths;
}
+ final class TrustedTagInspector implements TagInspector {
+ @Override
+ public boolean isGlobalTagAllowed(Tag tag) {
+ return true;
+ }
+ }
}