Increase SnakeYAML codepoint limit to 64MB (from default 3MB) (#73)

Co-authored-by: Stefan Seifert <[email protected]>
wcm-io-devops · Oct 18, 2023 · 7d65e40 · 7d65e40
1 parent 21d03bc
commit 7d65e40
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="2.19.8" date="not released">
+      <action type="fix" dev="trichter" issue="73">
+        Increase SnakeYAML codepoint limit to 64MB (from default 3MB).
+      </action>
+    </release>
+
     <release version="2.19.6" date="2023-08-31">
       <action type="update" dev="sseifert">
         Switch to latest Maven APIs to handle build output timestamp.

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -57,12 +57,12 @@
       <dependency>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>io.wcm.devops.conga.generator</artifactId>
-        <version>1.16.2</version>
+        <version>1.16.3-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.16.2</version>
+        <version>1.16.3-SNAPSHOT</version>
       </dependency>
 
       <dependency>
@@ -74,7 +74,7 @@
       <dependency>
         <groupId>io.wcm.devops.conga.plugins</groupId>
         <artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.5-SNAPSHOT</version>
       </dependency>
 
       <dependency>

diff --git a/...-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/YamlUtil.java b/...-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/YamlUtil.java
@@ -21,7 +21,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
@@ -47,7 +46,7 @@ public static Yaml createYaml() {
         .logger(log);
 
     // apply YAML plugins for modifying YAML constructor
-    Constructor constructor = new Constructor(new LoaderOptions());
+    Constructor constructor = new Constructor(io.wcm.devops.conga.model.util.YamlUtil.createLoaderOptions());
     YamlConstructorContext context = new YamlConstructorContext()
         .pluginContextOptions(options)
         .yamlConstructor(constructor);