You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2025/09/26 08:43:08 UTC
(maven) branch master updated: Build project by JDK 25 (#11177)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 1fc19723e9 Build project by JDK 25 (#11177)
1fc19723e9 is described below
commit 1fc19723e9236f9af10af57277ccdc81215db935
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Fri Sep 26 10:43:03 2025 +0200
Build project by JDK 25 (#11177)
* Build project by JDK 25
* Disable MavenIT0009GoalConfigurationTest on windows with JDK25
---
.github/workflows/maven.yml | 4 ++--
.../org/apache/maven/it/MavenIT0009GoalConfigurationTest.java | 10 ++++++++++
its/core-it-suite/src/test/resources/mng-7045/pom.xml | 6 +++---
.../src/test/resources/mng-8525-maven-di-plugin/pom.xml | 6 +++---
.../src/test/resources/mng-8527-consumer-pom/pom.xml | 2 +-
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index cf565f96ff..5022c79118 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -94,7 +94,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
- java: ['17', '21', '24']
+ java: ['17', '21', '25']
steps:
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
@@ -193,7 +193,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
- java: ['17', '21', '24']
+ java: ['17', '21', '25']
steps:
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
index 6cc28d87ab..83c1407319 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
@@ -21,6 +21,9 @@
import java.io.File;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.condition.JRE;
+import org.junit.jupiter.api.condition.OS;
public class MavenIT0009GoalConfigurationTest extends AbstractMavenIntegrationTestCase {
@@ -35,6 +38,9 @@ public MavenIT0009GoalConfigurationTest() {
* @throws Exception in case of failure
*/
@Test
+ @DisabledIf(
+ value = "isWindowsWithJDK25",
+ disabledReason = "JDK-25 - JDK-8354450 files ending with space are not supported on Windows")
public void testit0009() throws Exception {
boolean supportSpaceInXml = matchesVersionRange("[3.1.0,)");
@@ -50,4 +56,8 @@ public void testit0009() throws Exception {
verifier.verifyFileNotPresent("target/bad-item");
verifier.verifyErrorFreeLog();
}
+
+ static boolean isWindowsWithJDK25() {
+ return OS.WINDOWS.isCurrentOs() && JRE.currentVersionNumber() >= 25;
+ }
}
diff --git a/its/core-it-suite/src/test/resources/mng-7045/pom.xml b/its/core-it-suite/src/test/resources/mng-7045/pom.xml
index c031f24fef..2cb0244cb8 100644
--- a/its/core-it-suite/src/test/resources/mng-7045/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-7045/pom.xml
@@ -32,7 +32,7 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.11.0</version>
+ <version>4.2.1</version>
<configuration>
<scripts>
<script><![CDATA[println("InstanceSource=" + javax.enterprise.inject.Instance.class.getProtectionDomain().getCodeSource())
@@ -43,13 +43,13 @@ javax.enterprise.inject.Instance.class.getDeclaredMethod("stream")]]></script>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-ant</artifactId>
- <version>4.0.26</version>
+ <version>4.0.28</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
- <version>4.0.26</version>
+ <version>4.0.28</version>
<scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml
index e3939ba4b2..40e3391019 100644
--- a/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml
@@ -43,14 +43,14 @@ under the License.
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
- <version>5.11.4</version>
+ <version>5.13.4</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-bom</artifactId>
- <version>5.15.2</version>
+ <version>5.20.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -151,7 +151,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.9.1</version>
<configuration>
<showErrors>true</showErrors>
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
diff --git a/its/core-it-suite/src/test/resources/mng-8527-consumer-pom/pom.xml b/its/core-it-suite/src/test/resources/mng-8527-consumer-pom/pom.xml
index f1c79f062d..3e9b56c6f5 100644
--- a/its/core-it-suite/src/test/resources/mng-8527-consumer-pom/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-8527-consumer-pom/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>43</version>
+ <version>45</version>
</parent>
<groupId>org.apache.maven.its.mng-8527</groupId>