#2991 Upgrade Gradle to version 7.6.3:

- corrected build.gradle;
SCADA-LTS · Sep 10, 2024 · 5beb0c5 · 5beb0c5
1 parent 817a592
commit 5beb0c5
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -105,7 +105,13 @@ task existsScadaLTSWarFile {
     }
 }
 
-task deployTomcat(type: Copy, dependsOn: existsScadaLTSWarFile) {
+task deployTomcat(type: Copy, dependsOn: [war, existsScadaLTSWarFile]) {
+    from "build/libs/"
+    into System.getenv("CATALINA_HOME")+ "/webapps"
+    include('Scada-LTS.war')
+}
+
+task deployTomcatDev(type: Copy, dependsOn: [warDev, existsScadaLTSWarFile]) {
     from "build/libs/"
     into System.getenv("CATALINA_HOME")+ "/webapps"
     include('Scada-LTS.war')
@@ -154,15 +160,15 @@ task buildRunDebug(type: GradleBuild) {
 }
 
 task buildRunDebugDev(type: GradleBuild) {
-    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'warDev', 'deployTomcat', 'runDebug']
+    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'warDev', 'deployTomcatDev', 'runDebug']
 }
 
 task buildRunDebugProd(type: GradleBuild) {
     tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'war', 'deployTomcat', 'runDebug']
 }
 
 task buildRunDebugDevTestUi(type: GradleBuild) {
-    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'testUi', 'warDev', 'deployTomcat', 'runDebug']
+    tasks = ['clearTomcat', 'clearProject', 'installWebDependency', 'test', 'testUi', 'warDev', 'deployTomcatDev', 'runDebug']
 }
 
 task buildRunDebugProdTestUi(type: GradleBuild) {