Skip to content

Commit 08242ed

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents b91c975 + e8939c4 commit 08242ed

File tree

11 files changed

+51
-31
lines changed

11 files changed

+51
-31
lines changed

‎changes.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="2.19.4" date="2023-03-27">
27+
<action type="update" dev="sseifert">
28+
Update to SnakeYAML 2.0.
29+
</action>
30+
</release>
31+
2632
<release version="2.19.2" date="2023-01-12">
2733
<action type="update" dev="sseifert">
2834
Switch to Java 11 as minimum version.

‎conga-aem-plugin/pom.xml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.19.2</version>
28+
<version>2.19.4</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
34-
<version>2.19.2</version>
34+
<version>2.19.4</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -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: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
34-
<version>2.19.2</version>
34+
<version>2.19.4</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -41,18 +41,28 @@
4141
<url>https://github.com/wcm-io-devops/conga-aem-plugin/actions</url>
4242
</ciManagement>
4343

44+
<issueManagement>
45+
<system>GitHub</system>
46+
<url>https://github.com/wcm-io/conga-aem-plugin/issues/</url>
47+
</issueManagement>
48+
49+
<properties>
50+
<maven.version>3.3.9</maven.version>
51+
<oak.version>1.50.0</oak.version>
52+
</properties>
53+
4454
<dependencyManagement>
4555
<dependencies>
4656

4757
<dependency>
4858
<groupId>io.wcm.devops.conga</groupId>
4959
<artifactId>io.wcm.devops.conga.generator</artifactId>
50-
<version>1.14.8</version>
60+
<version>1.15.0</version>
5161
</dependency>
5262
<dependency>
5363
<groupId>io.wcm.devops.conga</groupId>
5464
<artifactId>conga-maven-plugin</artifactId>
55-
<version>1.14.8</version>
65+
<version>1.15.0</version>
5666
</dependency>
5767

5868
<dependency>
@@ -104,7 +114,7 @@
104114
<dependency>
105115
<groupId>org.apache.commons</groupId>
106116
<artifactId>commons-compress</artifactId>
107-
<version>1.22</version>
117+
<version>1.23.0</version>
108118
</dependency>
109119
<dependency>
110120
<groupId>commons-cli</groupId>
@@ -146,12 +156,12 @@
146156
<dependency>
147157
<groupId>org.apache.jackrabbit</groupId>
148158
<artifactId>oak-security-spi</artifactId>
149-
<version>1.46.0</version>
159+
<version>${oak.version}</version>
150160
</dependency>
151161
<dependency>
152162
<groupId>org.apache.jackrabbit</groupId>
153163
<artifactId>oak-commons</artifactId>
154-
<version>1.46.0</version>
164+
<version>${oak.version}</version>
155165
</dependency>
156166

157167
<!-- Node type validation -->

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<parent>
2424
<groupId>io.wcm.devops.conga.plugins</groupId>
2525
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
26-
<version>2.19.2</version>
26+
<version>2.19.4</version>
2727
<relativePath>parent/pom.xml</relativePath>
2828
</parent>
2929

3030
<groupId>io.wcm.devops.conga.plugins</groupId>
3131
<artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
32-
<version>2.19.2</version>
32+
<version>2.19.4</version>
3333
<packaging>pom</packaging>
3434

3535
<name>CONGA AEM Plugin</name>

‎tooling/conga-aem-crypto-cli/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.19.2</version>
28+
<version>2.19.4</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>conga-aem-crypto-cli</artifactId>
3434
<packaging>jar</packaging>
35-
<version>2.19.2</version>
35+
<version>2.19.4</version>
3636

3737
<name>CONGA AEM Crypto Command Line Interface</name>
3838
<description>Command line tool to generate Crypto keys for AEM.</description>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>io.wcm.devops.conga.plugins</groupId>
4444
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
45-
<version>2.19.2</version>
45+
<version>2.19.4</version>
4646
<scope>compile</scope>
4747
<exclusions>
4848
<!-- Exclude all deps - only crypto util classes are used -->

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,23 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.19.2</version>
28+
<version>2.19.4</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>conga-aem-maven-plugin</artifactId>
3434
<packaging>maven-plugin</packaging>
35-
<version>2.19.2</version>
35+
<version>2.19.4</version>
3636

3737
<name>CONGA AEM Maven Plugin</name>
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 -->
45-
<maven-plugin-plugin.version>3.7.0</maven-plugin-plugin.version>
44+
<maven-plugin-plugin.version>3.8.1</maven-plugin-plugin.version>
4645

4746
<!-- Enable recording of coverage during execution of maven-invoker-plugin -->
4847
<jacoco.propertyName>invoker.mavenOpts</jacoco.propertyName>
@@ -63,7 +62,7 @@
6362
<dependency>
6463
<groupId>io.wcm.devops.conga.plugins</groupId>
6564
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
66-
<version>2.19.2</version>
65+
<version>2.19.4</version>
6766
<scope>compile</scope>
6867
</dependency>
6968
<dependency>

‎tooling/conga-aem-maven-plugin/src/it/example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<plugin>
7474
<groupId>io.wcm.devops.conga</groupId>
7575
<artifactId>conga-maven-plugin</artifactId>
76-
<version>1.14.8</version>
76+
<version>1.15.0</version>
7777
<extensions>true</extensions>
7878
<dependencies>
7979

‎tooling/conga-aem-maven-plugin/src/it/mixed-no-package-type/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<plugin>
6868
<groupId>io.wcm.devops.conga</groupId>
6969
<artifactId>conga-maven-plugin</artifactId>
70-
<version>1.14.8</version>
70+
<version>1.15.0</version>
7171
<extensions>true</extensions>
7272
<dependencies>
7373

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
<plugin>
322322
<groupId>io.wcm.devops.conga</groupId>
323323
<artifactId>conga-maven-plugin</artifactId>
324-
<version>1.14.12</version>
324+
<version>1.15.0</version>
325325
<dependencies>
326326
<dependency>
327327
<groupId>io.wcm.devops.conga.plugins</groupId>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@
338338
<plugin>
339339
<groupId>io.wcm.devops.conga</groupId>
340340
<artifactId>conga-maven-plugin</artifactId>
341-
<version>1.14.12</version>
341+
<version>1.15.0</version>
342342
<dependencies>
343343
<dependency>
344344
<groupId>io.wcm.devops.conga.plugins</groupId>

0 commit comments

Comments
 (0)