From cc8e091058827faddcfec1d2bf0cba2dafbb467b Mon Sep 17 00:00:00 2001
From: loi <loi@ipac.caltech.edu>
Date: Fri, 26 Sep 2025 11:00:39 -0700
Subject: [PATCH] FIREFLY-1836: tomcat-upgrade

---
 build.gradle      | 30 +-----------------------------
 gradle.properties |  1 +
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/build.gradle b/build.gradle
index 917db49..9e3f193 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,5 @@
-import java.nio.file.*;
-
 ext.fireflyPath = "$rootDir.path/../firefly/"
+apply from: "$fireflyPath/buildScript/base.gincl"
 
 if (!file(fireflyPath).exists()) {
   println ">> Firefly repository not found. Cloning it now.  This will take a few minutes..."
@@ -10,36 +9,9 @@ if (!file(fireflyPath).exists()) {
   }
 }
 
-allprojects {
-  defaultTasks 'preselect'
-}
-
 subprojects {
   apply plugin: "java"
   apply from: "$rootDir.path/buildScript/global.gincl"
   apply from: "$fireflyPath/buildScript/global.gincl"
   apply from: "$fireflyPath/buildScript/tasks.gincl"
 }
-
-task purge {
-  description= 'Removes all build files from this project, including node_module.'
-  doLast {
-    println('Removing build directories.')
-    delete "${rootDir}/build", "${rootDir}/jars/build", "${rootDir}/node_modules"
-    Files.delete(Paths.get("${rootDir}/yarn.lock"));
-    Files.delete(Paths.get("${rootDir}/package.json"));
-    Files.delete(Paths.get("${rootDir}/config/test"));
-  }
-}
-
-task clean {
-  description= 'Removes all build files except node_module(installed JS libraries).'
-  doLast {
-    println('Removing all build directories.')
-    delete "${rootDir}/build", "${rootDir}/jars/build"
-  }
-}
-
-task preselect {
-  description= 'A placeholder task to designate the task to run for each project.  Similar to defaultTasks.'
-}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 033fd72..16e08d8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xms256m -Xmx2048m
+org.gradle.daemon=false