Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[NIFI-4327] Parameterize node and npm in poms. This closes #2115

This commit is contained in:
Scott Aslan 2017-08-28 13:23:43 -04:00 committed by Matt Gilman
parent e68ff153e8
commit e2b8be53cb
No known key found for this signature in database
GPG Key ID: DF61EC19432AEE37
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
View File

@ -23,6 +23,8 @@
<artifactId>nifi-web-ui</artifactId> <artifactId>nifi-web-ui</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<node.version>v5.7.0</node.version>
<npm.version>1.3.8</npm.version>
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<source.skip>true</source.skip> <source.skip>true</source.skip>
<staging.dir>${project.build.directory}/tmp</staging.dir> <staging.dir>${project.build.directory}/tmp</staging.dir>
@ -354,7 +356,7 @@
<plugin> <plugin>
<groupId>com.github.eirslett</groupId> <groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId> <artifactId>frontend-maven-plugin</artifactId>
<version>1.0</version> <version>1.1</version>
<configuration> <configuration>
<installDirectory>${frontend.working.dir}</installDirectory> <installDirectory>${frontend.working.dir}</installDirectory>
</configuration> </configuration>
@ -366,8 +368,8 @@
</goals> </goals>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<configuration> <configuration>
<nodeVersion>v0.10.18</nodeVersion> <nodeVersion>${node.version}</nodeVersion>
<npmVersion>1.3.8</npmVersion> <npmVersion>${npm.version}</npmVersion>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>

8
nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml
View File

@ -21,6 +21,8 @@ language governing permissions and limitations under the License. -->
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<node.version>v5.7.0</node.version>
<npm.version>1.3.8</npm.version>
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<source.skip>true</source.skip> <source.skip>true</source.skip>
<jersey.version>1.19.1</jersey.version> <jersey.version>1.19.1</jersey.version>
@ -190,7 +192,7 @@ language governing permissions and limitations under the License. -->
<plugin> <plugin>
<groupId>com.github.eirslett</groupId> <groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId> <artifactId>frontend-maven-plugin</artifactId>
<version>1.0</version> <version>1.1</version>
<configuration> <configuration>
<installDirectory>${frontend.working.dir}</installDirectory> <installDirectory>${frontend.working.dir}</installDirectory>
</configuration> </configuration>
@ -202,8 +204,8 @@ language governing permissions and limitations under the License. -->
</goals> </goals>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<configuration> <configuration>
<nodeVersion>v0.10.18</nodeVersion> <nodeVersion>${node.version}</nodeVersion>
<npmVersion>1.3.8</npmVersion> <npmVersion>${npm.version}</npmVersion>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>