Gradle plugins version updates

build.gradle

@@ -108,15 +108,15 @@ allprojects {
                 if (project.hasProperty("artifactory_contextUrl"))
                 {
                     maven {
-                        url "${artifactory_contextUrl}/ext-tools-local"
+                        url = "${artifactory_contextUrl}/ext-tools-local"
                         content {
                             includeGroup "org.labkey.tools.windows"
                             includeGroup "org.labkey.tools.linux"
                             includeGroup "org.labkey.tools.osx"
                         }
                     }
                     maven {
-                        url "${artifactory_contextUrl}/libs-release-no-proxy"
+                        url = "${artifactory_contextUrl}/libs-release-no-proxy"
 
                         if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password'))
                         {
@@ -133,7 +133,7 @@ allprojects {
                         }
                     }
                     maven {
-                        url "${artifactory_contextUrl}/libs-snapshot-no-proxy"
+                        url = "${artifactory_contextUrl}/libs-snapshot-no-proxy"
 
                         if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password'))
                         {
@@ -165,7 +165,7 @@ allprojects {
                     maven {
                         // Mondrian dependencies are available via this repository. It's a direct dependency of the Query
                         // module but is declared here as many modules depend on Query and therefore need it as well.
-                        url "https://repo.orl.eng.hitachivantara.com/artifactory/pnt-mvn"
+                        url = "https://repo.orl.eng.hitachivantara.com/artifactory/pnt-mvn"
                         content {
                             includeGroup "pentaho"
                             includeGroup "org.pentaho"
@@ -506,7 +506,7 @@ project.tasks.register('listNpmProjects', DefaultTask) {
             List<String> npmProjects = []
             project.allprojects({Project p ->
                 if (p.getPlugins().hasPlugin(NpmRun.class))
-                    npmProjects.add("${p.path} (${NpmRun.useYarn(p) ? 'yarn' : 'npm'})")
+                    npmProjects.add(p.path) 
             })
             if (npmProjects.size() == 0)
                 println("No projects found containing ${NpmRun.NPM_PROJECT_FILE}")

gradle.properties

@@ -58,8 +58,8 @@ windowsProteomicsBinariesVersion=1.0
 
 # The current version numbers for the gradle plugins.
 artifactoryPluginVersion=5.2.5
-gradleNodePluginVersion=3.5.1
-gradlePluginsVersion=4.2.0
+gradleNodePluginVersion=7.1.0
+gradlePluginsVersion=6.0.0
 owaspDependencyCheckPluginVersion=11.1.0
 versioningPluginVersion=1.1.2
 
@@ -73,9 +73,6 @@ nodeRepo=https://nodejs.org/dist
 nodeWorkDirectory=.node
 # Directory in a project's build directory where the npm binary will be placed
 npmWorkDirectory=.node
-#yarnVersion=1.16.0
-# Directory in a project's build directory where the yarn binary will be placed
-#yarnWorkDirectory=.node
 
 # uncomment the line below to include version number info in build artifacts
 # Generally you don't need or want to do this when developing.

server/build.gradle

@@ -230,9 +230,16 @@ 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")
+if (BuildUtils.useServerNode(project))
+{
+    project.node {
+        workDir = project.file("${project.rootProject.projectDir}/.node")
+        npmWorkDir = project.file("${project.rootProject.projectDir}/.node")
+    }
+} else {
+    project.node {
+        workDir = BuildUtils.getRootBuildDirFile(project, ".node")
+        npmWorkDir = BuildUtils.getRootBuildDirFile(project, ".node")
+    }
 }
 project.tasks.named('deployApp').configure { dependsOn(project.tasks.npmSetup) }

server/embedded/build.gradle

@@ -90,10 +90,10 @@ project.tasks.register(
     "checkVersionConflicts", CheckForVersionConflicts)
         { CheckForVersionConflicts task ->
             task.group = GroupNames.BUILD
-            task.description = "Check for conflicts in version numbers of jar file and files already in the build directory ${ServerDeployExtension.getEmbeddedServerDeployDirectory(project)}. " +
+            task.description = "Check for conflicts in version numbers of jar file and files already in the build directory ${ServerDeployExtension.getEmbeddedServerDeployDirectoryPath(project)}. " +
                     "Default action on detecting a conflict is to fail. Use -PversionConflictAction=[delete|fail|warn] to change this behavior. The value 'delete' will cause the " +
-                    "conflicting version(s) in the ${ServerDeployExtension.getEmbeddedServerDeployDirectory(project)} directory to be removed."
-            task.directory = new File(ServerDeployExtension.getEmbeddedServerDeployDirectory(project))
+                    "conflicting version(s) in the ${ServerDeployExtension.getEmbeddedServerDeployDirectoryPath(project)} directory to be removed."
+            task.directory = new File(ServerDeployExtension.getEmbeddedServerDeployDirectoryPath(project))
             task.extension = "jar"
             task.cleanTask = "server:cleanEmbeddedDeploy"
             task.collection = project.tasks.bootJar.outputs.files

settings.gradle

@@ -8,7 +8,7 @@ pluginManagement {
             }
         }
         maven {
-            url "${artifactory_contextUrl}/plugins-release-no-proxy"
+            url = "${artifactory_contextUrl}/plugins-release-no-proxy"
             mavenContent {
                 releasesOnly()
             }
@@ -21,7 +21,7 @@ pluginManagement {
         {
             mavenLocal()
             maven {
-                url "${artifactory_contextUrl}/plugins-snapshot-local"
+                url = "${artifactory_contextUrl}/plugins-snapshot-local"
                 mavenContent {
                     snapshotsOnly()
                 }
@@ -57,7 +57,7 @@ buildscript {
             }
         }
         maven {
-            url "${artifactory_contextUrl}/plugins-release"
+            url = "${artifactory_contextUrl}/plugins-release"
             mavenContent {
                 releasesOnly()
             }
@@ -68,7 +68,7 @@ buildscript {
             // You will need to rerun the publish task to pick up new changes.
             mavenLocal()
             maven {
-                url "${artifactory_contextUrl}/plugins-snapshot-local"
+                url = "${artifactory_contextUrl}/plugins-snapshot-local"
                 mavenContent {
                     snapshotsOnly()
                 }