Skip to content

Bump minimal Java version to 17 #725

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
dnestoro merged 2 commits into from
May 20, 2025
Merged

Bump minimal Java version to 17 #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23e7023
Bump minimal Java version to 17
melix May 16, 2025
1a357a9
Fix ambiguous newFileSystem call
melix May 16, 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
6 changes: 0 additions & 6 deletions .github/actions/prepare-environment/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ inputs:
runs:
using: "composite"
steps:
- name: "🔧 Setup Java 11"
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
if: runner.os == 'Windows'
- name: "🔧 Install GraalVM (JDK${{ inputs.java-version }})"
uses: graalvm/setup-graalvm@main
with:
Expand Down
7 changes: 1 addition & 6 deletions build-logic/common-plugins/src/main/kotlin/org.graalvm.build.java.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ plugins {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
languageVersion.set(JavaLanguageVersion.of(17))
}
withJavadocJar()
withSourcesJar()
Expand All @@ -74,11 +74,6 @@ extensions.findByType<VersionCatalogsExtension>()?.also { catalogs ->
}

tasks.javadoc {
// Use a different toolchain version from the compilation
// so that we can generate HTML5 docs
javadocTool.set(javaToolchains.javadocToolFor {
languageVersion.set(JavaLanguageVersion.of(11))
})
(options as StandardJavadocDocletOptions).addBooleanOption("html5", true)
(options as StandardJavadocDocletOptions).noTimestamp(true)
}
Expand Down
4 changes: 4 additions & 0 deletions docs/src/docs/asciidoc/changelog.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
[[changelog]]
== Changelog

== Release 0.11.0

This version introduces a breaking change: the plugin now requires Java 17 to run.

== Release 0.10.6

=== Gradle plugin
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
# Project versions
nativeBuildTools = "0.10.7-SNAPSHOT"
nativeBuildTools = "0.11.0-SNAPSHOT"
metadataRepository = "0.3.18"

# External dependencies
Expand Down
2 changes: 1 addition & 1 deletion ...gradle-plugin/src/test/groovy/org/graalvm/buildtools/gradle/tasks/ClasspathJarTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class ClasspathJarTest extends AbstractPluginTest {
classpathJar.copy()

then:
try (def fs = FileSystems.newFileSystem(jarPath, null)) {
try (def fs = FileSystems.newFileSystem(jarPath, (ClassLoader) null)) {
assert Files.exists(fs.getPath("dummy.txt"))
}
}
Expand Down
2 changes: 1 addition & 1 deletion native-maven-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ val prepareMavenLocalRepo = tasks.register<MavenTask>("prepareMavenLocalRepo") {
}

val launcher = javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(11))
languageVersion.set(JavaLanguageVersion.of(17))
}

tasks {
Expand Down
4 changes: 2 additions & 2 deletions native-maven-plugin/reproducers/issue-144/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.11.0-SNAPSHOT</junit.platform.native.version>
<imageName>example-app</imageName>
<mainClass>org.graalvm.demo.Application</mainClass>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion native-maven-plugin/reproducers/issue-612/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<imageName>example-app</imageName>
<mainClass>org.graalvm.demo.Application</mainClass>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion ...maven-plugin/src/main/java/org/graalvm/buildtools/maven/sbom/ArtifactAdapterResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ private static Plugin getShadePluginIfUsed(MavenProject mavenProject) {

private static FileSystem getOrCreateFileSystem(Path jarPath) throws IOException {
try {
return FileSystems.newFileSystem(jarPath, null);
return FileSystems.newFileSystem(jarPath, (ClassLoader) null);
} catch (FileSystemAlreadyExistsException e) {
/* If the file system already exists, return the existing file system. */
return FileSystems.getFileSystem(jarPath.toUri());
Expand Down
2 changes: 1 addition & 1 deletion samples/java-application-with-custom-packaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<micronaut.version>3.3.4</micronaut.version>
<exec.mainClass>org.graalvm.demo.Application</exec.mainClass>
<micronaut.runtime>netty</micronaut.runtime>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
</properties>

<repositories>
Expand Down
6 changes: 3 additions & 3 deletions samples/java-application-with-custom-tests/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
junit.jupiter.version = 5.10.0
junit.platform.version = 1.10.0
native.gradle.plugin.version = 0.11.0-SNAPSHOT
junit.jupiter.version = 5.11.0
junit.platform.version = 1.11.0
6 changes: 3 additions & 3 deletions samples/java-application-with-extra-sourceset/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
junit.jupiter.version = 5.10.0
junit.platform.version = 1.10.0
native.gradle.plugin.version = 0.11.0-SNAPSHOT
junit.jupiter.version = 5.11.0
junit.platform.version = 1.11.0
6 changes: 3 additions & 3 deletions samples/java-application-with-reflection/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
junit.jupiter.version = 5.10.0
junit.platform.version = 1.10.0
native.gradle.plugin.version = 0.11.0-SNAPSHOT
junit.jupiter.version = 5.11.0
junit.platform.version = 1.11.0
6 changes: 3 additions & 3 deletions samples/java-application-with-reflection/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.jupiter.version>5.10.0</junit.jupiter.version>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
<junit.jupiter.version>5.11.0</junit.jupiter.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.11.0-SNAPSHOT</junit.platform.native.version>
<imageName>example-app</imageName>
<mainClass>org.graalvm.demo.Application</mainClass>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions samples/java-application-with-resources/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
junit.jupiter.version = 5.10.0
junit.platform.version = 1.10.0
native.gradle.plugin.version = 0.11.0-SNAPSHOT
junit.jupiter.version = 5.11.0
junit.platform.version = 1.11.0
6 changes: 3 additions & 3 deletions samples/java-application-with-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<junit.jupiter.version>5.10.0</junit.jupiter.version>
<junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<junit.jupiter.version>5.11.0</junit.jupiter.version>
<junit.platform.native.version>0.11.0-SNAPSHOT</junit.platform.native.version>
<imageName>example-app</imageName>
<mainClass>org.graalvm.demo.Application</mainClass>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions samples/java-application-with-tests/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
junit.jupiter.version = 5.10.0
junit.platform.version = 1.10.0
native.gradle.plugin.version = 0.11.0-SNAPSHOT
junit.jupiter.version = 5.11.0
junit.platform.version = 1.11.0
6 changes: 3 additions & 3 deletions samples/java-application-with-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.jupiter.version>5.10.0</junit.jupiter.version>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
<junit.jupiter.version>5.11.0</junit.jupiter.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.11.0-SNAPSHOT</junit.platform.native.version>
<imageName>example-app</imageName>
<mainClass>org.graalvm.demo.Application</mainClass>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions samples/java-application/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
junit.jupiter.version = 5.10.0
junit.platform.version = 1.10.0
native.gradle.plugin.version = 0.11.0-SNAPSHOT
junit.jupiter.version = 5.11.0
junit.platform.version = 1.11.0
4 changes: 2 additions & 2 deletions samples/java-application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.11.0-SNAPSHOT</junit.platform.native.version>
<imageName>example-app</imageName>
<mainClass>org.graalvm.demo.Application</mainClass>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions samples/java-library/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
junit.jupiter.version = 5.10.0
junit.platform.version = 1.10.0
native.gradle.plugin.version = 0.11.0-SNAPSHOT
junit.jupiter.version = 5.11.0
junit.platform.version = 1.11.0
4 changes: 2 additions & 2 deletions samples/java-library/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.11.0-SNAPSHOT</junit.platform.native.version>
<imageName>java-library</imageName>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion samples/junit-tests/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
native.gradle.plugin.version = 0.11.0-SNAPSHOT
4 changes: 2 additions & 2 deletions samples/junit-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.jupiter.version>5.11.0</junit.jupiter.version>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.11.0-SNAPSHOT</junit.platform.native.version>
<imageName>example-app</imageName>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions samples/kotlin-application-with-tests/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
junit.jupiter.version = 5.10.0
junit.platform.version = 1.10.0
native.gradle.plugin.version = 0.11.0-SNAPSHOT
junit.jupiter.version = 5.11.0
junit.platform.version = 1.11.0
2 changes: 1 addition & 1 deletion samples/metadata-repo-integration/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
native.gradle.plugin.version = 0.11.0-SNAPSHOT
h2.version = 2.2.220
netty.version = 4.1.80.Final
logback.version = 1.4.4
Expand Down
4 changes: 2 additions & 2 deletions samples/metadata-repo-integration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.11.0-SNAPSHOT</junit.platform.native.version>
<h2.version>2.2.220</h2.version>
<netty.version>4.1.108.Final</netty.version>
<logback.version>1.4.12</logback.version>
Expand Down
6 changes: 3 additions & 3 deletions samples/multi-project-with-tests/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
junit.jupiter.version = 5.10.0
junit.platform.version = 1.10.0
native.gradle.plugin.version = 0.11.0-SNAPSHOT
junit.jupiter.version = 5.11.0
junit.platform.version = 1.11.0
6 changes: 3 additions & 3 deletions samples/multi-project-with-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.jupiter.version>5.10.0</junit.jupiter.version>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
<junit.jupiter.version>5.11.0</junit.jupiter.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.11.0-SNAPSHOT</junit.platform.native.version>
<imageName>example-app</imageName>
<mainClass>org.graalvm.demo.Application</mainClass>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions samples/native-config-integration/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
native.gradle.plugin.version = 0.10.7-SNAPSHOT
junit.jupiter.version = 5.10.0
junit.platform.version = 1.10.0
native.gradle.plugin.version = 0.11.0-SNAPSHOT
junit.jupiter.version = 5.11.0
junit.platform.version = 1.11.0
4 changes: 2 additions & 2 deletions samples/native-config-integration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<native.maven.plugin.version>0.10.7-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.10.7-SNAPSHOT</junit.platform.native.version>
<native.maven.plugin.version>0.11.0-SNAPSHOT</native.maven.plugin.version>
<junit.platform.native.version>0.11.0-SNAPSHOT</junit.platform.native.version>
<imageName>example-app</imageName>
<mainClass>org.graalvm.example.Application</mainClass>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion test-support/library-with-reflection/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "1.5"

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
languageVersion.set(JavaLanguageVersion.of(17))
}
}

Expand Down
Loading