diff --git a/build-logic/common-plugins/src/main/kotlin/org.graalvm.build.publishing.gradle.kts b/build-logic/common-plugins/src/main/kotlin/org.graalvm.build.publishing.gradle.kts index ef318324f..fe3308a26 100644 --- a/build-logic/common-plugins/src/main/kotlin/org.graalvm.build.publishing.gradle.kts +++ b/build-logic/common-plugins/src/main/kotlin/org.graalvm.build.publishing.gradle.kts @@ -58,7 +58,7 @@ val mavenExtension = project.extensions.create("maven").also { it.description.convention(project.description) } -val publishingTasks = tasks.withType() +val publishingTasks = tasks.withType() .matching { it.name.endsWith("ToCommonRepository") } val repositoryElements by configurations.creating { diff --git a/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/platform/PlatformConfigProvider.java b/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/platform/PlatformConfigProvider.java index 9e666c236..d9c03eb16 100644 --- a/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/platform/PlatformConfigProvider.java +++ b/common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/platform/PlatformConfigProvider.java @@ -64,7 +64,7 @@ public void onLoad(NativeImageConfiguration config) { ); if (getMajorJDKVersion() >= 21) { - /* new with simulated class initialization */ + /* new with --strict-image-heap */ config.initializeAtBuildTime( "org.junit.platform.engine.support.descriptor.ClassSource", "org.junit.platform.engine.support.descriptor.MethodSource", @@ -75,15 +75,21 @@ public void onLoad(NativeImageConfiguration config) { "org.junit.platform.launcher.core.DefaultLauncher", "org.junit.platform.launcher.core.DefaultLauncherConfig", "org.junit.platform.launcher.core.EngineExecutionOrchestrator", + "org.junit.platform.launcher.core.LauncherConfigurationParameters$ParameterProvider$1", "org.junit.platform.launcher.core.LauncherConfigurationParameters$ParameterProvider$2", "org.junit.platform.launcher.core.LauncherConfigurationParameters$ParameterProvider$3", + "org.junit.platform.launcher.core.LauncherConfigurationParameters$ParameterProvider$4", "org.junit.platform.launcher.core.LauncherDiscoveryResult", "org.junit.platform.launcher.core.LauncherListenerRegistry", "org.junit.platform.launcher.core.ListenerRegistry", "org.junit.platform.launcher.core.SessionPerRequestLauncher", "org.junit.platform.launcher.LauncherSessionListener$1", "org.junit.platform.launcher.listeners.UniqueIdTrackingListener", - "org.junit.platform.reporting.shadow.org.opentest4j.reporting.events.api.DocumentWriter$1" + "org.junit.platform.reporting.shadow.org.opentest4j.reporting.events.api.DocumentWriter$1", + "org.junit.platform.suite.engine.SuiteEngineDescriptor", + "org.junit.platform.suite.engine.SuiteLauncher", + "org.junit.platform.suite.engine.SuiteTestDescriptor", + "org.junit.platform.suite.engine.SuiteTestEngine" ); } diff --git a/docs/src/docs/asciidoc/gradle-plugin.adoc b/docs/src/docs/asciidoc/gradle-plugin.adoc index 2abc253f4..0e7d4472d 100644 --- a/docs/src/docs/asciidoc/gradle-plugin.adoc +++ b/docs/src/docs/asciidoc/gradle-plugin.adoc @@ -373,7 +373,7 @@ include::../snippets/gradle/groovy/build.gradle[tags=disable-metadata-repository [source, kotlin, role="multi-language-sample"] ---- -include::../snippets/gradle/kotlin/build.gradle.kts[tags=enable-metadata-repository] +include::../snippets/gradle/kotlin/build.gradle.kts[tags=disable-metadata-repository] ---- A metadata repository consists of configuration files for GraalVM. diff --git a/docs/src/docs/asciidoc/index.adoc b/docs/src/docs/asciidoc/index.adoc index c89739697..23f732fb1 100644 --- a/docs/src/docs/asciidoc/index.adoc +++ b/docs/src/docs/asciidoc/index.adoc @@ -19,17 +19,22 @@ If you are using alternative build systems, see <> -====Maven plugin +==== Maven plugin -- Update plugin to use metadata repository by default +- Update plugin to use metadata repository by default. Metadata repository <> === Release 0.9.28 diff --git a/docs/src/docs/snippets/gradle/kotlin/build.gradle.kts b/docs/src/docs/snippets/gradle/kotlin/build.gradle.kts index e414ac1ef..d2f8b3611 100644 --- a/docs/src/docs/snippets/gradle/kotlin/build.gradle.kts +++ b/docs/src/docs/snippets/gradle/kotlin/build.gradle.kts @@ -179,13 +179,13 @@ graalvmNative { } // end::custom-binary[] -// tag::enable-metadata-repository[] +// tag::disable-metadata-repository[] graalvmNative { metadataRepository { - enabled.set(true) + enabled.set(false) } } -// end::enable-metadata-repository[] +// end::disable-metadata-repository[] // tag::specify-metadata-repository-version[] graalvmNative { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index df881c7b8..c794a6fac 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # Project versions -nativeBuildTools = "0.10.0" +nativeBuildTools = "0.10.1" metadataRepository = "0.3.6" # External dependencies @@ -9,7 +9,7 @@ maven = "3.8.6" mavenAnnotations = "3.6.4" mavenEmbedder = "3.8.6" mavenWagon = "3.4.3" -graalvm = "22.3.5" +graalvm = "23.0.2" jackson = "2.13.5" junitPlatform = "1.10.0" junitJupiter = "5.10.0" diff --git a/native-gradle-plugin/src/test/groovy/org/graalvm/buildtools/gradle/NativeImagePluginTest.groovy b/native-gradle-plugin/src/test/groovy/org/graalvm/buildtools/gradle/NativeImagePluginTest.groovy index 3e8ae2bd4..f55f92343 100644 --- a/native-gradle-plugin/src/test/groovy/org/graalvm/buildtools/gradle/NativeImagePluginTest.groovy +++ b/native-gradle-plugin/src/test/groovy/org/graalvm/buildtools/gradle/NativeImagePluginTest.groovy @@ -21,8 +21,8 @@ class NativeImagePluginTest extends Specification { private URI fallbackUri def setup() { - project = ProjectBuilder.builder().build() - project.repositories.mavenCentral() + project = ProjectBuilder.builder() + .build() project.plugins.apply(NativeImagePlugin) reachabilityMetadataRepositoryExtension = project.extensions .findByType(GraalVMExtension) diff --git a/native-maven-plugin/build-plugins/src/main/java/org/graalvm/build/maven/GenerateRuntimeMetadata.java b/native-maven-plugin/build-plugins/src/main/java/org/graalvm/build/maven/GenerateRuntimeMetadata.java new file mode 100644 index 000000000..8d93f2fd8 --- /dev/null +++ b/native-maven-plugin/build-plugins/src/main/java/org/graalvm/build/maven/GenerateRuntimeMetadata.java @@ -0,0 +1,70 @@ +/* + * Copyright 2003-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.graalvm.build.maven; + +import org.gradle.api.DefaultTask; +import org.gradle.api.file.DirectoryProperty; +import org.gradle.api.provider.MapProperty; +import org.gradle.api.provider.Property; +import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.OutputDirectory; +import org.gradle.api.tasks.TaskAction; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Map; + +public abstract class GenerateRuntimeMetadata extends DefaultTask { + @Input + public abstract Property getClassName(); + + @Input + public abstract MapProperty getMetadata(); + + @OutputDirectory + public abstract DirectoryProperty getOutputDirectory(); + + @TaskAction + public void generateClass() throws IOException { + String fqcn = getClassName().get(); + Map metadata = getMetadata().get(); + File outputDir = getOutputDirectory().getAsFile().get(); + String packageName = fqcn.substring(0, fqcn.lastIndexOf(".")); + String packagePath = packageName.replace(".", "/"); + String className = fqcn.substring(fqcn.lastIndexOf(".") + 1); + Path outputPath = outputDir.toPath().resolve(packagePath); + Files.createDirectories(outputPath); + Path outputFile = outputPath.resolve(className + ".java"); + try (PrintWriter writer = new PrintWriter(outputFile.toFile(), StandardCharsets.UTF_8)) { + writer.println("package " + packageName + ";"); + writer.println(); + writer.println("public abstract class " + className + " {"); + writer.println(" private " + className + "() { }"); + writer.println(); + for (Map.Entry entry : metadata.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); + writer.println(" public static final String " + key + " = \"" + value + "\";"); + } + writer.println(); + writer.println("}"); + } + } +} diff --git a/native-maven-plugin/build-plugins/src/main/kotlin/org.graalvm.build.maven-plugin.gradle.kts b/native-maven-plugin/build-plugins/src/main/kotlin/org.graalvm.build.maven-plugin.gradle.kts index 774d0944f..6ceac28e4 100644 --- a/native-maven-plugin/build-plugins/src/main/kotlin/org.graalvm.build.maven-plugin.gradle.kts +++ b/native-maven-plugin/build-plugins/src/main/kotlin/org.graalvm.build.maven-plugin.gradle.kts @@ -1,4 +1,5 @@ import org.graalvm.build.maven.GeneratePluginDescriptor +import org.graalvm.build.maven.GenerateRuntimeMetadata import org.gradle.api.publish.maven.tasks.GenerateMavenPom import org.gradle.api.tasks.Copy import org.gradle.kotlin.dsl.register @@ -73,6 +74,22 @@ val generatePluginDescriptor = tasks.register("generat outputDirectory.set(project.layout.buildDirectory.dir("generated/maven-plugin")) } +val writeConstants = tasks.register("writeRuntimeMetadata") { + className.set("org.graalvm.buildtools.maven.RuntimeMetadata") + outputDirectory.set(layout.buildDirectory.dir("generated/runtime-metadata")) + metadata.put("GROUP_ID", project.group as String) + metadata.put("VERSION", project.version as String) + metadata.put("JUNIT_PLATFORM_NATIVE_ARTIFACT_ID", "junit-platform-native") +} + +sourceSets { + main { + java { + srcDir(writeConstants) + } + } +} + tasks { jar { from(generatePluginDescriptor) diff --git a/native-maven-plugin/build.gradle.kts b/native-maven-plugin/build.gradle.kts index 78032343d..dfe02041e 100644 --- a/native-maven-plugin/build.gradle.kts +++ b/native-maven-plugin/build.gradle.kts @@ -60,11 +60,9 @@ maven { } dependencies { - implementation(libs.junitPlatformNative) implementation(libs.utils) implementation(libs.jackson.databind) implementation(libs.jvmReachabilityMetadata) - implementation(libs.graalvm.svm) implementation(libs.plexus.utils) implementation(libs.plexus.xml) @@ -177,4 +175,6 @@ tasks { tasks.withType().configureEach { configFile = layout.projectDirectory.dir("../config/checkstyle.xml").asFile + // generated code + exclude("**/RuntimeMetadata*") } diff --git a/native-maven-plugin/reproducers/issue-144/pom.xml b/native-maven-plugin/reproducers/issue-144/pom.xml index 7fada5f07..1090d5498 100644 --- a/native-maven-plugin/reproducers/issue-144/pom.xml +++ b/native-maven-plugin/reproducers/issue-144/pom.xml @@ -56,8 +56,8 @@ 1.8 UTF-8 - 0.10.0 - 0.10.0 + 0.10.1 + 0.10.1 example-app org.graalvm.demo.Application diff --git a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeImageMojo.java b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeImageMojo.java index 4bd725408..fa5e563bd 100644 --- a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeImageMojo.java +++ b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/AbstractNativeImageMojo.java @@ -64,6 +64,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.FileSystem; import java.nio.file.FileSystems; +import java.nio.file.FileSystemAlreadyExistsException; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.Files; @@ -293,13 +294,23 @@ protected void addArtifactToClasspath(Artifact artifact) throws MojoExecutionExc Optional.ofNullable(processSupportedArtifacts(artifact)).ifPresent(imageClasspath::add); } + private static FileSystem openFileSystem(URI uri) throws IOException { + FileSystem fs; + try { + fs = FileSystems.newFileSystem(uri, Collections.emptyMap()); + } catch (FileSystemAlreadyExistsException e) { + fs = FileSystems.getFileSystem(uri); + } + return fs; + } + protected void warnIfWrongMetaInfLayout(Path jarFilePath, Artifact artifact) throws MojoExecutionException { if (jarFilePath.toFile().isDirectory()) { logger.debug("Artifact `" + jarFilePath + "` is a directory."); return; } URI jarFileURI = URI.create("jar:" + jarFilePath.toUri()); - try (FileSystem jarFS = FileSystems.newFileSystem(jarFileURI, Collections.emptyMap())) { + try (FileSystem jarFS = openFileSystem(jarFileURI)) { Path nativeImageMetaInfBase = jarFS.getPath("/" + NATIVE_IMAGE_META_INF); if (Files.isDirectory(nativeImageMetaInfBase)) { try (Stream stream = Files.walk(nativeImageMetaInfBase)) { diff --git a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/NativeTestMojo.java b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/NativeTestMojo.java index aaf95fbe7..a59009a57 100644 --- a/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/NativeTestMojo.java +++ b/native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/NativeTestMojo.java @@ -50,32 +50,43 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.codehaus.plexus.util.xml.Xpp3Dom; +import org.eclipse.aether.DefaultRepositorySystemSession; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.artifact.DefaultArtifact; +import org.eclipse.aether.collection.CollectRequest; +import org.eclipse.aether.graph.Dependency; +import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.resolution.ArtifactResult; +import org.eclipse.aether.resolution.DependencyRequest; +import org.eclipse.aether.resolution.DependencyResolutionException; +import org.eclipse.aether.resolution.DependencyResult; import org.graalvm.buildtools.utils.NativeImageConfigurationUtils; -import org.graalvm.junit.platform.JUnitPlatformFeature; -import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; -import java.net.URISyntaxException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; +import java.util.HashSet; import java.util.List; -import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; import java.util.stream.Stream; import static org.graalvm.buildtools.utils.NativeImageConfigurationUtils.NATIVE_TESTS_EXE; /** * This goal builds and runs native tests. + * * @author Sebastien Deleuze */ @Mojo(name = "test", defaultPhase = LifecyclePhase.TEST, threadSafe = true, - requiresDependencyResolution = ResolutionScope.TEST, - requiresDependencyCollection = ResolutionScope.TEST) + requiresDependencyResolution = ResolutionScope.TEST, + requiresDependencyCollection = ResolutionScope.TEST) public class NativeTestMojo extends AbstractNativeImageMojo { @Parameter(property = "skipTests", defaultValue = "false") @@ -89,31 +100,39 @@ protected void populateApplicationClasspath() throws MojoExecutionException { super.populateApplicationClasspath(); imageClasspath.add(Paths.get(project.getBuild().getTestOutputDirectory())); project.getBuild() - .getTestResources() - .stream() - .map(FileSet::getDirectory) - .map(Paths::get) - .forEach(imageClasspath::add); + .getTestResources() + .stream() + .map(FileSet::getDirectory) + .map(Paths::get) + .forEach(imageClasspath::add); } @Override protected List getDependencyScopes() { return Arrays.asList( - Artifact.SCOPE_COMPILE, - Artifact.SCOPE_RUNTIME, - Artifact.SCOPE_TEST, - Artifact.SCOPE_COMPILE_PLUS_RUNTIME + Artifact.SCOPE_COMPILE, + Artifact.SCOPE_RUNTIME, + Artifact.SCOPE_TEST, + Artifact.SCOPE_COMPILE_PLUS_RUNTIME ); } @Override protected void addDependenciesToClasspath() throws MojoExecutionException { super.addDependenciesToClasspath(); + Set modules = new HashSet<>(); + //noinspection SimplifyStreamApiCallChains pluginArtifacts.stream() - .filter(it -> it.getGroupId().startsWith(NativeImageConfigurationUtils.MAVEN_GROUP_ID) || it.getGroupId().startsWith("org.junit")) - .map(it -> it.getFile().toPath()) - .forEach(imageClasspath::add); - findNativePlatformJar().ifPresent(imageClasspath::add); + // do not use peek as Stream implementations are free to discard it + .map(a -> { + modules.add(new Module(a.getGroupId(), a.getArtifactId())); + return a; + }) + .filter(it -> it.getGroupId().startsWith(NativeImageConfigurationUtils.MAVEN_GROUP_ID) || it.getGroupId().startsWith("org.junit")) + .map(it -> it.getFile().toPath()) + .forEach(imageClasspath::add); + var jars = findJunitPlatformNativeJars(modules); + imageClasspath.addAll(jars); } @Override @@ -142,7 +161,7 @@ public void execute() throws MojoExecutionException { systemProperties = new HashMap<>(); } systemProperties.put("junit.platform.listeners.uid.tracking.output.dir", - NativeExtension.testIdsDirectory(outputDirectory.getAbsolutePath())); + NativeExtension.testIdsDirectory(outputDirectory.getAbsolutePath())); imageName = NATIVE_TESTS_EXE; mainClass = "org.graalvm.junit.platform.NativeImageJUnitLauncher"; @@ -248,15 +267,71 @@ private static Stream findFiles(Path dir, String prefix) throws IOExceptio return Stream.empty(); } return Files.find(dir, Integer.MAX_VALUE, - (path, basicFileAttributes) -> (basicFileAttributes.isRegularFile() - && path.getFileName().toString().startsWith(prefix))); + (path, basicFileAttributes) -> (basicFileAttributes.isRegularFile() + && path.getFileName().toString().startsWith(prefix))); } - private static Optional findNativePlatformJar() { + private List findJunitPlatformNativeJars(Set modulesAlreadyOnClasspath) { + RepositorySystemSession repositorySession = mavenSession.getRepositorySession(); + DefaultRepositorySystemSession newSession = new DefaultRepositorySystemSession(repositorySession); + CollectRequest collectRequest = new CollectRequest(); + List repositories = project.getRemoteProjectRepositories(); + collectRequest.setRepositories(repositories); + DefaultArtifact artifact = new DefaultArtifact( + RuntimeMetadata.GROUP_ID, + RuntimeMetadata.JUNIT_PLATFORM_NATIVE_ARTIFACT_ID, + null, + "jar", + RuntimeMetadata.VERSION + ); + Dependency dependency = new Dependency(artifact, "runtime"); + collectRequest.addDependency(dependency); + DependencyRequest dependencyRequest = new DependencyRequest(collectRequest, null); + DependencyResult dependencyResult; try { - return Optional.of(new File(JUnitPlatformFeature.class.getProtectionDomain().getCodeSource().getLocation().toURI()).toPath()); - } catch (URISyntaxException e) { - return Optional.empty(); + dependencyResult = repositorySystem.resolveDependencies(newSession, dependencyRequest); + } catch (DependencyResolutionException e) { + return Collections.emptyList(); + } + return dependencyResult.getArtifactResults() + .stream() + .map(ArtifactResult::getArtifact) + .filter(a -> !modulesAlreadyOnClasspath.contains(new Module(a.getGroupId(), a.getArtifactId()))) + .map(a -> a.getFile().toPath()) + .collect(Collectors.toList()); + } + + private static final class Module { + private final String groupId; + private final String artifactId; + + private Module(String groupId, String artifactId) { + this.groupId = groupId; + this.artifactId = artifactId; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + Module module = (Module) o; + + if (!groupId.equals(module.groupId)) { + return false; + } + return artifactId.equals(module.artifactId); + } + + @Override + public int hashCode() { + int result = groupId.hashCode(); + result = 31 * result + artifactId.hashCode(); + return result; } } } diff --git a/samples/java-application-with-custom-packaging/pom.xml b/samples/java-application-with-custom-packaging/pom.xml index e8b361987..e37f7d6f9 100644 --- a/samples/java-application-with-custom-packaging/pom.xml +++ b/samples/java-application-with-custom-packaging/pom.xml @@ -61,7 +61,7 @@ 3.3.4 org.graalvm.demo.Application netty - 0.10.0 + 0.10.1 diff --git a/samples/java-application-with-custom-tests/gradle.properties b/samples/java-application-with-custom-tests/gradle.properties index e4b758208..d43d7515a 100644 --- a/samples/java-application-with-custom-tests/gradle.properties +++ b/samples/java-application-with-custom-tests/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 junit.jupiter.version = 5.10.0 junit.platform.version = 1.10.0 diff --git a/samples/java-application-with-extra-sourceset/gradle.properties b/samples/java-application-with-extra-sourceset/gradle.properties index e4b758208..d43d7515a 100644 --- a/samples/java-application-with-extra-sourceset/gradle.properties +++ b/samples/java-application-with-extra-sourceset/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 junit.jupiter.version = 5.10.0 junit.platform.version = 1.10.0 diff --git a/samples/java-application-with-reflection/gradle.properties b/samples/java-application-with-reflection/gradle.properties index e4b758208..d43d7515a 100644 --- a/samples/java-application-with-reflection/gradle.properties +++ b/samples/java-application-with-reflection/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 junit.jupiter.version = 5.10.0 junit.platform.version = 1.10.0 diff --git a/samples/java-application-with-reflection/pom.xml b/samples/java-application-with-reflection/pom.xml index 9ab7563cc..b0c29836e 100644 --- a/samples/java-application-with-reflection/pom.xml +++ b/samples/java-application-with-reflection/pom.xml @@ -52,8 +52,8 @@ 1.8 UTF-8 5.10.0 - 0.10.0 - 0.10.0 + 0.10.1 + 0.10.1 example-app org.graalvm.demo.Application diff --git a/samples/java-application-with-resources/gradle.properties b/samples/java-application-with-resources/gradle.properties index e4b758208..d43d7515a 100644 --- a/samples/java-application-with-resources/gradle.properties +++ b/samples/java-application-with-resources/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 junit.jupiter.version = 5.10.0 junit.platform.version = 1.10.0 diff --git a/samples/java-application-with-resources/pom.xml b/samples/java-application-with-resources/pom.xml index 89182ce45..1d6ed0beb 100644 --- a/samples/java-application-with-resources/pom.xml +++ b/samples/java-application-with-resources/pom.xml @@ -51,9 +51,9 @@ 1.8 UTF-8 - 0.10.0 + 0.10.1 5.10.0 - 0.10.0 + 0.10.1 example-app org.graalvm.demo.Application diff --git a/samples/java-application-with-tests/gradle.properties b/samples/java-application-with-tests/gradle.properties index e4b758208..d43d7515a 100644 --- a/samples/java-application-with-tests/gradle.properties +++ b/samples/java-application-with-tests/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 junit.jupiter.version = 5.10.0 junit.platform.version = 1.10.0 diff --git a/samples/java-application-with-tests/pom.xml b/samples/java-application-with-tests/pom.xml index ce700e64f..8f4ad7474 100644 --- a/samples/java-application-with-tests/pom.xml +++ b/samples/java-application-with-tests/pom.xml @@ -52,8 +52,8 @@ 1.8 UTF-8 5.10.0 - 0.10.0 - 0.10.0 + 0.10.1 + 0.10.1 example-app org.graalvm.demo.Application diff --git a/samples/java-application/gradle.properties b/samples/java-application/gradle.properties index e4b758208..d43d7515a 100644 --- a/samples/java-application/gradle.properties +++ b/samples/java-application/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 junit.jupiter.version = 5.10.0 junit.platform.version = 1.10.0 diff --git a/samples/java-application/pom.xml b/samples/java-application/pom.xml index 5265c992f..11ba9ffeb 100644 --- a/samples/java-application/pom.xml +++ b/samples/java-application/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.10.0 - 0.10.0 + 0.10.1 + 0.10.1 example-app org.graalvm.demo.Application diff --git a/samples/java-library/gradle.properties b/samples/java-library/gradle.properties index e4b758208..d43d7515a 100644 --- a/samples/java-library/gradle.properties +++ b/samples/java-library/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 junit.jupiter.version = 5.10.0 junit.platform.version = 1.10.0 diff --git a/samples/java-library/pom.xml b/samples/java-library/pom.xml index 0333cfcec..ba76e3bb2 100644 --- a/samples/java-library/pom.xml +++ b/samples/java-library/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.10.0 - 0.10.0 + 0.10.1 + 0.10.1 java-library diff --git a/samples/kotlin-application-with-tests/gradle.properties b/samples/kotlin-application-with-tests/gradle.properties index e4b758208..d43d7515a 100644 --- a/samples/kotlin-application-with-tests/gradle.properties +++ b/samples/kotlin-application-with-tests/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 junit.jupiter.version = 5.10.0 junit.platform.version = 1.10.0 diff --git a/samples/metadata-repo-integration/gradle.properties b/samples/metadata-repo-integration/gradle.properties index f3c020c0f..e31af86b5 100644 --- a/samples/metadata-repo-integration/gradle.properties +++ b/samples/metadata-repo-integration/gradle.properties @@ -1,4 +1,4 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 h2.version = 2.2.220 netty.version = 4.1.80.Final logback.version = 1.4.4 diff --git a/samples/metadata-repo-integration/pom.xml b/samples/metadata-repo-integration/pom.xml index 23432e7e4..693457159 100644 --- a/samples/metadata-repo-integration/pom.xml +++ b/samples/metadata-repo-integration/pom.xml @@ -51,11 +51,11 @@ 1.8 UTF-8 - 0.10.0 - 0.10.0 + 0.10.1 + 0.10.1 2.2.220 4.1.80.Final - 1.4.4 + 1.4.12 2.19.0 2.0.3 diff --git a/samples/multi-project-with-tests/gradle.properties b/samples/multi-project-with-tests/gradle.properties index e4b758208..d43d7515a 100644 --- a/samples/multi-project-with-tests/gradle.properties +++ b/samples/multi-project-with-tests/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 junit.jupiter.version = 5.10.0 junit.platform.version = 1.10.0 diff --git a/samples/multi-project-with-tests/pom.xml b/samples/multi-project-with-tests/pom.xml index 23f17c6c8..a279bbeca 100644 --- a/samples/multi-project-with-tests/pom.xml +++ b/samples/multi-project-with-tests/pom.xml @@ -58,8 +58,8 @@ 1.8 UTF-8 5.10.0 - 0.10.0 - 0.10.0 + 0.10.1 + 0.10.1 example-app org.graalvm.demo.Application diff --git a/samples/native-config-integration/gradle.properties b/samples/native-config-integration/gradle.properties index e4b758208..d43d7515a 100644 --- a/samples/native-config-integration/gradle.properties +++ b/samples/native-config-integration/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.10.0 +native.gradle.plugin.version = 0.10.1 junit.jupiter.version = 5.10.0 junit.platform.version = 1.10.0 diff --git a/samples/native-config-integration/pom.xml b/samples/native-config-integration/pom.xml index e2417ecfe..35f822986 100644 --- a/samples/native-config-integration/pom.xml +++ b/samples/native-config-integration/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.10.0 - 0.10.0 + 0.10.1 + 0.10.1 example-app org.graalvm.example.Application