You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2014/12/21 03:43:15 UTC
incubator-nifi git commit: NIFI-192 fixed dependency
inclusion/exclusion logic for RPM
Repository: incubator-nifi
Updated Branches:
refs/heads/develop a3664a00c -> 42f9cfb2d
NIFI-192 fixed dependency inclusion/exclusion logic for RPM
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/42f9cfb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/42f9cfb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/42f9cfb2
Branch: refs/heads/develop
Commit: 42f9cfb2d94519fe11c83a7a28ce8ca2bdf896e1
Parents: a3664a0
Author: joewitt <jo...@apache.org>
Authored: Sat Dec 20 21:43:09 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Sat Dec 20 21:43:09 2014 -0500
----------------------------------------------------------------------
assembly/pom.xml | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/42f9cfb2/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 45ac535..7f7f695 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -383,9 +383,6 @@
<provides>
<provide>nifi</provide>
</provides>
- <requires>
- <require>jdk</require>
- </requires>
<mappings>
<mapping>
<directory>/opt/nifi/nifi-${project.version}</directory>
@@ -428,7 +425,19 @@
</mapping>
<mapping>
<directory>/opt/nifi/nifi-${project.version}/lib</directory>
- <dependency />
+ <dependency>
+ <excludes>
+ <exclude>org.apache.nifi:nifi-bootstrap</exclude>
+ </excludes>
+ </dependency>
+ </mapping>
+ <mapping>
+ <directory>/opt/nifi/nifi-${project.version}/lib/bootstrap</directory>
+ <dependency>
+ <includes>
+ <include>org.apache.nifi:nifi-bootstrap</include>
+ </includes>
+ </dependency>
</mapping>
<mapping>
<directory>/opt/nifi/nifi-${project.version}/docs</directory>