[incubator-myriad] branch master updated: MYRIAD-180 Build should not pollute sources (moved node_modules)

[os...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

oscarfmdc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-myriad.git


The following commit(s) were added to refs/heads/master by this push:
     new 54547b5  MYRIAD-180 Build should not pollute sources (moved node_modules)
     new bff5847  Merge pull request #131 from oscarfmdc/MYRIAD-180
54547b5 is described below

commit 54547b57a83f1264f15297f8ef052bc124357c25
Author: oscarfmdc <os...@gmail.com>
AuthorDate: Mon Jul 29 08:31:24 2019 +0200

    MYRIAD-180 Build should not pollute sources (moved node_modules)
---
 .gitignore                                                         | 3 +++
 myriad-scheduler/build.gradle                                      | 2 +-
 myriad-scheduler/{src/main/resources/webapp => }/package-lock.json | 0
 myriad-scheduler/{src/main/resources/webapp => }/package.json      | 0
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 17d1289..5d37af8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,6 @@ local.properties
 *.iws
 .idea/
 out
+
+# Node
+node_modules
diff --git a/myriad-scheduler/build.gradle b/myriad-scheduler/build.gradle
index 804b15e..364dc57 100644
--- a/myriad-scheduler/build.gradle
+++ b/myriad-scheduler/build.gradle
@@ -94,7 +94,7 @@ node {
     download = true
 
     // Set the work directory where node_modules should be located
-    nodeModulesDir = file("${project.projectDir}/src/main/resources/webapp")
+    nodeModulesDir = file("${project.projectDir}")
 }
 
 gulp {
diff --git a/myriad-scheduler/src/main/resources/webapp/package-lock.json b/myriad-scheduler/package-lock.json
similarity index 100%
rename from myriad-scheduler/src/main/resources/webapp/package-lock.json
rename to myriad-scheduler/package-lock.json
diff --git a/myriad-scheduler/src/main/resources/webapp/package.json b/myriad-scheduler/package.json
similarity index 100%
rename from myriad-scheduler/src/main/resources/webapp/package.json
rename to myriad-scheduler/package.json