Repository: ambari Updated Branches: refs/heads/branch-2.5 d7646eb2f -> dd74821c5
AMBARI-20549. upgrade frontend-maven-plugin to latest >= 1.3 to make use of ignore proxy feature (Venkata Sairam via pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dd74821c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dd74821c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dd74821c Branch: refs/heads/branch-2.5 Commit: dd74821c58fb8d92b74c7fcf59c002fcce9a4bcf Parents: d7646eb Author: pallavkul <[email protected]> Authored: Tue Apr 4 14:35:43 2017 +0530 Committer: pallavkul <[email protected]> Committed: Tue Apr 4 14:35:43 2017 +0530 ---------------------------------------------------------------------- contrib/views/capacity-scheduler/pom.xml | 7 ++++--- contrib/views/files/pom.xml | 3 ++- contrib/views/files/src/main/resources/ui/package.json | 4 ++-- contrib/views/hawq/pom.xml | 2 ++ contrib/views/hive-next/pom.xml | 3 ++- .../hive-next/src/main/resources/ui/hive-web/package.json | 4 ++-- contrib/views/hive20/pom.xml | 3 ++- contrib/views/hive20/src/main/resources/ui/package.json | 4 ++-- contrib/views/hueambarimigration/pom.xml | 3 ++- .../main/resources/ui/hueambarimigration-view/package.json | 4 ++-- contrib/views/jobs/pom.xml | 3 ++- contrib/views/pig/pom.xml | 5 +++-- contrib/views/wfmanager/pom.xml | 3 ++- contrib/views/wfmanager/src/main/resources/ui/pom.xml | 3 ++- 14 files changed, 31 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/capacity-scheduler/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/capacity-scheduler/pom.xml b/contrib/views/capacity-scheduler/pom.xml index e18514c..72ea752 100644 --- a/contrib/views/capacity-scheduler/pom.xml +++ b/contrib/views/capacity-scheduler/pom.xml @@ -120,9 +120,10 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.16</version> + <version>1.3</version> <configuration> - <workingDirectory>${ui.directory}</workingDirectory> + <workingDirectory>${ui.directory}</workingDirectory> + <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven> </configuration> <executions> <execution> @@ -166,7 +167,7 @@ <executable>chmod</executable> <arguments> <argument>+x</argument> - <argument>${ui.directory}/node/npm/bin/node-gyp-bin/node-gyp</argument> + <argument>${ui.directory}/node/node_modules/npm/bin/node-gyp-bin/node-gyp</argument> </arguments> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/files/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml index 663615a..8c20b8e 100644 --- a/contrib/views/files/pom.xml +++ b/contrib/views/files/pom.xml @@ -179,11 +179,12 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.16</version> + <version>1.3</version> <configuration> <nodeVersion>v4.5.0</nodeVersion> <npmVersion>2.15.0</npmVersion> <workingDirectory>src/main/resources/ui/</workingDirectory> + <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/files/src/main/resources/ui/package.json ---------------------------------------------------------------------- diff --git a/contrib/views/files/src/main/resources/ui/package.json b/contrib/views/files/src/main/resources/ui/package.json index d15c5c9..3f27897 100644 --- a/contrib/views/files/src/main/resources/ui/package.json +++ b/contrib/views/files/src/main/resources/ui/package.json @@ -11,8 +11,8 @@ "build": "ember build", "start": "ember server", "test": "ember test", - "preinstall": "chmod +x node/npm/bin/node-gyp-bin/node-gyp", - "postinstall": "bash node/with_new_path.sh node node_modules/.bin/bower --allow-root install" + "preinstall": "chmod +x node/node_modules/npm/bin/node-gyp-bin/node-gyp", + "postinstall": "node node_modules/.bin/bower --allow-root install" }, "repository": "", "engines": { http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/hawq/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/hawq/pom.xml b/contrib/views/hawq/pom.xml index c62af56..e2418ab 100644 --- a/contrib/views/hawq/pom.xml +++ b/contrib/views/hawq/pom.xml @@ -133,10 +133,12 @@ <!-- Building frontend --> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> + <version>1.3</version> <configuration> <nodeVersion>v4.5.0</nodeVersion> <npmVersion>2.15.0</npmVersion> <workingDirectory>${ui.dir}</workingDirectory> + <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/hive-next/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/hive-next/pom.xml b/contrib/views/hive-next/pom.xml index fd85a50..b470862 100644 --- a/contrib/views/hive-next/pom.xml +++ b/contrib/views/hive-next/pom.xml @@ -242,11 +242,12 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.16</version> + <version>1.3</version> <configuration> <nodeVersion>v4.5.0</nodeVersion> <npmVersion>2.15.0</npmVersion> <workingDirectory>src/main/resources/ui/hive-web/</workingDirectory> + <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/hive-next/src/main/resources/ui/hive-web/package.json ---------------------------------------------------------------------- diff --git a/contrib/views/hive-next/src/main/resources/ui/hive-web/package.json b/contrib/views/hive-next/src/main/resources/ui/hive-web/package.json index 6fe68e2..623f14f 100644 --- a/contrib/views/hive-next/src/main/resources/ui/hive-web/package.json +++ b/contrib/views/hive-next/src/main/resources/ui/hive-web/package.json @@ -10,8 +10,8 @@ "start": "ember server", "build": "ember build", "test": "ember test", - "preinstall": "chmod +x node/npm/bin/node-gyp-bin/node-gyp", - "postinstall": "bash node/with_new_path.sh node node_modules/.bin/bower --allow-root install" + "preinstall": "chmod +x node/node_modules/npm/bin/node-gyp-bin/node-gyp", + "postinstall": "node node_modules/.bin/bower --allow-root install" }, "repository": "https://github.com/stefanpenner/ember-cli";, "engines": { http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/hive20/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/pom.xml b/contrib/views/hive20/pom.xml index 0d97bbd..f958ef2 100644 --- a/contrib/views/hive20/pom.xml +++ b/contrib/views/hive20/pom.xml @@ -278,11 +278,12 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.16</version> + <version>1.3</version> <configuration> <nodeVersion>v4.5.0</nodeVersion> <npmVersion>2.15.0</npmVersion> <workingDirectory>src/main/resources/ui/</workingDirectory> + <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/hive20/src/main/resources/ui/package.json ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/package.json b/contrib/views/hive20/src/main/resources/ui/package.json index 5c0da36..0453a52 100644 --- a/contrib/views/hive20/src/main/resources/ui/package.json +++ b/contrib/views/hive20/src/main/resources/ui/package.json @@ -11,8 +11,8 @@ "build": "ember build", "start": "ember server", "test": "ember test", - "preinstall": "chmod +x node/npm/bin/node-gyp-bin/node-gyp", - "postinstall": "bash node/with_new_path.sh node node_modules/.bin/bower --allow-root install" + "preinstall": "chmod +x node/node_modules/npm/bin/node-gyp-bin/node-gyp", + "postinstall": "node node_modules/.bin/bower --allow-root install" }, "repository": "", "engines": { http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/hueambarimigration/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/hueambarimigration/pom.xml b/contrib/views/hueambarimigration/pom.xml index 891876d..77d9c48 100644 --- a/contrib/views/hueambarimigration/pom.xml +++ b/contrib/views/hueambarimigration/pom.xml @@ -163,11 +163,12 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.16</version> + <version>1.3</version> <configuration> <nodeVersion>v4.5.0</nodeVersion> <npmVersion>2.15.0</npmVersion> <workingDirectory>${project.basedir}/src/main/resources/ui/hueambarimigration-view/</workingDirectory> + <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/hueambarimigration/src/main/resources/ui/hueambarimigration-view/package.json ---------------------------------------------------------------------- diff --git a/contrib/views/hueambarimigration/src/main/resources/ui/hueambarimigration-view/package.json b/contrib/views/hueambarimigration/src/main/resources/ui/hueambarimigration-view/package.json index 64b3270..09c3a27 100644 --- a/contrib/views/hueambarimigration/src/main/resources/ui/hueambarimigration-view/package.json +++ b/contrib/views/hueambarimigration/src/main/resources/ui/hueambarimigration-view/package.json @@ -11,8 +11,8 @@ "start": "ember server", "build": "ember build", "test": "ember test", - "preinstall": "chmod +x node/npm/bin/node-gyp-bin/node-gyp", - "postinstall": "bash node/with_new_path.sh node node_modules/.bin/bower --allow-root install" + "preinstall": "chmod +x node/node_modules/npm/bin/node-gyp-bin/node-gyp", + "postinstall": "node node_modules/.bin/bower --allow-root install" }, "repository": "", http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/jobs/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/jobs/pom.xml b/contrib/views/jobs/pom.xml index 3475191..e4a42cd 100644 --- a/contrib/views/jobs/pom.xml +++ b/contrib/views/jobs/pom.xml @@ -86,11 +86,12 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.16</version> + <version>1.3</version> <configuration> <nodeVersion>v4.5.0</nodeVersion> <npmVersion>2.15.0</npmVersion> <workingDirectory>src/main/resources/ui</workingDirectory> + <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/pig/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml index d7d2de9..b2e7018 100644 --- a/contrib/views/pig/pom.xml +++ b/contrib/views/pig/pom.xml @@ -178,11 +178,12 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.16</version> + <version>1.3</version> <configuration> <nodeVersion>v4.5.0</nodeVersion> <npmVersion>2.15.0</npmVersion> <workingDirectory>${ui.directory}</workingDirectory> + <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven> </configuration> <executions> <execution> @@ -224,7 +225,7 @@ <executable>chmod</executable> <arguments> <argument>+x</argument> - <argument>${ui.directory}/node/npm/bin/node-gyp-bin/node-gyp</argument> + <argument>${ui.directory}/node/node_modules/npm/bin/node-gyp-bin/node-gyp</argument> </arguments> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/wfmanager/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/pom.xml b/contrib/views/wfmanager/pom.xml index cc48ef2..fa67525 100644 --- a/contrib/views/wfmanager/pom.xml +++ b/contrib/views/wfmanager/pom.xml @@ -137,11 +137,12 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.16</version> + <version>1.3</version> <configuration> <nodeVersion>v4.5.0</nodeVersion> <npmVersion>2.15.0</npmVersion> <workingDirectory>src/main/resources/ui/</workingDirectory> + <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/ambari/blob/dd74821c/contrib/views/wfmanager/src/main/resources/ui/pom.xml ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/pom.xml b/contrib/views/wfmanager/src/main/resources/ui/pom.xml index 8bdb332..aeb7746 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/pom.xml +++ b/contrib/views/wfmanager/src/main/resources/ui/pom.xml @@ -40,11 +40,12 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>0.0.22</version> + <version>1.3</version> <configuration> <nodeVersion>v5.0.0</nodeVersion> <npmVersion>3.5.3</npmVersion> <workingDirectory>${project.basedir}</workingDirectory> + <npmInheritsProxyConfigFromMaven>false</npmInheritsProxyConfigFromMaven> </configuration> <executions> <execution>
