Skip to content

Build project by JDK 25 #11177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 26, 2025
Merged

Build project by JDK 25 #11177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71bb443
Build project by JDK 25
slawekjaranowski Sep 25, 2025
f4a6ba5
Disable MavenIT0009GoalConfigurationTest on windows with JDK25
slawekjaranowski Sep 25, 2025
4bc303c
Spotless
slawekjaranowski Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0009GoalConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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,)");
Expand All @@ -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;
}
}
6 changes: 3 additions & 3 deletions its/core-it-suite/src/test/resources/mng-7045/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion its/core-it-suite/src/test/resources/mng-8527-consumer-pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading