Merge branch 'NIFI-195' of https://github.com/khmarbaise/incubator-nifi into develop

This commit is contained in:
joewitt 2014-12-22 21:18:45 -05:00
commit df9529c561
1 changed files with 0 additions and 10 deletions

10
pom.xml
View File

@ -143,11 +143,6 @@
<version>2.9</version>
<type>maven-plugin</type>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
@ -890,11 +885,6 @@
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>