diff --git a/changes.xml b/changes.xml index 0bc2c66..b46ae0c 100644 --- 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"> + + + Increase SnakeYAML codepoint limit to 64MB (from default 3MB). + + + Switch to latest Maven APIs to handle build output timestamp. diff --git a/parent/pom.xml b/parent/pom.xml index 8202de7..9e8b660 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -57,12 +57,12 @@ io.wcm.devops.conga io.wcm.devops.conga.generator - 1.16.2 + 1.16.3-SNAPSHOT io.wcm.devops.conga conga-maven-plugin - 1.16.2 + 1.16.3-SNAPSHOT @@ -74,7 +74,7 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.ansible - 1.4.0 + 1.4.5-SNAPSHOT diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/YamlUtil.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/YamlUtil.java index 60a2ca2..dd5f6cb 100644 --- a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/YamlUtil.java +++ b/tooling/conga-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);