From a8c38266b203e913bf29207fa82b29c9fd7d96ec Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 2 Jul 2025 11:34:07 -0700 Subject: [PATCH 1/4] Avoid deprecated syntax --- gradle/settings/all.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/settings/all.gradle b/gradle/settings/all.gradle index 02374e01c1..c9f223bf17 100644 --- a/gradle/settings/all.gradle +++ b/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() } From 7cce0b4d98d73295c36ed38b00713cce36721c89 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 2 Jul 2025 11:34:40 -0700 Subject: [PATCH 2/4] Gradle plugins version update and add explicit file encoding setting --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7f7c51b2f0..1a042e6608 100644 --- a/gradle.properties +++ b/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-npmBuild-SNAPSHOT owaspDependencyCheckPluginVersion=12.1.3 versioningPluginVersion=1.1.2 From f226adb762e86a28cf0064811163ffecaadb258c Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 2 Jul 2025 17:31:54 -0700 Subject: [PATCH 3/4] Add task dependency in favor of duplicated doLast referencing project.delete --- server/build.gradle | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/build.gradle b/server/build.gradle index d5fd974cb2..cf944dad2f 100644 --- a/server/build.gradle +++ b/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 { From 560cfbe6115067eb5412152e0433588067dca2f8 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 3 Jul 2025 12:29:19 -0700 Subject: [PATCH 4/4] gradlePluginsVersion 6.3.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1a042e6608..6107e1a0c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.3.0-npmBuild-SNAPSHOT +gradlePluginsVersion=6.3.0 owaspDependencyCheckPluginVersion=12.1.3 versioningPluginVersion=1.1.2