diff --git a/changes.xml b/changes.xml
index 3f8ea305..2d13f663 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">
+
+
+ Update to SnakeYAML 2.0.
+
+
+
Switch to Java 11 as minimum version.
diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml
index 98a334d6..57490846 100644
--- a/conga-aem-plugin/pom.xml
+++ b/conga-aem-plugin/pom.xml
@@ -25,13 +25,13 @@
io.wcm.devops.conga.plugins
io.wcm.devops.conga.plugins.aem.parent
- 2.19.2
+ 2.19.4
../parent/pom.xml
io.wcm.devops.conga.plugins
io.wcm.devops.conga.plugins.aem
- 2.19.2
+ 2.19.4
jar
CONGA AEM Plugin
@@ -78,14 +78,6 @@
filevault-package-maven-plugin
compile
-
- org.apache.maven
- *
-
-
- org.apache.maven.plugin-tools
- *
-
org.sonatype.plexus
*
@@ -162,6 +154,18 @@
oak-commons
compile
+
+ org.apache.maven
+ maven-core
+ ${maven.version}
+ compile
+
+
+ org.apache.maven
+ maven-plugin-api
+ ${maven.version}
+ compile
+
org.slf4j
diff --git a/parent/pom.xml b/parent/pom.xml
index 8094fd5b..3fa7f742 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -31,7 +31,7 @@
io.wcm.devops.conga.plugins
io.wcm.devops.conga.plugins.aem.parent
- 2.19.2
+ 2.19.4
pom
CONGA AEM Plugin
@@ -41,18 +41,28 @@
https://github.com/wcm-io-devops/conga-aem-plugin/actions
+
+ GitHub
+ https://github.com/wcm-io/conga-aem-plugin/issues/
+
+
+
+ 3.3.9
+ 1.50.0
+
+
io.wcm.devops.conga
io.wcm.devops.conga.generator
- 1.14.8
+ 1.15.0
io.wcm.devops.conga
conga-maven-plugin
- 1.14.8
+ 1.15.0
@@ -104,7 +114,7 @@
org.apache.commons
commons-compress
- 1.22
+ 1.23.0
commons-cli
@@ -146,12 +156,12 @@
org.apache.jackrabbit
oak-security-spi
- 1.46.0
+ ${oak.version}
org.apache.jackrabbit
oak-commons
- 1.46.0
+ ${oak.version}
diff --git a/pom.xml b/pom.xml
index 7610404a..1ecf6657 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,13 +23,13 @@
io.wcm.devops.conga.plugins
io.wcm.devops.conga.plugins.aem.parent
- 2.19.2
+ 2.19.4
parent/pom.xml
io.wcm.devops.conga.plugins
io.wcm.devops.conga.plugins.aem.root
- 2.19.2
+ 2.19.4
pom
CONGA AEM Plugin
diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml
index 983543ed..7ce67ac3 100644
--- a/tooling/conga-aem-crypto-cli/pom.xml
+++ b/tooling/conga-aem-crypto-cli/pom.xml
@@ -25,14 +25,14 @@
io.wcm.devops.conga.plugins
io.wcm.devops.conga.plugins.aem.parent
- 2.19.2
+ 2.19.4
../../parent/pom.xml
io.wcm.devops.conga.plugins
conga-aem-crypto-cli
jar
- 2.19.2
+ 2.19.4
CONGA AEM Crypto Command Line Interface
Command line tool to generate Crypto keys for AEM.
@@ -42,7 +42,7 @@
io.wcm.devops.conga.plugins
io.wcm.devops.conga.plugins.aem
- 2.19.2
+ 2.19.4
compile
diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml
index c8c4854c..5e360d81 100644
--- a/tooling/conga-aem-maven-plugin/pom.xml
+++ b/tooling/conga-aem-maven-plugin/pom.xml
@@ -25,24 +25,23 @@
io.wcm.devops.conga.plugins
io.wcm.devops.conga.plugins.aem.parent
- 2.19.2
+ 2.19.4
../../parent/pom.xml
io.wcm.devops.conga.plugins
conga-aem-maven-plugin
maven-plugin
- 2.19.2
+ 2.19.4
CONGA AEM Maven Plugin
wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM
- 3.3.9
tooling/conga-aem-maven-plugin
- 3.7.0
+ 3.8.1
invoker.mavenOpts
@@ -63,7 +62,7 @@
io.wcm.devops.conga.plugins
io.wcm.devops.conga.plugins.aem
- 2.19.2
+ 2.19.4
compile
diff --git a/tooling/conga-aem-maven-plugin/src/it/example/pom.xml b/tooling/conga-aem-maven-plugin/src/it/example/pom.xml
index 3eb000b4..3a6b0a42 100644
--- a/tooling/conga-aem-maven-plugin/src/it/example/pom.xml
+++ b/tooling/conga-aem-maven-plugin/src/it/example/pom.xml
@@ -73,7 +73,7 @@
io.wcm.devops.conga
conga-maven-plugin
- 1.14.8
+ 1.15.0
true
diff --git a/tooling/conga-aem-maven-plugin/src/it/mixed-no-package-type/pom.xml b/tooling/conga-aem-maven-plugin/src/it/mixed-no-package-type/pom.xml
index 913f93e7..736d444e 100644
--- a/tooling/conga-aem-maven-plugin/src/it/mixed-no-package-type/pom.xml
+++ b/tooling/conga-aem-maven-plugin/src/it/mixed-no-package-type/pom.xml
@@ -67,7 +67,7 @@
io.wcm.devops.conga
conga-maven-plugin
- 1.14.8
+ 1.15.0
true
diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml
index 1cb03c6f..643d4cab 100644
--- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml
+++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml
@@ -321,7 +321,7 @@
io.wcm.devops.conga
conga-maven-plugin
- 1.14.12
+ 1.15.0
io.wcm.devops.conga.plugins
diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml
index 40f3d10f..e1790c19 100644
--- a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml
+++ b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml
@@ -338,7 +338,7 @@
io.wcm.devops.conga
conga-maven-plugin
- 1.14.12
+ 1.15.0
io.wcm.devops.conga.plugins
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 6dc24fb6..60a2ca26 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,6 +21,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.LoaderOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@@ -46,7 +47,7 @@ public static Yaml createYaml() {
.logger(log);
// apply YAML plugins for modifying YAML constructor
- Constructor constructor = new Constructor();
+ Constructor constructor = new Constructor(new LoaderOptions());
YamlConstructorContext context = new YamlConstructorContext()
.pluginContextOptions(options)
.yamlConstructor(constructor);