[NIFI-2781] removing bower and allowing npm to manage client side resources in nifi-web-ui and nifi-jolt-transform-json-ui. This closes #1030
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/af1732aa Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/af1732aa Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/af1732aa Branch: refs/heads/support/nifi-1.0.x Commit: af1732aa610e5b409b295dc35be17d4ab45c7375 Parents: 0b1d15a Author: Scott Aslan <scottyas...@gmail.com> Authored: Mon Sep 19 13:16:07 2016 -0400 Committer: jpercivall <jperciv...@apache.org> Committed: Thu Dec 15 09:52:12 2016 -0500 ---------------------------------------------------------------------- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 39 +++++++++++------- .../nifi-web-ui/src/main/frontend/bower.json | 20 ---------- .../nifi-web-ui/src/main/frontend/package.json | 14 +++++++ .../nifi-jolt-transform-json-ui/pom.xml | 42 +++++++++++--------- .../src/main/frontend/.bowerrc | 6 --- .../src/main/frontend/bower.json | 15 ------- .../src/main/frontend/package.json | 12 ++++++ .../src/main/webapp/WEB-INF/jsp/index.jsp | 2 +- 8 files changed, 75 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/af1732aa/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 a8c1994..c96076e 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 @@ -136,7 +136,26 @@ </configuration> </execution> <execution> - <id>copy-bower-json</id> + <id>copy-client-side-deps</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${frontend.assets}</outputDirectory> + <resources> + <resource> + <directory>${frontend.working.dir}/node_modules</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-package-json</id> <phase>generate-sources</phase> <goals> <goal>copy-resources</goal> @@ -148,7 +167,7 @@ <directory>${frontend.dependency.configs}</directory> <filtering>false</filtering> <includes> - <include>bower.json</include> + <include>package.json</include> </includes> </resource> </resources> @@ -271,22 +290,12 @@ </configuration> </execution> <execution> - <id>install-bower</id> + <id>npm install</id> <goals> <goal>npm</goal> </goals> <configuration> - <arguments>install bower</arguments> - <workingDirectory>${frontend.working.dir}</workingDirectory> - </configuration> - </execution> - <execution> - <id>bower-install</id> - <goals> - <goal>bower</goal> - </goals> - <configuration> - <arguments>install ${bower.options} --config.directory=${frontend.assets}</arguments> + <arguments>--cache-min Infinity install</arguments> <workingDirectory>${frontend.working.dir}</workingDirectory> </configuration> </execution> @@ -787,7 +796,7 @@ <configuration> <excludes combine.children="append"> <exclude>nbactions.xml</exclude> - <exclude>src/main/frontend/bower.json</exclude> + <exclude>src/main/frontend/package.json</exclude> <exclude>src/main/webapp/js/json2.js</exclude> <exclude>src/main/webapp/js/jquery/</exclude> <exclude>src/main/webapp/js/d3/d3.min.js</exclude> http://git-wip-us.apache.org/repos/asf/nifi/blob/af1732aa/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/bower.json ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/bower.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/bower.json deleted file mode 100644 index 2544686..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/bower.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "apache-nifi", - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "dependencies": { - "font-awesome": "fontawesome#4.6.1", - "angular-material": "1.0.8", - "angular-resource": "1.5.5", - "angular-route": "1.5.5" - }, - "resolutions": { - "angular": "1.5.8" - } -} http://git-wip-us.apache.org/repos/asf/nifi/blob/af1732aa/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 new file mode 100644 index 0000000..67acdb1 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json @@ -0,0 +1,14 @@ +{ + "name": "apache-nifi", + "dependencies": { + "font-awesome": "4.6.1", + "angular-material": "1.0.8", + "angular-resource": "1.5.5", + "angular-route": "1.5.5" + }, + "description": "Apache NiFi 3rd party client side resources.", + "repository": { + "type": "git", + "url": "https://github.com/apache/nifi"; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/af1732aa/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 4607cfd..209c06b 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 @@ -144,7 +144,26 @@ language governing permissions and limitations under the License. --> <artifactId>maven-resources-plugin</artifactId> <executions> <execution> - <id>copy-bower-json</id> + <id>copy-client-side-deps</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${frontend.assets}</outputDirectory> + <resources> + <resource> + <directory>${frontend.working.dir}/node_modules</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-package-json</id> <phase>generate-sources</phase> <goals> <goal>copy-resources</goal> @@ -156,8 +175,7 @@ language governing permissions and limitations under the License. --> <directory>${frontend.dependency.configs}</directory> <filtering>false</filtering> <includes> - <include>bower.json</include> - <include>.bowerrc</include> + <include>package.json</include> </includes> </resource> </resources> @@ -172,7 +190,6 @@ language governing permissions and limitations under the License. --> <configuration> <installDirectory>${frontend.working.dir}</installDirectory> </configuration> - <executions> <execution> <id>install-node-and-npm</id> @@ -186,22 +203,12 @@ language governing permissions and limitations under the License. --> </configuration> </execution> <execution> - <id>install-bower</id> + <id>npm install</id> <goals> <goal>npm</goal> </goals> <configuration> - <arguments>install bower</arguments> - <workingDirectory>${frontend.working.dir}</workingDirectory> - </configuration> - </execution> - <execution> - <id>bower-install</id> - <goals> - <goal>bower</goal> - </goals> - <configuration> - <arguments>install --config.directory=${frontend.assets}</arguments> + <arguments>--cache-min Infinity install</arguments> <workingDirectory>${frontend.working.dir}</workingDirectory> </configuration> </execution> @@ -212,8 +219,7 @@ language governing permissions and limitations under the License. --> <artifactId>apache-rat-plugin</artifactId> <configuration> <excludes combine.children="append"> - <exclude>src/main/frontend/.bowerrc</exclude> - <exclude>src/main/frontend/bower.json</exclude> + <exclude>src/main/frontend/package.json</exclude> <exclude>src/main/webapp/css/main.css</exclude> <exclude>src/main/webapp/js/jsonlint/*</exclude> <exclude>src/main/webapp/js/js-beautify/*</exclude> http://git-wip-us.apache.org/repos/asf/nifi/blob/af1732aa/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/.bowerrc ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/.bowerrc b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/.bowerrc deleted file mode 100644 index 31190ed..0000000 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/.bowerrc +++ /dev/null @@ -1,6 +0,0 @@ -{ - "ignoredDependencies": [ - "angular", - "codemirror" - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/af1732aa/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/bower.json ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/bower.json b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/bower.json deleted file mode 100644 index 08f08c6..0000000 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/bower.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "apache-nifi", - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "dependencies": { - "angular-ui-codemirror": "^0.3.0", - "angular-ui-router": "^0.2.18" - } -} http://git-wip-us.apache.org/repos/asf/nifi/blob/af1732aa/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/package.json ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/package.json b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/package.json new file mode 100644 index 0000000..2899812 --- /dev/null +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/package.json @@ -0,0 +1,12 @@ +{ + "name": "nifi-jolt-transform-json-ui", + "dependencies": { + "angular-ui-codemirror": "^0.3.0", + "angular-ui-router": "^0.2.18" + }, + "description": "Apache NiFi Jolt Transform JSON UI 3rd party client side resources.", + "repository": { + "type": "git", + "url": "https://github.com/apache/nifi"; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/af1732aa/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp index 750bd8b..96eda99 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/webapp/WEB-INF/jsp/index.jsp @@ -38,7 +38,7 @@ <script type="text/javascript" src="../nifi/assets/angular-material/angular-material.min.js"></script> <!--Bower Libraries--> -<script type="text/javascript" src="assets/angular-ui-codemirror/ui-codemirror.min.js"></script> +<script type="text/javascript" src="assets/angular-ui-codemirror/src/ui-codemirror.js"></script> <script type="text/javascript" src="assets/angular-ui-router/release/angular-ui-router.min.js"></script> <!--Local Libraries-->
