Repository: nifi Updated Branches: refs/heads/master 641ba29cc -> c1459825b
[NIFI-4998] update node and npm version This closes #2571 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c1459825 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c1459825 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c1459825 Branch: refs/heads/master Commit: c1459825bb09a5d3ed527ac59c83cf3470b41e23 Parents: 641ba29 Author: Scott Aslan <scottyas...@gmail.com> Authored: Fri Mar 23 15:11:38 2018 -0400 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Wed Mar 28 16:49:32 2018 -0400 ---------------------------------------------------------------------- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 4 +- .../nifi-web-ui/src/main/frontend/package.json | 42 +++++++++++++------- .../nifi-jolt-transform-json-ui/pom.xml | 4 +- 3 files changed, 29 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/c1459825/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 699e55d..d6a76c1 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,8 +23,7 @@ <artifactId>nifi-web-ui</artifactId> <packaging>war</packaging> <properties> - <node.version>v5.7.0</node.version> - <npm.version>1.3.8</npm.version> + <node.version>v8.10.0</node.version> <maven.javadoc.skip>true</maven.javadoc.skip> <source.skip>true</source.skip> <staging.dir>${project.build.directory}/tmp</staging.dir> @@ -372,7 +371,6 @@ <phase>generate-resources</phase> <configuration> <nodeVersion>${node.version}</nodeVersion> - <npmVersion>${npm.version}</npmVersion> </configuration> </execution> <execution> http://git-wip-us.apache.org/repos/asf/nifi/blob/c1459825/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json index 9670209..be7a299 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json @@ -1,26 +1,38 @@ { "name": "apache-nifi", + "description": "Apache NiFi 3rd party client side resources.", "dependencies": { - "font-awesome": "4.6.1", - "angular-material": "1.0.8", + "JSON2": "0.1.0", + "angular": "1.5.11", + "angular-aria": "1.5.11", + "angular-animate": "1.5.11", + "angular-messages": "1.5.11", + "angular-mocks": "1.5.11", "angular-resource": "1.5.5", + "angular-sanitize": "1.5.11", "angular-route": "1.5.5", - "jquery": "3.1.1", - "jquery-ui-dist": "1.12.1", + "angular-material": "1.0.8", + "d3": "4.13.0", + "d3-selection-multi": "1.0.1", "jquery-minicolors": "2.1.10", + "jquery-ui-dist": "1.12.1", + "font-awesome": "4.6.1", + "jquery": "3.1.1", + "reset.css": "2.0.2", "jquery-form": "3.50.0", - "qtip2": "3.0.3", - "slickgrid": "2.3.3", + "url-search-params": "0.6.1", "jsonlint": "1.6.2", - "JSON2": "0.1.0", - "reset.css": "2.0.2", - "d3": "4.13.0", - "d3-selection-multi": "1.0.1", - "url-search-params": "0.6.1" + "qtip2": "3.0.3", + "slickgrid": "2.3.3" + }, + "scripts": { }, - "description": "Apache NiFi 3rd party client side resources.", "repository": { "type": "git", - "url": "https://github.com/apache/nifi"; - } -} \ No newline at end of file + "url": "git+https://github.com/apache/nifi.git"; + }, + "bugs": { + "url": "https://github.com/apache/nifi/issues"; + }, + "homepage": "https://github.com/apache/nifi#readme"; +} http://git-wip-us.apache.org/repos/asf/nifi/blob/c1459825/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 c823dce..1f64619 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,8 +21,7 @@ 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> + <node.version>v8.10.0</node.version> <maven.javadoc.skip>true</maven.javadoc.skip> <source.skip>true</source.skip> <frontend.dependency.configs>${basedir}/src/main/frontend</frontend.dependency.configs> @@ -190,7 +189,6 @@ language governing permissions and limitations under the License. --> <phase>generate-resources</phase> <configuration> <nodeVersion>${node.version}</nodeVersion> - <npmVersion>${npm.version}</npmVersion> </configuration> </execution> <execution>
