Merge branch 'develop'

wcm-io-devops · Mar 27, 2023 · 08242ed · 08242ed
2 parents b91c975 + e8939c4
commit 08242ed
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 31 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.4" date="2023-03-27">
+      <action type="update" dev="sseifert">
+        Update to SnakeYAML 2.0.
+      </action>
+    </release>
+
     <release version="2.19.2" date="2023-01-12">
       <action type="update" dev="sseifert">
         Switch to Java 11 as minimum version.

diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.19.2</version>
+    <version>2.19.4</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-  <version>2.19.2</version>
+  <version>2.19.4</version>
   <packaging>jar</packaging>
 
   <name>CONGA AEM Plugin</name>
@@ -78,14 +78,6 @@
       <artifactId>filevault-package-maven-plugin</artifactId>
       <scope>compile</scope>
       <exclusions>
-        <exclusion>
-          <groupId>org.apache.maven</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.maven.plugin-tools</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>org.sonatype.plexus</groupId>
           <artifactId>*</artifactId>
@@ -162,6 +154,18 @@
       <artifactId>oak-commons</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>${maven.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>${maven.version}</version>
+      <scope>compile</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-  <version>2.19.2</version>
+  <version>2.19.4</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Plugin</name>
@@ -41,18 +41,28 @@
     <url>https://github.com/wcm-io-devops/conga-aem-plugin/actions</url>
   </ciManagement>
 
+  <issueManagement>
+    <system>GitHub</system>
+    <url>https://github.com/wcm-io/conga-aem-plugin/issues/</url>
+  </issueManagement>
+
+  <properties>
+    <maven.version>3.3.9</maven.version>
+    <oak.version>1.50.0</oak.version>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
 
       <dependency>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>io.wcm.devops.conga.generator</artifactId>
-        <version>1.14.8</version>
+        <version>1.15.0</version>
       </dependency>
       <dependency>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.14.8</version>
+        <version>1.15.0</version>
       </dependency>
 
       <dependency>
@@ -104,7 +114,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.22</version>
+        <version>1.23.0</version>
       </dependency>
         <dependency>
         <groupId>commons-cli</groupId>
@@ -146,12 +156,12 @@
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>oak-security-spi</artifactId>
-        <version>1.46.0</version>
+        <version>${oak.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>oak-commons</artifactId>
-        <version>1.46.0</version>
+        <version>${oak.version}</version>
       </dependency>
 
       <!-- Node type validation -->

diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.19.2</version>
+    <version>2.19.4</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
-  <version>2.19.2</version>
+  <version>2.19.4</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Plugin</name>

diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.19.2</version>
+    <version>2.19.4</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-crypto-cli</artifactId>
   <packaging>jar</packaging>
-  <version>2.19.2</version>
+  <version>2.19.4</version>
 
   <name>CONGA AEM Crypto Command Line Interface</name>
   <description>Command line tool to generate Crypto keys for AEM.</description>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-      <version>2.19.2</version>
+      <version>2.19.4</version>
       <scope>compile</scope>
       <exclusions>
         <!-- Exclude all deps - only crypto util classes are used -->

diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml
@@ -25,24 +25,23 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.19.2</version>
+    <version>2.19.4</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>2.19.2</version>
+  <version>2.19.4</version>
 
   <name>CONGA AEM Maven Plugin</name>
   <description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
 
   <properties>
-    <maven.version>3.3.9</maven.version>
     <site.url.module.prefix>tooling/conga-aem-maven-plugin</site.url.module.prefix>
 
     <!-- Versions -->
-    <maven-plugin-plugin.version>3.7.0</maven-plugin-plugin.version>
+    <maven-plugin-plugin.version>3.8.1</maven-plugin-plugin.version>
 
     <!-- Enable recording of coverage during execution of maven-invoker-plugin -->
     <jacoco.propertyName>invoker.mavenOpts</jacoco.propertyName>
@@ -63,7 +62,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-      <version>2.19.2</version>
+      <version>2.19.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git 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 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.14.8</version>
+        <version>1.15.0</version>
         <extensions>true</extensions>
         <dependencies>
 

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
@@ -67,7 +67,7 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.14.8</version>
+        <version>1.15.0</version>
         <extensions>true</extensions>
         <dependencies>
 

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
@@ -321,7 +321,7 @@
         <plugin>
           <groupId>io.wcm.devops.conga</groupId>
           <artifactId>conga-maven-plugin</artifactId>
-          <version>1.14.12</version>
+          <version>1.15.0</version>
           <dependencies>
             <dependency>
               <groupId>io.wcm.devops.conga.plugins</groupId>

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
@@ -338,7 +338,7 @@
         <plugin>
           <groupId>io.wcm.devops.conga</groupId>
           <artifactId>conga-maven-plugin</artifactId>
-          <version>1.14.12</version>
+          <version>1.15.0</version>
           <dependencies>
             <dependency>
               <groupId>io.wcm.devops.conga.plugins</groupId>

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,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);