From f47d274b003dd52bfcd23b673110509c7bcf48ec Mon Sep 17 00:00:00 2001 From: David Nestorovic Date: Wed, 24 Jan 2024 11:37:13 +0100 Subject: [PATCH 1/2] Bump repository version to 0.10.0 and update samples --- gradle/libs.versions.toml | 2 +- native-maven-plugin/reproducers/issue-144/pom.xml | 4 ++-- samples/java-application-with-custom-packaging/pom.xml | 2 +- samples/java-application-with-custom-tests/gradle.properties | 2 +- .../java-application-with-extra-sourceset/gradle.properties | 2 +- samples/java-application-with-reflection/gradle.properties | 2 +- samples/java-application-with-reflection/pom.xml | 4 ++-- samples/java-application-with-resources/gradle.properties | 2 +- samples/java-application-with-resources/pom.xml | 4 ++-- samples/java-application-with-tests/gradle.properties | 2 +- samples/java-application-with-tests/pom.xml | 4 ++-- samples/java-application/gradle.properties | 2 +- samples/java-application/pom.xml | 4 ++-- samples/java-library/gradle.properties | 2 +- samples/java-library/pom.xml | 4 ++-- samples/kotlin-application-with-tests/gradle.properties | 2 +- samples/metadata-repo-integration/gradle.properties | 2 +- samples/metadata-repo-integration/pom.xml | 4 ++-- samples/multi-project-with-tests/gradle.properties | 2 +- samples/multi-project-with-tests/pom.xml | 4 ++-- samples/native-config-integration/gradle.properties | 2 +- samples/native-config-integration/pom.xml | 4 ++-- 22 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c7af45952..df881c7b8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # Project versions -nativeBuildTools = "0.9.29-SNAPSHOT" +nativeBuildTools = "0.10.0" metadataRepository = "0.3.6" # External dependencies diff --git a/native-maven-plugin/reproducers/issue-144/pom.xml b/native-maven-plugin/reproducers/issue-144/pom.xml index 5cbfe0adb..7fada5f07 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.9.29-SNAPSHOT - 0.9.29-SNAPSHOT + 0.10.0 + 0.10.0 example-app org.graalvm.demo.Application diff --git a/samples/java-application-with-custom-packaging/pom.xml b/samples/java-application-with-custom-packaging/pom.xml index 5adaf22b7..e8b361987 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.9.29-SNAPSHOT + 0.10.0 diff --git a/samples/java-application-with-custom-tests/gradle.properties b/samples/java-application-with-custom-tests/gradle.properties index a7a3f52bb..e4b758208 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.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 a7a3f52bb..e4b758208 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.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 a7a3f52bb..e4b758208 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.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 81907c89f..9ab7563cc 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.9.29-SNAPSHOT - 0.9.29-SNAPSHOT + 0.10.0 + 0.10.0 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 a7a3f52bb..e4b758208 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.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 721eab704..89182ce45 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.9.29-SNAPSHOT + 0.10.0 5.10.0 - 0.9.29-SNAPSHOT + 0.10.0 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 a7a3f52bb..e4b758208 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.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 f7d308ef6..ce700e64f 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.9.29-SNAPSHOT - 0.9.29-SNAPSHOT + 0.10.0 + 0.10.0 example-app org.graalvm.demo.Application diff --git a/samples/java-application/gradle.properties b/samples/java-application/gradle.properties index a7a3f52bb..e4b758208 100644 --- a/samples/java-application/gradle.properties +++ b/samples/java-application/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 09d04c89c..5265c992f 100644 --- a/samples/java-application/pom.xml +++ b/samples/java-application/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.9.29-SNAPSHOT - 0.9.29-SNAPSHOT + 0.10.0 + 0.10.0 example-app org.graalvm.demo.Application diff --git a/samples/java-library/gradle.properties b/samples/java-library/gradle.properties index a7a3f52bb..e4b758208 100644 --- a/samples/java-library/gradle.properties +++ b/samples/java-library/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 af547e67c..0333cfcec 100644 --- a/samples/java-library/pom.xml +++ b/samples/java-library/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.9.29-SNAPSHOT - 0.9.29-SNAPSHOT + 0.10.0 + 0.10.0 java-library diff --git a/samples/kotlin-application-with-tests/gradle.properties b/samples/kotlin-application-with-tests/gradle.properties index a7a3f52bb..e4b758208 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.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 ab888eb97..f3c020c0f 100644 --- a/samples/metadata-repo-integration/gradle.properties +++ b/samples/metadata-repo-integration/gradle.properties @@ -1,4 +1,4 @@ -native.gradle.plugin.version = 0.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 e369b66d8..23432e7e4 100644 --- a/samples/metadata-repo-integration/pom.xml +++ b/samples/metadata-repo-integration/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.9.29-SNAPSHOT - 0.9.29-SNAPSHOT + 0.10.0 + 0.10.0 2.2.220 4.1.80.Final 1.4.4 diff --git a/samples/multi-project-with-tests/gradle.properties b/samples/multi-project-with-tests/gradle.properties index a7a3f52bb..e4b758208 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.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 e37af71e1..23f17c6c8 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.9.29-SNAPSHOT - 0.9.29-SNAPSHOT + 0.10.0 + 0.10.0 example-app org.graalvm.demo.Application diff --git a/samples/native-config-integration/gradle.properties b/samples/native-config-integration/gradle.properties index a7a3f52bb..e4b758208 100644 --- a/samples/native-config-integration/gradle.properties +++ b/samples/native-config-integration/gradle.properties @@ -1,3 +1,3 @@ -native.gradle.plugin.version = 0.9.29-SNAPSHOT +native.gradle.plugin.version = 0.10.0 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 e58531198..e2417ecfe 100644 --- a/samples/native-config-integration/pom.xml +++ b/samples/native-config-integration/pom.xml @@ -51,8 +51,8 @@ 1.8 UTF-8 - 0.9.29-SNAPSHOT - 0.9.29-SNAPSHOT + 0.10.0 + 0.10.0 example-app org.graalvm.example.Application From d2072ea5601da492037b30d9b18fe4e779de7c02 Mon Sep 17 00:00:00 2001 From: Cedric Champeau Date: Fri, 2 Feb 2024 15:44:02 +0100 Subject: [PATCH 2/2] Fix test so that it doesn't actually try to reach remote This has a side effect if the metadata repo is actually published. --- .../graalvm/buildtools/gradle/NativeImagePluginTest.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)