Repository: nifi Updated Branches: refs/heads/master 5999eab43 -> c527f6423
[NIFI-1762] Remove bower and npm from convenience binaries. This closes #412. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c527f642 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c527f642 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c527f642 Branch: refs/heads/master Commit: c527f642308ad229f0f2527368d3202c19ff3be9 Parents: 5999eab Author: Scott Aslan <[email protected]> Authored: Wed May 4 13:22:26 2016 -0400 Committer: Matt Gilman <[email protected]> Committed: Wed May 4 15:23:11 2016 -0400 ---------------------------------------------------------------------- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 38 +++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/c527f642/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 1d276c1..dd2ea09 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 @@ -35,6 +35,9 @@ <bulletin.board.filter>bulletin-board.properties</bulletin.board.filter> <login.filter>login.properties</login.filter> <provenance.filter>provenance.properties</provenance.filter> + <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> </properties> <build> <!-- @@ -109,6 +112,7 @@ <artifactId>maven-resources-plugin</artifactId> <executions> <execution> + <id>copy-web-xml</id> <phase>prepare-package</phase> <goals> <goal>copy-resources</goal> @@ -126,6 +130,25 @@ </resources> </configuration> </execution> + <execution> + <id>copy-bower-json</id> + <phase>generate-sources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${frontend.working.dir}</outputDirectory> + <resources> + <resource> + <directory>${frontend.dependency.configs}</directory> + <filtering>false</filtering> + <includes> + <include>bower.json</include> + </includes> + </resource> + </resources> + </configuration> + </execution> </executions> </plugin> <!-- @@ -220,13 +243,12 @@ <artifactId>frontend-maven-plugin</artifactId> <version>1.0</version> <configuration> - <workingDirectory>src/main/frontend</workingDirectory> - <installDirectory>${project.build.directory}/${project.build.finalName}/assets</installDirectory> + <installDirectory>${frontend.working.dir}</installDirectory> </configuration> <executions> <execution> - <id>install node and npm</id> + <id>install-node-and-npm</id> <goals> <goal>install-node-and-npm</goal> </goals> @@ -237,23 +259,23 @@ </configuration> </execution> <execution> - <id>install bower</id> + <id>install-bower</id> <goals> <goal>npm</goal> </goals> <configuration> <arguments>install bower</arguments> - <workingDirectory>${project.build.directory}/${project.build.finalName}/assets</workingDirectory> + <workingDirectory>${frontend.working.dir}</workingDirectory> </configuration> </execution> <execution> - <id>bower install</id> + <id>bower-install</id> <goals> <goal>bower</goal> </goals> <configuration> - <arguments>install ../../../src/main/frontend --config.directory=${project.build.directory}/${project.build.finalName}/assets</arguments> - <workingDirectory>${project.build.directory}/${project.build.finalName}/assets</workingDirectory> + <arguments>install --config.directory=${frontend.assets}</arguments> + <workingDirectory>${frontend.working.dir}</workingDirectory> </configuration> </execution> </executions>
