From 01ada40ea47da0ba32fee22d44f185da2a967456 Mon Sep 17 00:00:00 2001
From: Eric Yang <eyang@apache.org>
Date: Wed, 6 Mar 2019 17:55:48 -0500
Subject: [PATCH] YARN-9348.  Application catalog build system bug fixes.      
       Contributed by Eric Yang

---
 .../pom.xml                                      |  1 +
 .../.gitignore                                   |  2 ++
 .../package.json                                 | 16 +---------------
 .../pom.xml                                      |  8 +++++++-
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml
index 6fd56fe582..40e3278f06 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/pom.xml
@@ -56,6 +56,7 @@
         <file>
           <exists>/var/run/docker.sock</exists>
         </file>
+        <os><family>linux</family></os>
       </activation>
       <id>application-catalog-docker-image</id>
       <build>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
index a82f945920..2d8667ea02 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/.gitignore
@@ -1,3 +1,5 @@
 .classpath
 .project
 /target/
+/node_modules/
+yarn.lock
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
index d9c899e697..65a6ace6a2 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json
@@ -14,26 +14,12 @@
         "bootstrap": "~3.3.7"
     },
     "devDependencies": {
-        "http-server": "^0.6.1",
         "requirejs": "^2.1.0",
-        "karma": "4.0.0",
-        "karma-requirejs": "^0.2.2",
-        "karma-script-launcher": "^0.1.0",
-        "karma-chrome-launcher": "^0.1.4",
-        "karma-firefox-launcher": "^0.1.3",
-        "karma-jasmine": "^0.1.5",
-        "karma-junit-reporter": "^0.2.2",
         "shelljs": "^0.2.6",
         "apidoc": "0.17.7"
     },
     "scripts": {
         "prestart": "npm install & mvn clean package",
-        "start": "http-server target/app -a localhost -p 8000",
-        "pretest": "npm install",
-        "test": "karma start src/test/javascript/karma.conf.js",
-        "test-single-run": "karma start src/test/javascript/karma.conf.js  --single-run",
-        "preupdate-webdriver": "npm install",
-        "update-webdriver": "webdriver-manager update",
-        "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('src/main/webapp/vendor/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'src/main/webapp/index.html');\""
+        "pretest": "npm install"
     }
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
index 4623b63d28..41232a3a6b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml
@@ -244,6 +244,9 @@
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.6</version>
+                <configuration>
+                    <workingDirectory>target</workingDirectory>
+                </configuration>
                 <executions>
                     <execution>
                         <id>install node and yarn</id>
@@ -411,7 +414,10 @@
                 <configuration>
                     <filesets>
                         <fileset>
-                            <directory>${vendor.loc}</directory>
+                            <directory>node</directory>
+                        </fileset>
+                        <fileset>
+                            <directory>node_modules</directory>
                         </fileset>
                     </filesets>
                 </configuration>