[lucene] branch main updated: LUCENE-9448, LUCENE-9990: fix Luke's launcher task.

[dw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/main by this push:
     new de45b68  LUCENE-9448, LUCENE-9990: fix Luke's launcher task.
de45b68 is described below

commit de45b68c909815ce5ea7b6b9e1a2ce3375b6334d
Author: Dawid Weiss <da...@carrotsearch.com>
AuthorDate: Thu Sep 16 08:49:26 2021 +0200

    LUCENE-9448, LUCENE-9990: fix Luke's launcher task.
---
 gradle/testing/alternative-jdk-support.gradle | 1 +
 lucene/luke/build.gradle                      | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gradle/testing/alternative-jdk-support.gradle b/gradle/testing/alternative-jdk-support.gradle
index d12a39d..d4ab22a 100644
--- a/gradle/testing/alternative-jdk-support.gradle
+++ b/gradle/testing/alternative-jdk-support.gradle
@@ -85,5 +85,6 @@ if (jvmGradle != jvmCurrent) {
 }
 
 // Set up root project's properties.
+rootProject.ext.runtimeJavaExecutable = jvmCurrent.javaExecutable
 rootProject.ext.runtimeJavaHome = jvmCurrent.javaHome
 rootProject.ext.runtimeJavaVersion = jvmDetector.getMetadata(jvmCurrent.javaHome).languageVersion
diff --git a/lucene/luke/build.gradle b/lucene/luke/build.gradle
index 9507638..5f6e163 100644
--- a/lucene/luke/build.gradle
+++ b/lucene/luke/build.gradle
@@ -133,13 +133,8 @@ task run() {
 
   doFirst {
     logger.lifecycle("Launching Luke ${project.version} right now...")
-    def javaExecutable = {
-      def registry = project.extensions.getByType(JavaInstallationRegistry)
-      def currentJvm = registry.installationForCurrentVirtualMachine.get()
-      currentJvm.getJavaExecutable().asFile
-    }()
     ant.exec(
-        executable: javaExecutable,
+        executable: rootProject.ext.runtimeJavaExecutable,
         spawn: true,
         vmlauncher: true
     ) {