Skip to content

Commit 1fc1972

Browse files
Build project by JDK 25 (#11177)
* Build project by JDK 25 * Disable MavenIT0009GoalConfigurationTest on windows with JDK25
1 parent 5f6f40c commit 1fc1972

File tree

5 files changed

+19
-9
lines changed

5 files changed

+19
-9
lines changed

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
fail-fast: false
9595
matrix:
9696
os: [ubuntu-latest, macos-latest, windows-latest]
97-
java: ['17', '21', '24']
97+
java: ['17', '21', '25']
9898
steps:
9999
- name: Set up JDK ${{ matrix.java }}
100100
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
@@ -193,7 +193,7 @@ jobs:
193193
fail-fast: false
194194
matrix:
195195
os: [ubuntu-latest, macos-latest, windows-latest]
196-
java: ['17', '21', '24']
196+
java: ['17', '21', '25']
197197
steps:
198198
- name: Set up JDK ${{ matrix.java }}
199199
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5

its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
import java.io.File;
2222

2323
import org.junit.jupiter.api.Test;
24+
import org.junit.jupiter.api.condition.DisabledIf;
25+
import org.junit.jupiter.api.condition.JRE;
26+
import org.junit.jupiter.api.condition.OS;
2427

2528
public class MavenIT0009GoalConfigurationTest extends AbstractMavenIntegrationTestCase {
2629

@@ -35,6 +38,9 @@ public MavenIT0009GoalConfigurationTest() {
3538
* @throws Exception in case of failure
3639
*/
3740
@Test
41+
@DisabledIf(
42+
value = "isWindowsWithJDK25",
43+
disabledReason = "JDK-25 - JDK-8354450 files ending with space are not supported on Windows")
3844
public void testit0009() throws Exception {
3945

4046
boolean supportSpaceInXml = matchesVersionRange("[3.1.0,)");
@@ -50,4 +56,8 @@ public void testit0009() throws Exception {
5056
verifier.verifyFileNotPresent("target/bad-item");
5157
verifier.verifyErrorFreeLog();
5258
}
59+
60+
static boolean isWindowsWithJDK25() {
61+
return OS.WINDOWS.isCurrentOs() && JRE.currentVersionNumber() >= 25;
62+
}
5363
}

its/core-it-suite/src/test/resources/mng-7045/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<plugin>
3333
<groupId>org.codehaus.gmavenplus</groupId>
3434
<artifactId>gmavenplus-plugin</artifactId>
35-
<version>1.11.0</version>
35+
<version>4.2.1</version>
3636
<configuration>
3737
<scripts>
3838
<script><![CDATA[println("InstanceSource=" + javax.enterprise.inject.Instance.class.getProtectionDomain().getCodeSource())
@@ -43,13 +43,13 @@ javax.enterprise.inject.Instance.class.getDeclaredMethod("stream")]]></script>
4343
<dependency>
4444
<groupId>org.apache.groovy</groupId>
4545
<artifactId>groovy-ant</artifactId>
46-
<version>4.0.26</version>
46+
<version>4.0.28</version>
4747
<scope>runtime</scope>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.apache.groovy</groupId>
5151
<artifactId>groovy</artifactId>
52-
<version>4.0.26</version>
52+
<version>4.0.28</version>
5353
<scope>runtime</scope>
5454
</dependency>
5555
</dependencies>

its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ under the License.
4343
<dependency>
4444
<groupId>org.junit</groupId>
4545
<artifactId>junit-bom</artifactId>
46-
<version>5.11.4</version>
46+
<version>5.13.4</version>
4747
<type>pom</type>
4848
<scope>import</scope>
4949
</dependency>
5050
<dependency>
5151
<groupId>org.mockito</groupId>
5252
<artifactId>mockito-bom</artifactId>
53-
<version>5.15.2</version>
53+
<version>5.20.0</version>
5454
<type>pom</type>
5555
<scope>import</scope>
5656
</dependency>
@@ -151,7 +151,7 @@ under the License.
151151
<plugin>
152152
<groupId>org.apache.maven.plugins</groupId>
153153
<artifactId>maven-invoker-plugin</artifactId>
154-
<version>3.6.1</version>
154+
<version>3.9.1</version>
155155
<configuration>
156156
<showErrors>true</showErrors>
157157
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>

its/core-it-suite/src/test/resources/mng-8527-consumer-pom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ under the License.
2323
<parent>
2424
<groupId>org.apache.maven</groupId>
2525
<artifactId>maven-parent</artifactId>
26-
<version>43</version>
26+
<version>45</version>
2727
</parent>
2828

2929
<groupId>org.apache.maven.its.mng-8527</groupId>

0 commit comments

Comments
 (0)