From e599ed01c964761fc87f7b03885f95e9b7f93302 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Fri, 14 Feb 2020 10:56:28 +0100 Subject: [PATCH] Allow Gradle tasks to be executed with a custom Java home See gh-20179 --- .../boot/build/ConventionsPlugin.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java index b4d52314335..278ccb280c4 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java @@ -127,14 +127,27 @@ public class ConventionsPlugin implements Plugin { project.setProperty("sourceCompatibility", "1.8"); project.getTasks().withType(JavaCompile.class, (compile) -> { compile.getOptions().setEncoding("UTF-8"); + if (hasCustomBuildJavaHome(project)) { + String javaExecutable = getCustomBuildJavaExecutable(project, "/bin/java"); + compile.getOptions().getForkOptions().setJavaHome(new File(javaExecutable)); + } List args = compile.getOptions().getCompilerArgs(); if (!args.contains("-parameters")) { args.add("-parameters"); } }); - project.getTasks().withType(Javadoc.class, - (javadoc) -> javadoc.getOptions().source("1.8").encoding("UTF-8")); + project.getTasks().withType(Javadoc.class, (javadoc) -> { + javadoc.getOptions().source("1.8").encoding("UTF-8"); + if (hasCustomBuildJavaHome(project)) { + String javaExecutable = getCustomBuildJavaExecutable(project, "/bin/javadoc"); + javadoc.setExecutable(javaExecutable); + } + }); project.getTasks().withType(Test.class, (test) -> { + if (hasCustomBuildJavaHome(project)) { + String javaExecutable = getCustomBuildJavaExecutable(project, "/bin/java"); + test.setExecutable(javaExecutable); + } test.useJUnitPlatform(); test.setMaxHeapSize("1024M"); }); @@ -192,6 +205,14 @@ public class ConventionsPlugin implements Plugin { return legalFile; } + private boolean hasCustomBuildJavaHome(Project project) { + return project.hasProperty("buildJavaHome") && !((String) project.property("buildJavaHome")).isEmpty(); + } + + private String getCustomBuildJavaExecutable(Project project, String executable) { + return project.property("buildJavaHome") + executable; + } + private void configureSpringJavaFormat(Project project) { project.getPlugins().apply(SpringJavaFormatPlugin.class); project.getTasks().withType(FormatTask.class, (formatTask) -> formatTask.setEncoding("UTF-8"));