From 41b21af5769211b9a57e5bef47fe40c6d34839b1 Mon Sep 17 00:00:00 2001
From: joewitt <joewitt@apache.org>
Date: Tue, 5 May 2015 00:59:28 -0400
Subject: [PATCH 1/2] NIFI-587 moved checkstyle into profile with rat plugin. 
 They were too unstable

---
 nifi-parent/pom.xml | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/nifi-parent/pom.xml b/nifi-parent/pom.xml
index 6fcf3643c1..fb2f827b7d 100644
--- a/nifi-parent/pom.xml
+++ b/nifi-parent/pom.xml
@@ -259,14 +259,6 @@
             <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>                
                 <configuration>
                     <checkstyleRules>
                         <module name="Checker">
@@ -377,9 +369,15 @@
     </build>
     <profiles>
         <profile>
-            <!-- Automatically check for licenses.  Too slow to always run.
-            Activate with -P check-licenses -->
-            <id>check-licenses</id>
+            <!-- 
+                Checks style and licensing requirements.  This is a good idea to 
+                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>
                 <plugins>
                     <plugin>
@@ -394,6 +392,18 @@
                             </execution>
                         </executions>
                     </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>
             </build>
         </profile>

From 3472bf3f52c875c38a0dc97645f99c909a4ac304 Mon Sep 17 00:00:00 2001
From: Mark Payne <markap14@hotmail.com>
Date: Tue, 5 May 2015 13:58:18 -0400
Subject: [PATCH 2/2] NIFI-429: Fixed typo in pom

---
 nifi-nar-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-maven-plugin/pom.xml b/nifi-nar-maven-plugin/pom.xml
index 765cbdf569..95cee00528 100644
--- a/nifi-nar-maven-plugin/pom.xml
+++ b/nifi-nar-maven-plugin/pom.xml
@@ -38,7 +38,7 @@
                                 <goal>perform</goal>
                             </goals>
                             <configuration>
-                                <pomFileName>nar-maven-plugin/pom.xml</pomFileName>
+                                <pomFileName>nifi-nar-maven-plugin/pom.xml</pomFileName>
                             </configuration>
                         </execution>
                     </executions>