Repository: nifi Updated Branches: refs/heads/master 1ac44a0a4 -> 6710094bd
create bower.options mvn property to support bower cli options...including --offline Signed-off-by: Matt Burgess <mattyb...@apache.org> This closes #505 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6710094b Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6710094b Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6710094b Branch: refs/heads/master Commit: 6710094bd79ff2570c252f739debe4bf648c795f Parents: 1ac44a0 Author: Scott Aslan <jas...@hortonworks.com> Authored: Tue Jun 7 13:41:14 2016 -0400 Committer: Matt Burgess <mattyb...@apache.org> Committed: Tue Jun 7 14:05:32 2016 -0400 ---------------------------------------------------------------------- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/6710094b/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 ffce69b..c52f6f0 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 @@ -38,6 +38,10 @@ <frontend.dependency.configs>${basedir}/src/main/frontend</frontend.dependency.configs> <frontend.working.dir>${project.build.directory}/frontend-working-directory</frontend.working.dir> <frontend.assets>${project.build.directory}/${project.build.finalName}/assets</frontend.assets> + <!-- + This property can be set on the command line and allows any bower cli options to be set. + --> + <bower.options></bower.options> </properties> <build> <!-- @@ -65,10 +69,10 @@ <!-- Precompile jsp's and add entries into the web.xml - the web.xml is automatically places in ${project.build.directory}. Do not - precompile canvas.jsp, summary.jsp, history.jsp, etc. - These jsp's need to have the artifacts version filtered in to - eliminate broswer caching issues and set up the proper includes. - Since the webResource filter occurs after the precompilation we + precompile canvas.jsp, summary.jsp, history.jsp, etc. + These jsp's need to have the artifacts version filtered in to + eliminate broswer caching issues and set up the proper includes. + Since the webResource filter occurs after the precompilation we must exclude them here. --> <plugin> @@ -152,7 +156,7 @@ <!-- Tell the war plugin where to find the filtered web.xml and filter the head portion of the pages. The correct includes and - project version is filtered into these jsp's as a browser cache + project version is filtered into these jsp's as a browser cache buster. --> <plugin> @@ -272,7 +276,7 @@ <goal>bower</goal> </goals> <configuration> - <arguments>install --config.directory=${frontend.assets}</arguments> + <arguments>install ${bower.options} --config.directory=${frontend.assets}</arguments> <workingDirectory>${frontend.working.dir}</workingDirectory> </configuration> </execution> @@ -300,7 +304,7 @@ <build> <plugins> <!-- - Minifies and compresses the javascript and css. + Minifies and compresses the javascript and css. --> <plugin> <groupId>net.alchim31.maven</groupId>
