Merge pull request #34078 from jhanders34/branch4

Simplify com.ibm.ws.kernel.boot build.gradle file

Author: jhanders34

dev/com.ibm.ws.kernel.boot/build.gradle

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2025 IBM Corporation and others.
+ * Copyright (c) 2025, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -20,69 +20,49 @@ def commonOptionsFile = project.file("${sourceJavaOptionsFilesDirectory}/common_
 def lineSeparator = System.getProperty("line.separator")
 
 /*
- * Delete any existing java options files in wlp/lib/platform/java directory
- */
-task deleteJavaOptionsFiles(type: Delete) {
-  delete fileTree(dir: buildImage.file("${destinationJavaOptionsFilesDirectory}"), include: '**/java*.options')
-}
-
-/*
- * Create java options files in wlp/lib/platform/java directory
+ * Build java9 and java24 options files in wlp/lib/platform/java directory
+ *
+ * Build the java9.options file by taking the contents of the extra_java_9_23.options
+ * file and appending the contents of the common_java.options file
+ *
+ * Build the java24.options file by appending the contents of the common_java.options file
  */
-task createJavaOptionsFiles(type: Copy) {
-  dependsOn deleteJavaOptionsFiles
+task buildJavaOptionsFiles(type: Copy) {
   doFirst {
-  if (!buildImage.file("${destinationJavaOptionsFilesDirectory}").exists()) {
+    if (!buildImage.file("${destinationJavaOptionsFilesDirectory}").exists()) {
       mkdir buildImage.file("${destinationJavaOptionsFilesDirectory}")
     }
   }
   from project.file("${sourceJavaOptionsFilesDirectory}")
   into buildImage.file("${destinationJavaOptionsFilesDirectory}")
   include 'java*.options'
-}
-
-/*
- * Build the java9.options file by taking the contents of the extra_java_9_23.options
- * file and appending the contents of the common_java.options file
- */
-task buildJava9OptionsFile() {
-  dependsOn createJavaOptionsFiles
   doLast {
-    def optionsFile = buildImage.file("${destinationJavaOptionsFilesDirectory}/${java9OptionsFile}")
+    def options9File = buildImage.file("${destinationJavaOptionsFilesDirectory}/${java9OptionsFile}")
 
     // Before appending the extra_java_9_23.options file contents,
     // insert a line separator if the file doesn't already end with one
-    if (optionsFile.text && !optionsFile.text.endsWith(lineSeparator)) {
-      optionsFile.append(lineSeparator + java9Through23OptionsFile.text)
+    if (options9File.text && !options9File.text.endsWith(lineSeparator)) {
+      options9File.append(lineSeparator + java9Through23OptionsFile.text)
     } else {
-      optionsFile.append(java9Through23OptionsFile.text)
+      options9File.append(java9Through23OptionsFile.text)
     }
 
     // Before appending the common_java.options file contents,
     // insert a line separator if the file doesn't already end with one
-    if (optionsFile.text && !optionsFile.text.endsWith(lineSeparator)) {
-      optionsFile.append(lineSeparator + commonOptionsFile.text)
+    if (options9File.text && !options9File.text.endsWith(lineSeparator)) {
+      options9File.append(lineSeparator + commonOptionsFile.text)
     } else {
-      optionsFile.append(commonOptionsFile.text)
+      options9File.append(commonOptionsFile.text)
     }
-  }
-}
 
-
-/*
- * Build the java24.options file by appending the contents of the common_java.options file
- */
-task buildJava24OptionsFile() {
-  dependsOn buildJava9OptionsFile
-  doLast {
-    def optionsFile = buildImage.file("${destinationJavaOptionsFilesDirectory}/${java24OptionsFile}")
+    def options24File = buildImage.file("${destinationJavaOptionsFilesDirectory}/${java24OptionsFile}")
 
     // Before appending the common_java.options file contents,
     // insert a line separator if the file doesn't already end with one
-    if (optionsFile.text && !optionsFile.text.endsWith(lineSeparator)) {
-      optionsFile.append(lineSeparator + commonOptionsFile.text)
+    if (options24File.text && !options24File.text.endsWith(lineSeparator)) {
+      options24File.append(lineSeparator + commonOptionsFile.text)
     } else {
-      optionsFile.append(commonOptionsFile.text)
+      options24File.append(commonOptionsFile.text)
     }
   }
 }
@@ -91,4 +71,4 @@ task buildJava24OptionsFile() {
 /******************************************************************
  ** Create and populate java option files
  ******************************************************************/
-assemble.dependsOn buildJava24OptionsFile
+assemble.dependsOn buildJavaOptionsFiles