removing runtime code to add foojay plugin to settings.gradle

venmanyarun · venmanyarun · commit 164c0e398430 · 2026-01-23T09:47:05.000+05:30
diff --git a/src/test/groovy/io/openliberty/tools/gradle/AbstractIntegrationTest.groovy b/src/test/groovy/io/openliberty/tools/gradle/AbstractIntegrationTest.groovy
@@ -16,10 +16,6 @@
 
 package io.openliberty.tools.gradle
 
-import java.io.File
-
-import java.util.List
-import java.util.ArrayList
 
 import static org.junit.Assert.*
 
@@ -28,7 +24,7 @@ import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 import static org.gradle.testkit.runner.TaskOutcome.UP_TO_DATE
-import org.gradle.api.GradleException
+
 import io.openliberty.tools.common.plugins.util.OSUtil
 
 abstract class AbstractIntegrationTest {
@@ -249,15 +245,6 @@ abstract class AbstractIntegrationTest {
         return false;
     }
 
-    protected static void addToolchainJdkDownloadPluginToSettings(File settingsFile) {
-        // 1. Define the plugin block to download toolchain jdk
-        String toolchainPlugin = """plugins {id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'}"""
-        // 2. Read existing content (if any) and write the new content at the start
-        String existingContent = settingsFile.exists() ? settingsFile.text : ""
-        settingsFile.text = toolchainPlugin + existingContent
-    }
-
-
     protected static void assertToolchainLogsForTask(BuildResult result, String task, String jdkVersion, File messageLog) {
         String consoleLogOutput = result.getOutput()
         if (messageLog != null) {
diff --git a/src/test/groovy/io/openliberty/tools/gradle/LibertyApplicationConfigurationIncludeWithToolchainTest.groovy b/src/test/groovy/io/openliberty/tools/gradle/LibertyApplicationConfigurationIncludeWithToolchainTest.groovy
@@ -41,7 +41,6 @@ class LibertyApplicationConfigurationIncludeWithToolchainTest extends AbstractIn
     public static void setup() {
         createDir(buildDir)
         createTestProject(buildDir, resourceDir, buildFilename)
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir,"settings.gradle"))
         try {
             //Installing the war built by the other gradle project in the src dir
             runTasks(new File(buildDir, 'test-maven-war'), 'publishToMavenLocal')
diff --git a/src/test/groovy/io/openliberty/tools/gradle/LibertyPackage_looseApplication_withToolchainTest.groovy b/src/test/groovy/io/openliberty/tools/gradle/LibertyPackage_looseApplication_withToolchainTest.groovy
@@ -35,7 +35,6 @@ class LibertyPackage_looseApplication_withToolchainTest extends AbstractIntegrat
         createDir(buildDir)
         copyBuildFiles(buildFilename, buildDir)
         copySettingsFile(resourceDir, buildDir)
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))
         try {
             BuildResult result= runTasksResult(buildDir, 'installLiberty', 'libertyStart', 'libertyStop')
             String consoleLogOutput = result.getOutput();
diff --git a/src/test/groovy/io/openliberty/tools/gradle/LibertyToolchainJdk8FailTest.groovy b/src/test/groovy/io/openliberty/tools/gradle/LibertyToolchainJdk8FailTest.groovy
@@ -38,7 +38,6 @@ class LibertyToolchainJdk8FailTest extends AbstractIntegrationTest {
     public static void setup() {
         createDir(buildDir)
         createTestProject(buildDir, resourceDir, buildFilename)
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))
         try {
             runTasks(buildDir, 'installLiberty')
         } catch (Exception e) {
diff --git a/src/test/groovy/io/openliberty/tools/gradle/LibertyToolchainTest.groovy b/src/test/groovy/io/openliberty/tools/gradle/LibertyToolchainTest.groovy
@@ -34,7 +34,6 @@ class LibertyToolchainTest extends AbstractIntegrationTest{
     public static void setup() {
         createDir(buildDir)
         createTestProject(buildDir, resourceDir, buildFilename)
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir,"settings.gradle"))
         try {
             runTasks(buildDir, 'installLiberty')
         } catch (Exception e) {
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestCompileJSPSource17.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestCompileJSPSource17.groovy
@@ -30,8 +30,6 @@ public class TestCompileJSPSource17 extends AbstractIntegrationTest{
     public static void setup() {
         createDir(buildDir)
         createTestProject(buildDir, resourceDir, buildFilename)
-        // needed to add a plugin to download jdk for toolchain into settings.gradle
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, 'settings.gradle'))
         runTasks(buildDir, 'installFeature')
         runTasks(buildDir, 'compileJsp')
     }
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForCustomServerEnvFile.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForCustomServerEnvFile.groovy
@@ -31,7 +31,6 @@ public class TestLooseApplicationToolchainWarningForCustomServerEnvFile extends
         def escapedJavaHome = javaHome.replace("\\", "\\\\")
         String toolchainPlugin = "JAVA_HOME=" + escapedJavaHome
         serverEnvFile.append(toolchainPlugin)
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))
     }
 
     @AfterClass
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForJvmOptions.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForJvmOptions.groovy
@@ -31,7 +31,6 @@ public class TestLooseApplicationToolchainWarningForJvmOptions extends AbstractI
         def escapedJavaHome = javaHome.replace("\\", "\\\\")
         String toolchainPlugin = "-Djava.home=" + escapedJavaHome
         jvmOptionsFile.append(System.lineSeparator() + toolchainPlugin)
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))
     }
 
     @AfterClass
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForJvmOptionsInline.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForJvmOptionsInline.groovy
@@ -32,7 +32,6 @@ public class TestLooseApplicationToolchainWarningForJvmOptionsInline extends Abs
         def fileContent = buildFile.text
         fileContent = fileContent.replace("REPLACE_JDK_PATH", escapedJavaHome) // Literal replacement
         buildFile.text = fileContent
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))
     }
 
     @AfterClass
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForJvmOptionsProperty.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForJvmOptionsProperty.groovy
@@ -30,7 +30,6 @@ public class TestLooseApplicationToolchainWarningForJvmOptionsProperty extends A
         def javaHome = Paths.get(System.getenv("JAVA_HOME")).toString()
         def escapedJavaHome = javaHome.replace("\\", "\\\\")
         buildFile.append("liberty.server.jvmOptions=[\"-Djava.home="+escapedJavaHome+"\"]")
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))
     }
 
     @AfterClass
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForMergeServerEnv.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForMergeServerEnv.groovy
@@ -33,7 +33,6 @@ public class TestLooseApplicationToolchainWarningForMergeServerEnv extends Abstr
         String toolchainPlugin = nl + "JAVA_HOME=" + escapedJavaHome
 
         serverEnvFile.append(toolchainPlugin)
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))
     }
 
     @AfterClass
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForServerEnv.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForServerEnv.groovy
@@ -32,7 +32,6 @@ public class TestLooseApplicationToolchainWarningForServerEnv extends AbstractIn
         def escapedJavaHome = javaHome.replace("\\", "\\\\")
         String toolchainPlugin = "JAVA_HOME=" + escapedJavaHome
         serverEnvFile.append(toolchainPlugin)
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))
     }
 
     @AfterClass
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForServerEnvInline.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForServerEnvInline.groovy
@@ -31,7 +31,6 @@ public class TestLooseApplicationToolchainWarningForServerEnvInline extends Abst
         def fileContent = buildFile.text
         fileContent = fileContent.replace("REPLACE_JDK_PATH", escapedJavaHome) // Literal replacement
         buildFile.text = fileContent
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))
     }
 
     @AfterClass
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForServerEnvProperty.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationToolchainWarningForServerEnvProperty.groovy
@@ -29,7 +29,6 @@ public class TestLooseApplicationToolchainWarningForServerEnvProperty extends Ab
         def javaHome = Paths.get(System.getenv("JAVA_HOME")).toString()
         def escapedJavaHome = javaHome.replace("\\", "\\\\")
         buildFile.append("liberty.server.env={\"JAVA_HOME\":\""+escapedJavaHome+"\"}")
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))
     }
 
     @AfterClass
diff --git a/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationWithToolchain.groovy b/src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationWithToolchain.groovy
@@ -28,7 +28,6 @@ public class TestLooseApplicationWithToolchain extends AbstractIntegrationTest{
     public static void setup() {
         createDir(buildDir)
         createTestProject(buildDir, resourceDir, buildFilename)
-        addToolchainJdkDownloadPluginToSettings(new File(buildDir, 'settings.gradle'))
     }
 
     @AfterClass
diff --git a/src/test/resources/app-configuration-include-test/settings.gradle b/src/test/resources/app-configuration-include-test/settings.gradle
@@ -1 +1 @@
-//Empty
+plugins {id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'}
diff --git a/src/test/resources/basic-toolchain-project-fail-on-java8/settings.gradle b/src/test/resources/basic-toolchain-project-fail-on-java8/settings.gradle
@@ -0,0 +1 @@
+plugins {id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'}
diff --git a/src/test/resources/liberty-package-test/settings.gradle b/src/test/resources/liberty-package-test/settings.gradle
@@ -1 +1 @@
-//Empty
+plugins {id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'}
diff --git a/src/test/resources/liberty-test/settings.gradle b/src/test/resources/liberty-test/settings.gradle
@@ -1 +1 @@
-//Empty
+plugins {id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'}
diff --git a/src/test/resources/sample.servlet/settings.gradle b/src/test/resources/sample.servlet/settings.gradle
@@ -7,7 +7,7 @@
  * Detailed information about configuring a multi-project build in Gradle can be found
  * in the user guide at https://docs.gradle.org/3.5/userguide/multi_project_builds.html
  */
-
+plugins {id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'}
 /*
 // To declare projects as part of a multi-project build use the 'include' method
 include 'shared'
diff --git a/src/test/resources/sampleJSP.servlet/settings.gradle b/src/test/resources/sampleJSP.servlet/settings.gradle
@@ -14,5 +14,5 @@ include 'shared'
 include 'api'
 include 'services:webservice'
 */
-
+plugins {id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'}
 rootProject.name = 'sampleJSP.servlet'

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ public class TestCompileJSPSource17 extends AbstractIntegrationTest{`
`30`	`30`	`public static void setup() {`
`31`	`31`	`createDir(buildDir)`
`32`	`32`	`createTestProject(buildDir, resourceDir, buildFilename)`
`33`		`- // needed to add a plugin to download jdk for toolchain into settings.gradle`
`34`		`- addToolchainJdkDownloadPluginToSettings(new File(buildDir, 'settings.gradle'))`
`35`	`33`	`runTasks(buildDir, 'installFeature')`
`36`	`34`	`runTasks(buildDir, 'compileJsp')`
`37`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ public class TestLooseApplicationToolchainWarningForCustomServerEnvFile extends`
`31`	`31`	`def escapedJavaHome = javaHome.replace("\\", "\\\\")`
`32`	`32`	`String toolchainPlugin = "JAVA_HOME=" + escapedJavaHome`
`33`	`33`	`serverEnvFile.append(toolchainPlugin)`
`34`		`- addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`@AfterClass`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ public class TestLooseApplicationToolchainWarningForJvmOptionsInline extends Abs`
`32`	`32`	`def fileContent = buildFile.text`
`33`	`33`	`fileContent = fileContent.replace("REPLACE_JDK_PATH", escapedJavaHome) // Literal replacement`
`34`	`34`	`buildFile.text = fileContent`
`35`		`- addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`@AfterClass`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ public class TestLooseApplicationToolchainWarningForJvmOptionsProperty extends A`
`30`	`30`	`def javaHome = Paths.get(System.getenv("JAVA_HOME")).toString()`
`31`	`31`	`def escapedJavaHome = javaHome.replace("\\", "\\\\")`
`32`	`32`	`buildFile.append("liberty.server.jvmOptions=[\"-Djava.home="+escapedJavaHome+"\"]")`
`33`		`- addToolchainJdkDownloadPluginToSettings(new File(buildDir, "settings.gradle"))`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`@AfterClass`