Repository: nifi Updated Branches: refs/heads/master 56da2b51e -> 511f2a0c8
[NIFI-2812] Fix creating NiFi RPM This closes: PR 1047 This resolves: NIFI-2812 Signed-off-by: Andre F de Miranda <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/511f2a0c Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/511f2a0c Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/511f2a0c Branch: refs/heads/master Commit: 511f2a0c8bcae5a588073cfb34dbdafb5ee478c3 Parents: 56da2b5 Author: Artem Ermakov <[email protected]> Authored: Thu Sep 22 18:15:21 2016 +0300 Committer: Andre F de Miranda <[email protected]> Committed: Thu Nov 3 02:26:20 2016 +1100 ---------------------------------------------------------------------- nifi-assembly/pom.xml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/511f2a0c/nifi-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 5a7fc9d..036926f 100755 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -486,6 +486,11 @@ language governing permissions and limitations under the License. --> <destination>nifi.sh</destination> <filter>true</filter> </source> + <source> + <location>${project.build.directory}/generated-resources/bin/nifi-env.sh</location> + <destination>nifi-env.sh</destination> + <filter>true</filter> + </source> </sources> </mapping> <mapping> @@ -505,11 +510,18 @@ language governing permissions and limitations under the License. --> <directory>/opt/nifi/nifi-${project.version}/lib</directory> <dependency> <excludes> + <exclude>net.minidev:asm</exclude> + <exclude>asm:asm</exclude> + <exclude>org.bouncycastle:bcpkix-jdk15on</exclude> + <exclude>com.fasterxml.jackson.core:jackson-annotations</exclude> + <exclude>com.fasterxml.jackson.core:jackson-core</exclude> + <exclude>com.fasterxml.jackson.core:jackson-databind</exclude> + <exclude>com.jayway.jsonpath:json-path</exclude> + <exclude>net.minidev:json-smart</exclude> <exclude>org.apache.nifi:nifi-bootstrap</exclude> <exclude>org.apache.nifi:nifi-resources</exclude> <exclude>org.apache.nifi:nifi-docs</exclude> <exclude>commons-io:commons-io</exclude> - <exclude>org.apache.commons:commons-lang3</exclude> <exclude>org.antlr:antlr-runtime</exclude> <exclude>javax.activation:activation</exclude> <exclude>javax.mail:mail</exclude> @@ -524,6 +536,15 @@ language governing permissions and limitations under the License. --> <directory>/opt/nifi/nifi-${project.version}/lib/bootstrap</directory> <dependency> <includes> + <include>net.minidev:asm</include> + <include>asm:asm</include> + <include>org.bouncycastle:bcpkix-jdk15on</include> + <include>org.bouncycastle:bcprov-jdk15on</include> + <include>com.fasterxml.jackson.core:jackson-annotations</include> + <include>com.fasterxml.jackson.core:jackson-core</include> + <include>com.fasterxml.jackson.core:jackson-databind</include> + <include>com.jayway.jsonpath:json-path</include> + <include>net.minidev:json-smart</include> <include>commons-io:commons-io</include> <include>org.apache.commons:commons-lang3</include> <include>org.antlr:antlr-runtime</include>
