Removed leftover codes, adjusted commends, and reverted unwanted codes

Author: Sajeer

.github/workflows/gradle.yml

@@ -18,7 +18,7 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [25.0.0.10]
+        RUNTIME_VERSION: [25.0.0.12]
         java: [21, 17, 25]
         exclude:
         - java: 8
@@ -102,7 +102,7 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [25.0.0.10]
+        RUNTIME_VERSION: [25.0.0.12]
         java: [21, 17, 25]
         exclude:
         - java: 8

build.gradle

@@ -87,15 +87,15 @@ compileTestGroovy {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-// In-order to support both Java 17 and Java 21, we configure the toolchain
+// In-order to support both Java 17, Java 21 and Java 25, we configure the toolchain
 // Reference: https://docs.gradle.org/current/userguide/toolchains.html
 java {
     toolchain {
         // Default to Java 17 for backward compatibility
         languageVersion = JavaLanguageVersion.of(17)
 
-        // Allow Java 21 as a compatible alternative
-        // This enables the project to work with either Java 17 or Java 21
+        // Allow Java 21 or Java 25 as a compatible alternative
+        // This enables the project to work with either Java 17, Java 21 or Java 25
         if (System.getProperty('java.version').startsWith('21')) {
             languageVersion = JavaLanguageVersion.of(21)
         }

src/main/groovy/io/openliberty/tools/gradle/tasks/AbstractServerTask.groovy

@@ -1329,13 +1329,7 @@ abstract class AbstractServerTask extends AbstractLibertyTask {
     protected void addToolchainEnvToServerTask(ServerTask serverTask) {
         Map<String, String> envVars = getToolchainEnvVar();
         if (!envVars.isEmpty()) {
-            if (serverTask.getEnvironmentVariables() != null && !serverTask.getEnvironmentVariables().isEmpty()) {
-                Map<String, String> mergedEnv = new HashMap<>(serverTask.getEnvironmentVariables());
-                mergedEnv.putAll(envVars);
-                serverTask.setEnvironmentVariables(mergedEnv);
-            } else {
-                serverTask.setEnvironmentVariables(envVars);
-            }
+            serverTask.setEnvironmentVariables(envVars);
         }
     }
 

src/main/groovy/io/openliberty/tools/gradle/tasks/StopTask.groovy

@@ -33,7 +33,7 @@ class StopTask extends AbstractServerTask {
     void stop() {
         File serverDir = getServerDir(project)
 
-        ServerUtils.cleanupForceStoppedMarker(getServerDir(project), logger)
+        ServerUtils.cleanupForceStoppedMarker(serverDir, logger)
 
         if (isLibertyInstalledAndValid(project)) {
             if (serverDir.exists()) {

src/test/groovy/io/openliberty/tools/gradle/TestLooseApplicationWithToolchain.groovy

@@ -40,7 +40,7 @@ public class TestLooseApplicationWithToolchain extends AbstractIntegrationTest{
     @Test
     public void test_loose_config_file_exists() {
         try {
-            result = runTasksResult(buildDir, 'deploy', 'deploy', '--info', '--stacktrace')
+            result = runTasksResult(buildDir, 'deploy', '--info', '--stacktrace')
         } catch (Exception e) {
             throw new AssertionError ("Fail on task deploy.", e)
         }