Issue 53067: Update gradle plugins version for better npm task behavior (#1118)

Author: labkey-susanh

gradle.properties

@@ -12,7 +12,7 @@ org.gradle.parallel=true
 # (this could be memory-intensive)
 org.gradle.workers.max=3
 # Default to using 2GB of memory for the JVM.
-org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx2048m -XX:+UseParallelGC -Dfile.encoding=UTF-8
 # Uncomment to restrict the number of concurrent npm build tasks. Useful for systems with limited resources.
 #npmRunLimit=2
 
@@ -59,7 +59,7 @@ windowsProteomicsBinariesVersion=1.0
 # The current version numbers for the gradle plugins.
 artifactoryPluginVersion=5.2.5
 gradleNodePluginVersion=7.1.0
-gradlePluginsVersion=6.2.0
+gradlePluginsVersion=6.3.0
 owaspDependencyCheckPluginVersion=12.1.3
 versioningPluginVersion=1.1.2
 

gradle/settings/all.gradle

@@ -24,7 +24,7 @@ buildscript {
         {
             mavenLocal()
             maven {
-                url "${artifactory_contextUrl}/plugins-snapshot-local"
+                url = "${artifactory_contextUrl}/plugins-snapshot-local"
                 mavenContent {
                     snapshotsOnly()
                 }

server/build.gradle

@@ -191,6 +191,7 @@ project.tasks.register("reportVersionToTeamCity", DefaultTask) {
             println "##teamcity[setParameter name='labkey.version' value='${labkeyVersion}']"
         })
 }
+
 if (project.hasProperty("teamcity"))
 {
     project.tasks.named('stageApp').configure { dependsOn(project.tasks.named('reportVersionToTeamCity')) }
@@ -210,14 +211,11 @@ else
             task.description = "Copy dependencies required for JSP dynamic compiling"
             task.into project.rootProject.layout.buildDirectory.dir("jspRecompiling")
             task.from project.configurations.recompilingJsp
-            task.mustRunAfter(cleanJspRecompileSetup)
+            task.dependsOn(cleanJspRecompileSetup)
             if (project.hasProperty('apacheTomcatVersion'))
                 task.inputs.property 'apacheTomcatVersion', project.property('apacheTomcatVersion')
             else
                 task.outputs.cacheIf { false } // Just don't cache if we can't be sure of the Jasper version
-            task.doFirst {
-                project.delete project.rootProject.layout.buildDirectory.dir("jspRecompiling")
-            }
     }
 
     project.tasks.named('deployApp').configure {