Skip to content

Commit 3551a69

Browse files
stefanseifertstefanseifert
committed
Switch to Java 17
1 parent dc0d71e commit 3551a69

13 files changed

Lines changed: 35 additions & 29 deletions

File tree

‎.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: [11, 17, 21]
18+
java: [17, 21]
1919
os: [ubuntu-latest]
2020
distribution: [temurin]
2121
include:
22-
- java: 11
22+
- java: 17
2323
os: windows-latest
2424
distribution: temurin
25-
- java: 11
25+
- java: 17
2626
os: macos-latest
2727
distribution: temurin
2828

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121

2222
- name: Configure GIT
2323
run: |
2424
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
2525
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
2626
2727
- name: Setup JDK
28-
uses: actions/setup-java@v4
28+
uses: actions/setup-java@v5
2929
with:
3030
distribution: temurin
31-
java-version: 11
31+
java-version: 17
3232
cache: maven
3333

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

‎.github/workflows/release-from-tag.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
permissions:
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
- uses: ncipollo/release-action@v1
1717
with:
1818
body: 'Changes: https://devops.wcm.io/conga/plugins/aem/changes.html'

‎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.0" date="not released">
28+
<action type="update" dev="sseifert">
29+
Switch to Java 17.
30+
</action>
31+
</release>
32+
2733
<release version="2.22.0" date="2025-09-19">
2834
<action type="add" dev="sseifert" issue="208">
2935
CRX Package Manager Upload: Add system ready check after deployment (enabled by default, can be disabled).

‎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.22.1-SNAPSHOT</version>
28+
<version>2.23.0-SNAPSHOT</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.22.1-SNAPSHOT</version>
34+
<version>2.23.0-SNAPSHOT</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>

‎parent/pom.xml‎

Lines changed: 6 additions & 6 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.0.4</version>
28+
<version>2.1.0-SNAPSHOT</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.22.1-SNAPSHOT</version>
34+
<version>2.23.0-SNAPSHOT</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -57,24 +57,24 @@
5757
<dependency>
5858
<groupId>io.wcm.devops.conga</groupId>
5959
<artifactId>io.wcm.devops.conga.generator</artifactId>
60-
<version>1.17.6</version>
60+
<version>1.18.0-SNAPSHOT</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>io.wcm.devops.conga</groupId>
6464
<artifactId>conga-maven-plugin</artifactId>
65-
<version>1.17.6</version>
65+
<version>1.18.0-SNAPSHOT</version>
6666
</dependency>
6767

6868
<dependency>
6969
<groupId>io.wcm.devops.conga.plugins</groupId>
7070
<artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
71-
<version>1.4.4</version>
71+
<version>1.5.0-SNAPSHOT</version>
7272
</dependency>
7373

7474
<dependency>
7575
<groupId>io.wcm.devops.conga.plugins</groupId>
7676
<artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
77-
<version>1.4.10</version>
77+
<version>1.5.0-SNAPSHOT</version>
7878
</dependency>
7979

8080
<dependency>

‎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.22.1-SNAPSHOT</version>
26+
<version>2.23.0-SNAPSHOT</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.22.1-SNAPSHOT</version>
32+
<version>2.23.0-SNAPSHOT</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.22.1-SNAPSHOT</version>
28+
<version>2.23.0-SNAPSHOT</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.22.1-SNAPSHOT</version>
35+
<version>2.23.0-SNAPSHOT</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.22.1-SNAPSHOT</version>
45+
<version>2.23.0-SNAPSHOT</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: 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.22.1-SNAPSHOT</version>
28+
<version>2.23.0-SNAPSHOT</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.22.1-SNAPSHOT</version>
35+
<version>2.23.0-SNAPSHOT</version>
3636

3737
<name>CONGA AEM Maven Plugin</name>
3838
<description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -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.22.1-SNAPSHOT</version>
65+
<version>2.23.0-SNAPSHOT</version>
6666
<scope>compile</scope>
6767
</dependency>
6868
<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
@@ -78,7 +78,7 @@
7878
<plugin>
7979
<groupId>io.wcm.devops.conga</groupId>
8080
<artifactId>conga-maven-plugin</artifactId>
81-
<version>1.17.6</version>
81+
<version>1.18.0-SNAPSHOT</version>
8282
<extensions>true</extensions>
8383
<dependencies>
8484

0 commit comments

Comments
 (0)