Repository: nifi Updated Branches: refs/heads/master 8ef337b65 -> 06d621f35
NIFI-1454 fixed rpm name, bootstrap deps, updated rpm plugin version, removed extraneous license and notice Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/06d621f3 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/06d621f3 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/06d621f3 Branch: refs/heads/master Commit: 06d621f35806951b8d0cdc0f7b4c23ea4110983d Parents: 8ef337b Author: joewitt <[email protected]> Authored: Sun Jan 31 01:54:10 2016 -0500 Committer: joewitt <[email protected]> Committed: Sun Jan 31 20:19:59 2016 -0500 ---------------------------------------------------------------------- nifi-assembly/pom.xml | 15 +++++++++++++++ pom.xml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/06d621f3/nifi-assembly/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index d649317..f5e9a98 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -447,6 +447,7 @@ language governing permissions and limitations under the License. --> <includeArtifactIds>nifi-docs</includeArtifactIds> <includeGroupIds>org.apache.nifi</includeGroupIds> <excludeTransitive>false</excludeTransitive> + <excludes>LICENSE,NOTICE</excludes> </configuration> </execution> </executions> @@ -455,6 +456,7 @@ language governing permissions and limitations under the License. --> <groupId>org.codehaus.mojo</groupId> <artifactId>rpm-maven-plugin</artifactId> <configuration> + <name>nifi</name> <summary>Apache NiFi</summary> <description>Apache NiFi is dataflow system based on the Flow-Based Programming concepts.</description> <license>Apache License, Version 2.0 and others (see included LICENSE file)</license> @@ -534,7 +536,20 @@ language governing permissions and limitations under the License. --> <directory>/opt/nifi/nifi-${project.version}/lib/bootstrap</directory> <dependency> <includes> + <include>commons-io:commons-io</include> + <include>org.apache.commons:commons-lang3</include> + <include>org.antlr:antlr-runtime</include> + <include>javax.activation:activation</include> + <include>javax.mail:mail</include> + <include>org.apache.nifi:nifi-security-utils</include> + <include>org.apache.nifi:nifi-utils</include> + <include>org.apache.nifi:nifi-processor-utils</include> + <include>org.apache.nifi:nifi-expression-language</include> <include>org.apache.nifi:nifi-bootstrap</include> + <include>org.apache.nifi:nifi-api</include> + <include>org.slf4j:slf4j-api</include> + <include>ch.qos.logback:logback-classic</include> + <include>ch.qos.logback:logback-core</include> </includes> </dependency> </mapping> http://git-wip-us.apache.org/repos/asf/nifi/blob/06d621f3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6ba43c3..b00890b 100644 --- a/pom.xml +++ b/pom.xml @@ -1229,7 +1229,7 @@ language governing permissions and limitations under the License. --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>rpm-maven-plugin</artifactId> - <version>2.1.1</version> + <version>2.1.4</version> </plugin> <plugin> <groupId>org.antlr</groupId>
