Skip to content

Commit 7bd2252

Browse files
stefanseifertstefanseifert
committed
Switch to Java 17
1 parent a07e27c commit 7bd2252

File tree

8 files changed

+28
-22
lines changed

8 files changed

+28
-22
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ 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

2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Setup JDK
27-
uses: actions/setup-java@v4
27+
uses: actions/setup-java@v5
2828
with:
2929
distribution: ${{ matrix.distribution }}
3030
java-version: ${{ matrix.java }}

‎.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/definitions/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.1.0" date="not released">
28+
<action type="update" dev="sseifert">
29+
Switch to Java 17.
30+
</action>
31+
</release>
32+
2733
<release version="2.0.10" date="2025-06-18">
2834
<action type="update" dev="sseifert" issue="110">
2935
Role aem-cms: Mark all content packages that might be generated with dependencyChainIgnore=true - the order of installation is not relevant for those packages.

‎conga-aem-definitions/pom.xml‎

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

3232
<groupId>io.wcm.devops.conga.definitions</groupId>
3333
<artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
34-
<version>2.0.11-SNAPSHOT</version>
34+
<version>2.1.0-SNAPSHOT</version>
3535
<packaging>config-definition</packaging>
3636

3737
<name>CONGA AEM Definitions</name>
@@ -51,20 +51,20 @@
5151
<plugin>
5252
<groupId>io.wcm.devops.conga</groupId>
5353
<artifactId>conga-maven-plugin</artifactId>
54-
<version>1.17.6</version>
54+
<version>1.18.0-SNAPSHOT</version>
5555
<extensions>true</extensions>
5656
<dependencies>
5757

5858
<!-- Activate further CONGA plugins for special file types -->
5959
<dependency>
6060
<groupId>io.wcm.devops.conga.plugins</groupId>
6161
<artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
62-
<version>1.4.4</version>
62+
<version>1.5.0-SNAPSHOT</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>io.wcm.devops.conga.plugins</groupId>
6666
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
67-
<version>2.22.0</version>
67+
<version>2.23.0-SNAPSHOT</version>
6868
</dependency>
6969

7070
</dependencies>

‎example/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<groupId>io.wcm.devops.conga.definitions</groupId>
3333
<artifactId>io.wcm.devops.conga.definitions.aem.example</artifactId>
3434
<packaging>config</packaging>
35-
<version>2.0.11-SNAPSHOT</version>
35+
<version>2.1.0-SNAPSHOT</version>
3636

3737
<name>CONGA AEM Definitions Example</name>
3838
<description>Example environment definition.</description>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>io.wcm.devops.conga.definitions</groupId>
4545
<artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
46-
<version>2.0.11-SNAPSHOT</version>
46+
<version>2.1.0-SNAPSHOT</version>
4747
<scope>compile</scope>
4848
</dependency>
4949

@@ -56,27 +56,27 @@
5656
<plugin>
5757
<groupId>io.wcm.devops.conga</groupId>
5858
<artifactId>conga-maven-plugin</artifactId>
59-
<version>1.17.6</version>
59+
<version>1.18.0-SNAPSHOT</version>
6060
<extensions>true</extensions>
6161
<dependencies>
6262

6363
<!-- Activate further CONGA plugins for special file types -->
6464
<dependency>
6565
<groupId>io.wcm.devops.conga.plugins</groupId>
6666
<artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
67-
<version>1.4.4</version>
67+
<version>1.5.0-SNAPSHOT</version>
6868
</dependency>
6969
<dependency>
7070
<groupId>io.wcm.devops.conga.plugins</groupId>
7171
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
72-
<version>2.22.0</version>
72+
<version>2.23.0-SNAPSHOT</version>
7373
</dependency>
7474

7575
<!-- Test with ansible encryption -->
7676
<dependency>
7777
<groupId>io.wcm.devops.conga.plugins</groupId>
7878
<artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
79-
<version>1.4.10</version>
79+
<version>1.5.0-SNAPSHOT</version>
8080
</dependency>
8181

8282
</dependencies>

‎parent/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</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.definitions</groupId>
3333
<artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
34-
<version>2.0.11-SNAPSHOT</version>
34+
<version>2.1.0-SNAPSHOT</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA AEM Definitions</name>

‎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.definitions</groupId>
2525
<artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
26-
<version>2.0.11-SNAPSHOT</version>
26+
<version>2.1.0-SNAPSHOT</version>
2727
<relativePath>parent/pom.xml</relativePath>
2828
</parent>
2929

3030
<groupId>io.wcm.devops.conga.definitions</groupId>
3131
<artifactId>io.wcm.devops.conga.definitions.aem.root</artifactId>
32-
<version>2.0.11-SNAPSHOT</version>
32+
<version>2.1.0-SNAPSHOT</version>
3333
<packaging>pom</packaging>
3434

3535
<name>CONGA AEM Definitions</name>

0 commit comments

Comments
 (0)