Skip to content

Commit 1362612

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 12546b6 + a2eb5ad commit 1362612

File tree

13 files changed

+61
-55
lines changed

13 files changed

+61
-55
lines changed

‎.github/workflows/maven-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
runs-on: ${{ matrix.os }}
1616
strategy:
1717
matrix:
18-
java: [17, 21]
18+
java: [17, 21, 25]
1919
os: [ubuntu-latest]
2020
distribution: [temurin]
2121
include:
22-
- java: 17
22+
- java: 21
2323
os: windows-latest
2424
distribution: temurin
25-
- java: 17
25+
- java: 21
2626
os: macos-latest
2727
distribution: temurin
2828

‎.github/workflows/maven-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/setup-java@v5
2929
with:
3030
distribution: temurin
31-
java-version: 17
31+
java-version: 21
3232
cache: maven
3333

3434
- name: Build, verify, deploy, generate site

‎changes.xml‎

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

27+
<release version="2.23.4" date="2025-12-05">
28+
<action type="update" dev="sseifert" issue="266">
29+
CRX Package Manager Upload: Switch default URL for system ready check to /systemready.json
30+
</action>
31+
</release>
32+
2733
<release version="2.23.2" date="2025-10-14">
2834
<action type="update" dev="sseifert" issue="238">
2935
aemDispatcherFilter Helper: Allow to set empty strings for selectors, extension, suffix.

‎conga-aem-plugin/pom.xml‎

Lines changed: 2 additions & 2 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.23.2</version>
28+
<version>2.23.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.23.2</version>
34+
<version>2.23.4</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>

‎parent/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops</groupId>
2727
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
28-
<version>2.1.0</version>
28+
<version>2.1.2</version>
2929
<relativePath />
3030
</parent>
3131

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

3737
<name>CONGA AEM Plugin</name>
@@ -48,7 +48,7 @@
4848

4949
<properties>
5050
<maven.version>3.3.9</maven.version>
51-
<oak.version>1.86.0</oak.version>
51+
<oak.version>1.88.0</oak.version>
5252
</properties>
5353

5454
<dependencyManagement>
@@ -57,12 +57,12 @@
5757
<dependency>
5858
<groupId>io.wcm.devops.conga</groupId>
5959
<artifactId>io.wcm.devops.conga.generator</artifactId>
60-
<version>1.18.0</version>
60+
<version>1.19.0</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>io.wcm.devops.conga</groupId>
6464
<artifactId>conga-maven-plugin</artifactId>
65-
<version>1.18.0</version>
65+
<version>1.19.0</version>
6666
</dependency>
6767

6868
<dependency>
@@ -113,17 +113,17 @@
113113
<dependency>
114114
<groupId>commons-cli</groupId>
115115
<artifactId>commons-cli</artifactId>
116-
<version>1.10.0</version>
116+
<version>1.11.0</version>
117117
</dependency>
118118
<dependency>
119119
<groupId>org.apache.commons</groupId>
120120
<artifactId>commons-lang3</artifactId>
121-
<version>3.19.0</version>
121+
<version>3.20.0</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>commons-io</groupId>
125125
<artifactId>commons-io</artifactId>
126-
<version>2.20.0</version>
126+
<version>2.21.0</version>
127127
</dependency>
128128

129129
<dependency>
@@ -174,7 +174,7 @@
174174
<dependency>
175175
<groupId>org.xmlunit</groupId>
176176
<artifactId>xmlunit-core</artifactId>
177-
<version>2.10.4</version>
177+
<version>2.11.0</version>
178178
</dependency>
179179
<dependency>
180180
<groupId>org.zeroturnaround</groupId>

‎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.23.2</version>
26+
<version>2.23.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.23.2</version>
32+
<version>2.23.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.23.2</version>
28+
<version>2.23.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.23.2</version>
35+
<version>2.23.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.23.2</version>
45+
<version>2.23.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 & 4 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.23.2</version>
28+
<version>2.23.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.23.2</version>
35+
<version>2.23.4</version>
3636

3737
<name>CONGA AEM Maven Plugin</name>
3838
<description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -41,7 +41,7 @@
4141
<site.url.module.prefix>tooling/conga-aem-maven-plugin</site.url.module.prefix>
4242

4343
<!-- Versions -->
44-
<maven-plugin-plugin.version>3.15.1</maven-plugin-plugin.version>
44+
<maven-plugin-plugin.version>3.15.2</maven-plugin-plugin.version>
4545

4646
<!-- Enable recording of coverage during execution of maven-invoker-plugin -->
4747
<jacoco.propertyName>invoker.mavenOpts</jacoco.propertyName>
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>io.wcm.devops.conga.plugins</groupId>
6464
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
65-
<version>2.23.2</version>
65+
<version>2.23.4</version>
6666
<scope>compile</scope>
6767
</dependency>
6868
<dependency>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.maven</groupId>
2828
<artifactId>io.wcm.maven.global-parent</artifactId>
29-
<version>71</version>
29+
<version>74</version>
3030
<relativePath/>
3131
</parent>
3232

@@ -39,7 +39,7 @@
3939
<description>Example definitions and templates.</description>
4040

4141
<properties>
42-
<acs.aem.commons.version>6.14.0</acs.aem.commons.version>
42+
<acs.aem.commons.version>6.15.4</acs.aem.commons.version>
4343
</properties>
4444

4545
<dependencies>
@@ -78,7 +78,7 @@
7878
<plugin>
7979
<groupId>io.wcm.devops.conga</groupId>
8080
<artifactId>conga-maven-plugin</artifactId>
81-
<version>1.18.0</version>
81+
<version>1.19.0</version>
8282
<extensions>true</extensions>
8383
<dependencies>
8484

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.maven</groupId>
2828
<artifactId>io.wcm.maven.global-parent</artifactId>
29-
<version>71</version>
29+
<version>74</version>
3030
<relativePath/>
3131
</parent>
3232

@@ -39,7 +39,7 @@
3939
<description>Test case with packages with "mixed" package types, and packages without package type and "all" package.</description>
4040

4141
<properties>
42-
<acs.aem.commons.version>6.14.0</acs.aem.commons.version>
42+
<acs.aem.commons.version>6.15.4</acs.aem.commons.version>
4343
</properties>
4444

4545
<dependencies>
@@ -69,7 +69,7 @@
6969
<plugin>
7070
<groupId>io.wcm.devops.conga</groupId>
7171
<artifactId>conga-maven-plugin</artifactId>
72-
<version>1.18.0</version>
72+
<version>1.19.0</version>
7373
<extensions>true</extensions>
7474
<dependencies>
7575

0 commit comments

Comments
 (0)