NIFI-1454 fixed rpm name, bootstrap deps, updated rpm plugin version, removed extraneous license and notice

This commit is contained in:
joewitt 2016-01-31 01:54:10 -05:00
parent 8ef337b65e
commit 06d621f358
2 changed files with 16 additions and 1 deletions

View File

@ -447,6 +447,7 @@ language governing permissions and limitations under the License. -->
<includeArtifactIds>nifi-docs</includeArtifactIds> <includeArtifactIds>nifi-docs</includeArtifactIds>
<includeGroupIds>org.apache.nifi</includeGroupIds> <includeGroupIds>org.apache.nifi</includeGroupIds>
<excludeTransitive>false</excludeTransitive> <excludeTransitive>false</excludeTransitive>
<excludes>LICENSE,NOTICE</excludes>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -455,6 +456,7 @@ language governing permissions and limitations under the License. -->
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId> <artifactId>rpm-maven-plugin</artifactId>
<configuration> <configuration>
<name>nifi</name>
<summary>Apache NiFi</summary> <summary>Apache NiFi</summary>
<description>Apache NiFi is dataflow system based on the Flow-Based Programming concepts.</description> <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> <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> <directory>/opt/nifi/nifi-${project.version}/lib/bootstrap</directory>
<dependency> <dependency>
<includes> <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-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> </includes>
</dependency> </dependency>
</mapping> </mapping>

View File

@ -1229,7 +1229,7 @@ language governing permissions and limitations under the License. -->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId> <artifactId>rpm-maven-plugin</artifactId>
<version>2.1.1</version> <version>2.1.4</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.antlr</groupId> <groupId>org.antlr</groupId>