You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ey...@apache.org on 2019/03/06 22:56:51 UTC
[hadoop] branch trunk updated: YARN-9348. Application catalog build
system bug fixes. Contributed by Eric Yang
This is an automated email from the ASF dual-hosted git repository.
eyang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 01ada40 YARN-9348. Application catalog build system bug fixes. Contributed by Eric Yang
01ada40 is described below
commit 01ada40ea47da0ba32fee22d44f185da2a967456
Author: Eric Yang <ey...@apache.org>
AuthorDate: Wed Mar 6 17:55:48 2019 -0500
YARN-9348. Application catalog build system bug fixes.
Contributed by Eric Yang
---
.../hadoop-yarn-applications-catalog-docker/pom.xml | 1 +
.../hadoop-yarn-applications-catalog-webapp/.gitignore | 2 ++
.../hadoop-yarn-applications-catalog-webapp/package.json | 16 +---------------
.../hadoop-yarn-applications-catalog-webapp/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 6fd56fe..40e3278 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 a82f945..2d8667e 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 d9c899e..65a6ace 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 4623b63..41232a3 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org