Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

This commit is contained in:
Matt Gilman 2015-05-05 23:04:18 -04:00
parent c90bb8a600 3472bf3f52
commit cf3dbef2a8
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-maven-plugin/pom.xml
View File

@ -38,7 +38,7 @@
<goal>perform</goal> <goal>perform</goal>
</goals> </goals>
<configuration> <configuration>
<pomFileName>nar-maven-plugin/pom.xml</pomFileName> <pomFileName>nifi-nar-maven-plugin/pom.xml</pomFileName>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

32
nifi-parent/pom.xml
View File

@ -259,14 +259,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<executions>
<execution>
<id>check-style</id>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<checkstyleRules> <checkstyleRules>
<module name="Checker"> <module name="Checker">
@ -377,9 +369,15 @@
</build> </build>
<profiles> <profiles>
<profile> <profile>
<!-- Automatically check for licenses. Too slow to always run. <!--
Activate with -P check-licenses --> Checks style and licensing requirements. This is a good idea to
<id>check-licenses</id> run for contributions and for the release process. While it
would be nice to run always these plugins can considerably slow
the build and have proven to create unstable builds in our
multi-module project and when building using multiple threads.
The stability issues seen with Checkstyle in multi-module builds
include false-positives and false negatives.-->
<id>contrib-check</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -394,6 +392,18 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<executions>
<execution>
<id>check-style</id>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>