Apache Solr open-source search software
Use separate nodeProjectDir for each subproject (#2680)
Tyler Bertrand388101fc8414
diff --git a/gradle/node.gradle b/gradle/node.gradleindex d585ab5f871..fe128ea1f4a 100644--- a/gradle/node.gradle+++ b/gradle/node.gradle@@ -35,8 +35,7 @@ configure([project(":solr:packaging"), project(":solr:solr-ref-guide"), project(}project.ext {- rootNodeDir = "$rootDir/.gradle/node"- nodeProjectDir = file("$rootNodeDir/$project.name")+ nodeProjectDir = layout.projectDirectory.dir(".gradle/node")}node {@@ -49,10 +48,10 @@ configure([project(":solr:packaging"), project(":solr:solr-ref-guide"), project(}// The directory where Node.js is unpacked (when download is true)- workDir = file("${project.ext.rootNodeDir}/nodejs")+ workDir = file("${project.ext.nodeProjectDir.getAsFile().path}/nodejs")// The directory where npm is installed (when a specific version is defined)- npmWorkDir = file("${project.ext.rootNodeDir}/npm")+ npmWorkDir = file("${project.ext.nodeProjectDir.getAsFile().path}/npm")// The Node.js project directory location// This is where the package.json file and node_modules directory are locateddiff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 2f20701968b..8d7a10668be 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -166,7 +166,7 @@ OptimizationsBug Fixes----------------------(No changes)+* PR#2680: Improve reliablity of NpmTasks finding needed files/commands. (Tyler Bertrand via Eric Pugh)Dependency Upgrades---------------------