You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2017/08/28 19:10:55 UTC
nifi git commit: [NIFI-4327] Parameterize node and npm in poms. This
closes #2115
Repository: nifi
Updated Branches:
refs/heads/master e68ff153e -> e2b8be53c
[NIFI-4327] Parameterize node and npm in poms. This closes #2115
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e2b8be53
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e2b8be53
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e2b8be53
Branch: refs/heads/master
Commit: e2b8be53cbd0485f5aeec713100ddf1f7b6ed3f4
Parents: e68ff15
Author: Scott Aslan <sc...@gmail.com>
Authored: Mon Aug 28 13:23:43 2017 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Aug 28 15:10:24 2017 -0400
----------------------------------------------------------------------
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 8 +++++---
.../nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/e2b8be53/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index f6124f0..0d60df2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -23,6 +23,8 @@
<artifactId>nifi-web-ui</artifactId>
<packaging>war</packaging>
<properties>
+ <node.version>v5.7.0</node.version>
+ <npm.version>1.3.8</npm.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
<source.skip>true</source.skip>
<staging.dir>${project.build.directory}/tmp</staging.dir>
@@ -354,7 +356,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<configuration>
<installDirectory>${frontend.working.dir}</installDirectory>
</configuration>
@@ -366,8 +368,8 @@
</goals>
<phase>generate-resources</phase>
<configuration>
- <nodeVersion>v0.10.18</nodeVersion>
- <npmVersion>1.3.8</npmVersion>
+ <nodeVersion>${node.version}</nodeVersion>
+ <npmVersion>${npm.version}</npmVersion>
</configuration>
</execution>
<execution>
http://git-wip-us.apache.org/repos/asf/nifi/blob/e2b8be53/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml
index 91961a4..a97351f 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml
@@ -21,6 +21,8 @@ language governing permissions and limitations under the License. -->
<packaging>war</packaging>
<properties>
+ <node.version>v5.7.0</node.version>
+ <npm.version>1.3.8</npm.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
<source.skip>true</source.skip>
<jersey.version>1.19.1</jersey.version>
@@ -190,7 +192,7 @@ language governing permissions and limitations under the License. -->
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<configuration>
<installDirectory>${frontend.working.dir}</installDirectory>
</configuration>
@@ -202,8 +204,8 @@ language governing permissions and limitations under the License. -->
</goals>
<phase>generate-resources</phase>
<configuration>
- <nodeVersion>v0.10.18</nodeVersion>
- <npmVersion>1.3.8</npmVersion>
+ <nodeVersion>${node.version}</nodeVersion>
+ <npmVersion>${npm.version}</npmVersion>
</configuration>
</execution>
<execution>