Skip to content

Commit df37742

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 4a6aa49 + b71f6c8 commit df37742

File tree

6 files changed

+31
-19
lines changed

6 files changed

+31
-19
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

‎.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://github.com/wcm-io/io.wcm.maven.global-parent/blob/develop/changes.xml'

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<img src="https://wcm.io/images/favicon-16@2x.png"/> Global Parent
22
======
3-
[![Build](https://github.com/wcm-io/io.wcm.maven.global-parent/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io/io.wcm.maven.global-parent/actions?query=workflow%3ABuild+branch%3Adevelop)
3+
[![Build](https://github.com/wcm-io/io.wcm.maven.global-parent/actions/workflows/maven-build.yml/badge.svg?branch=develop)](https://github.com/wcm-io/io.wcm.maven.global-parent/actions?query=workflow%3ABuild+branch%3Adevelop)
44
[![Maven Central](https://img.shields.io/maven-central/v/io.wcm.maven/io.wcm.maven.global-parent)](https://repo1.maven.org/maven2/io/wcm/maven/io.wcm.maven.global-parent/)
55

66
Global parent for Maven artifact hierarchy.

‎changes.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,15 @@
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="70" date="2025-09-23">
28+
<action type="update" dev="sseifert">
29+
Switch minimum Java version for build environment to Java 17. Default version for compilation remains Java 11.
30+
</action>
31+
<action type="update" dev="sseifert">
32+
Update plugins and dependencies to latest versions.
33+
</action>
34+
</release>
35+
2736
<release version="67" date="2025-09-19">
2837
<action type="update" dev="sseifert">
2938
Update plugins and dependencies to latest versions.

‎pom.xml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<groupId>io.wcm.maven</groupId>
2626
<artifactId>io.wcm.maven.global-parent</artifactId>
27-
<version>67</version>
27+
<version>70</version>
2828
<packaging>pom</packaging>
2929

3030
<name>io.wcm.maven.global-parent</name>
@@ -51,13 +51,16 @@
5151
<unittests.skip>${maven.test.skip}</unittests.skip>
5252
<integrationtests.skip>${maven.test.skip}</integrationtests.skip>
5353

54-
<!-- Java Version to build against (can be overridden by inheriting poms) -->
54+
<!-- Java version to compile for (can be overridden by inheriting poms) -->
5555
<!-- Java 11 is the minimum version, Java 8 is no longer supported -->
5656
<java.version>11</java.version>
5757
<build.compiler.source>${java.version}</build.compiler.source>
5858
<build.compiler.target>${java.version}</build.compiler.target>
5959
<build.compiler.release>${build.compiler.target}</build.compiler.release>
6060

61+
<!-- Min. Java version to build with -->
62+
<java.min-version.build>17</java.min-version.build>
63+
6164
<!-- pmd needs this as a global property, even in mvn 3 - may be fixed some day -->
6265
<!-- see https://issues.apache.org/jira/browse/MPMD-86 -->
6366
<targetJdk>${java.version}</targetJdk>
@@ -78,7 +81,7 @@
7881
<spotbugs-findsecbugs-plugin.version>1.14.0</spotbugs-findsecbugs-plugin.version>
7982
<pmd.version>7.17.0</pmd.version>
8083
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
81-
<versions-maven-plugin.version>2.19.0</versions-maven-plugin.version>
84+
<versions-maven-plugin.version>2.19.1</versions-maven-plugin.version>
8285

8386
<!-- Set to 'enabled' to activate org.eclipse.jdt.core.compiler.annotation.nullanalysis feature in eclipse settings -->
8487
<eclipse.settings.nullanalysis>disabled</eclipse.settings.nullanalysis>
@@ -245,7 +248,7 @@
245248
<configuration>
246249
<rules>
247250
<requireJavaVersion>
248-
<version>[11,]</version>
251+
<version>[${java.min-version.build},]</version>
249252
</requireJavaVersion>
250253
</rules>
251254
</configuration>
@@ -261,7 +264,7 @@
261264
<version>[${maven.min-version},)</version>
262265
</requireMavenVersion>
263266
<requireJavaVersion>
264-
<version>[${java.version},]</version>
267+
<version>[${java.min-version.build},]</version>
265268
</requireJavaVersion>
266269
</rules>
267270
</configuration>
@@ -278,7 +281,7 @@
278281
<version>[${maven.min-version},)</version>
279282
</requireMavenVersion>
280283
<requireJavaVersion>
281-
<version>[${java.version},]</version>
284+
<version>[${java.min-version.build},]</version>
282285
</requireJavaVersion>
283286
</rules>
284287
</configuration>
@@ -295,7 +298,7 @@
295298
<version>[${maven.min-version},)</version>
296299
</requireMavenVersion>
297300
<requireJavaVersion>
298-
<version>[${java.version},]</version>
301+
<version>[${java.min-version.build},]</version>
299302
</requireJavaVersion>
300303
</rules>
301304
</configuration>
@@ -426,7 +429,7 @@
426429
<plugin>
427430
<groupId>org.apache.maven.plugins</groupId>
428431
<artifactId>maven-compiler-plugin</artifactId>
429-
<version>3.14.0</version>
432+
<version>3.14.1</version>
430433
</plugin>
431434

432435
<plugin>
@@ -569,7 +572,7 @@
569572
<plugin>
570573
<groupId>org.apache.maven.plugins</groupId>
571574
<artifactId>maven-javadoc-plugin</artifactId>
572-
<version>3.11.3</version>
575+
<version>3.12.0</version>
573576
</plugin>
574577

575578
<plugin>
@@ -594,7 +597,7 @@
594597
<dependency>
595598
<groupId>com.puppycrawl.tools</groupId>
596599
<artifactId>checkstyle</artifactId>
597-
<version>10.26.1</version>
600+
<version>11.0.1</version>
598601
</dependency>
599602
</dependencies>
600603
</plugin>
@@ -831,7 +834,7 @@
831834
<plugin>
832835
<groupId>org.codehaus.mojo</groupId>
833836
<artifactId>license-maven-plugin</artifactId>
834-
<version>2.6.0</version>
837+
<version>2.7.0</version>
835838
</plugin>
836839

837840
<plugin>

0 commit comments

Comments
 (0)