diff --git a/gradle.properties b/gradle.properties index 56d8ad903f..012be1bc6a 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=5.0.0 +gradlePluginsVersion=5.1.0-npmSetupUpdates-SNAPSHOT owaspDependencyCheckPluginVersion=11.0.0 versioningPluginVersion=1.1.2 diff --git a/server/build.gradle b/server/build.gradle index 8496ae9704..9350118ed6 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -228,12 +228,4 @@ else } } -// We add this configuration here so we have a single location to link to for the npm and node executables. -// Each project that requires node will have its own downloaded version of node and npm, but for the symlinkNode -// task we need a single location, and one that works even when not building from source (Issue 35207) -project.node { - workDir = BuildUtils.getRootBuildDirFile(project, ".node") - npmWorkDir = BuildUtils.getRootBuildDirFile(project, ".node") - yarnWorkDir = BuildUtils.getRootBuildDirFile(project, ".node") -} project.tasks.named('deployApp').configure { dependsOn(project.tasks.npmSetup) } diff --git a/server/minification/build.gradle b/server/minification/build.gradle index 14c3cd7e2d..18867dc61b 100644 --- a/server/minification/build.gradle +++ b/server/minification/build.gradle @@ -1 +1,8 @@ + apply plugin: 'org.labkey.build.npmRun' + +project.node { + download = true + workDir = project.file(".gradle/nodejs") + npmWorkDir = project.file(".gradle/npm") +}