Skip to content

Commit f49974f

Browse files
Update to SnakeYAML 2.0. (#42)
1 parent 0dc18cc commit f49974f

5 files changed

Lines changed: 23 additions & 12 deletions

File tree

changes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<action type="update" dev="sseifert">
2828
Switch to Java 11 as minimum version.
2929
</action>
30+
<action type="update" dev="sseifert">
31+
Update to SnakeYAML 2.0.
32+
</action>
3033
<action type="fix" dev="sseifert">
3134
conga-aem-maven-plugin: Avoid duplicating version when adding release version suffix with packageVersionMode=RELEASE_SUFFIX_VERSION mode.
3235
</action>

conga-aem-plugin/pom.xml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,6 @@
7878
<artifactId>filevault-package-maven-plugin</artifactId>
7979
<scope>compile</scope>
8080
<exclusions>
81-
<exclusion>
82-
<groupId>org.apache.maven</groupId>
83-
<artifactId>*</artifactId>
84-
</exclusion>
85-
<exclusion>
86-
<groupId>org.apache.maven.plugin-tools</groupId>
87-
<artifactId>*</artifactId>
88-
</exclusion>
8981
<exclusion>
9082
<groupId>org.sonatype.plexus</groupId>
9183
<artifactId>*</artifactId>
@@ -162,6 +154,18 @@
162154
<artifactId>oak-commons</artifactId>
163155
<scope>compile</scope>
164156
</dependency>
157+
<dependency>
158+
<groupId>org.apache.maven</groupId>
159+
<artifactId>maven-core</artifactId>
160+
<version>${maven.version}</version>
161+
<scope>compile</scope>
162+
</dependency>
163+
<dependency>
164+
<groupId>org.apache.maven</groupId>
165+
<artifactId>maven-plugin-api</artifactId>
166+
<version>${maven.version}</version>
167+
<scope>compile</scope>
168+
</dependency>
165169

166170
<dependency>
167171
<groupId>org.slf4j</groupId>

parent/pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,22 @@
4646
<url>https://github.com/wcm-io/conga-aem-plugin/issues/</url>
4747
</issueManagement>
4848

49+
<properties>
50+
<maven.version>3.3.9</maven.version>
51+
</properties>
52+
4953
<dependencyManagement>
5054
<dependencies>
5155

5256
<dependency>
5357
<groupId>io.wcm.devops.conga</groupId>
5458
<artifactId>io.wcm.devops.conga.generator</artifactId>
55-
<version>1.14.8</version>
59+
<version>1.15.0-SNAPSHOT</version>
5660
</dependency>
5761
<dependency>
5862
<groupId>io.wcm.devops.conga</groupId>
5963
<artifactId>conga-maven-plugin</artifactId>
60-
<version>1.14.8</version>
64+
<version>1.15.0-SNAPSHOT</version>
6165
</dependency>
6266

6367
<dependency>

tooling/conga-aem-maven-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
3939

4040
<properties>
41-
<maven.version>3.3.9</maven.version>
4241
<site.url.module.prefix>tooling/conga-aem-maven-plugin</site.url.module.prefix>
4342

4443
<!-- Versions -->

tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/model/YamlUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
24+
import org.yaml.snakeyaml.LoaderOptions;
2425
import org.yaml.snakeyaml.Yaml;
2526
import org.yaml.snakeyaml.constructor.Constructor;
2627

@@ -46,7 +47,7 @@ public static Yaml createYaml() {
4647
.logger(log);
4748

4849
// apply YAML plugins for modifying YAML constructor
49-
Constructor constructor = new Constructor();
50+
Constructor constructor = new Constructor(new LoaderOptions());
5051
YamlConstructorContext context = new YamlConstructorContext()
5152
.pluginContextOptions(options)
5253
.yamlConstructor(constructor);

0 commit comments

Comments
 (0)