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 wa...@apache.org on 2016/10/17 18:31:28 UTC
[32/50] [abbrv] hadoop git commit: YARN-5504. [YARN-3368] Fix YARN UI
build pom.xml (Sreenath Somarajapuram via Sunil G)
YARN-5504. [YARN-3368] Fix YARN UI build pom.xml (Sreenath Somarajapuram via Sunil G)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9ef1c371
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9ef1c371
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9ef1c371
Branch: refs/heads/YARN-3368
Commit: 9ef1c37146ce06838ccc7168d3e0bc73aaf0b21b
Parents: 182f65a
Author: sunilg <su...@apache.org>
Authored: Thu Aug 25 23:21:29 2016 +0530
Committer: Wangda Tan <wa...@apache.org>
Committed: Mon Oct 17 11:30:30 2016 -0700
----------------------------------------------------------------------
.../hadoop-yarn/hadoop-yarn-ui/pom.xml | 59 +++++---------------
.../src/main/webapp/ember-cli-build.js | 2 +-
.../hadoop-yarn-ui/src/main/webapp/package.json | 3 +-
3 files changed, 17 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ef1c371/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
index 2933a76..fca8d30 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/pom.xml
@@ -35,7 +35,7 @@
<node.executable>node</node.executable>
<nodeVersion>v0.12.2</nodeVersion>
<npmVersion>2.10.0</npmVersion>
- <skipTests>false</skipTests>
+ <keep-ui-build-cache>false</keep-ui-build-cache>
</properties>
<build>
@@ -60,19 +60,20 @@
</plugin>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <version>3.0.0</version>
- <configuration>
- <followSymLinks>false</followSymLinks>
- <filesets>
- <fileset>
- <directory>${basedir}/src/main/webapp/bower_components</directory>
- </fileset>
- <fileset>
- <directory>${basedir}/src/main/webapp/node_modules</directory>
- </fileset>
- </filesets>
- </configuration>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.0.0</version>
+ <configuration>
+ <skip>${keep-ui-build-cache}</skip>
+ <followSymLinks>false</followSymLinks>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/src/main/webapp/bower_components</directory>
+ </fileset>
+ <fileset>
+ <directory>${basedir}/src/main/webapp/node_modules</directory>
+ </fileset>
+ </filesets>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -126,21 +127,6 @@
</configuration>
</execution>
<execution>
- <phase>generate-sources</phase>
- <id>bower --allow-root install</id>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <workingDirectory>${webappDir}</workingDirectory>
- <executable>bower</executable>
- <arguments>
- <argument>--allow-root</argument>
- <argument>install</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
<id>ember build</id>
<phase>generate-sources</phase>
<goals>
@@ -158,21 +144,6 @@
</configuration>
</execution>
<execution>
- <id>ember test</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <skip>${skipTests}</skip>
- <workingDirectory>${webappDir}</workingDirectory>
- <executable>ember</executable>
- <arguments>
- <argument>test</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
<id>cleanup tmp</id>
<phase>generate-sources</phase>
<goals>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ef1c371/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
index d21cc3e..7736c75 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/ember-cli-build.js
@@ -22,7 +22,7 @@ var EmberApp = require('ember-cli/lib/broccoli/ember-app');
module.exports = function(defaults) {
var app = new EmberApp(defaults, {
- // Add options here
+ hinting: false
});
app.import("bower_components/datatables/media/css/jquery.dataTables.min.css");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9ef1c371/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
index baa473a..6a4eb16 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/package.json
@@ -9,8 +9,7 @@
},
"scripts": {
"build": "ember build",
- "start": "ember server",
- "test": "ember test"
+ "start": "ember server"
},
"repository": "",
"engines": {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org