From 9b0a9a6415f84a170c19cf226b505cb52d48ee04 Mon Sep 17 00:00:00 2001
From: joewitt <joewitt@apache.org>
Date: Tue, 23 Dec 2014 22:28:42 -0500
Subject: [PATCH] NIFI-198 formatting adjustment, removed comments provided as
 guides to understand previous patch

---
 nar-maven-plugin/pom.xml | 32 ++++++++++++++++++++---
 pom.xml                  | 55 ++++++++++++++++++----------------------
 2 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/nar-maven-plugin/pom.xml b/nar-maven-plugin/pom.xml
index e539f0a12d..c63f272ac8 100644
--- a/nar-maven-plugin/pom.xml
+++ b/nar-maven-plugin/pom.xml
@@ -68,6 +68,9 @@
         <url>https://issues.apache.org/jira/browse/NIFI</url>
     </issueManagement>
     <properties>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.version>3.0.5</maven.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -79,11 +82,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.2</version>
                     <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
                         <fork>true</fork>
                         <optimize>true</optimize>
-                        <encoding>UTF-8</encoding>
                         <showDeprecation>true</showDeprecation>
                         <showWarnings>true</showWarnings>
                     </configuration>
@@ -186,6 +186,32 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireSameVersions>
+                                    <plugins>
+                                        <plugin>org.apache.maven.plugins:maven-surefire-plugin</plugin>
+                                        <plugin>org.apache.maven.plugins:maven-failsafe-plugin</plugin>
+                                        <plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
+                                    </plugins>
+                                </requireSameVersions>
+                                <requireMavenVersion>
+                                    <version>${maven.version}</version>
+                                </requireMavenVersion>
+                            </rules>    
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <dependencyManagement>
diff --git a/pom.xml b/pom.xml
index af2b2f7ace..58831a97ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,16 +85,9 @@
         <url>https://issues.apache.org/jira/browse/NIFI</url>
     </issueManagement>
     <properties>
-        <!--
-          ! Configure the maven-compiler-plugin to use 1.7 for source/target.
-        -->
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <!--
-          ! Maven minimum version 3.0.5
-        -->
         <maven.version>3.0.5</maven.version>
-
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <org.slf4j.version>1.7.8</org.slf4j.version>
@@ -917,30 +910,30 @@
         </pluginManagement>
         <plugins>
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-enforcer-plugin</artifactId>
-              <executions>
-                <execution>
-                  <id>enforce-maven</id>
-                  <goals>
-                    <goal>enforce</goal>
-                  </goals>
-                  <configuration>
-                    <rules>
-                      <requireSameVersions>
-                        <plugins>
-                          <plugin>org.apache.maven.plugins:maven-surefire-plugin</plugin>
-                          <plugin>org.apache.maven.plugins:maven-failsafe-plugin</plugin>
-                          <plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
-                        </plugins>
-                      </requireSameVersions>
-                      <requireMavenVersion>
-                        <version>${maven.version}</version>
-                      </requireMavenVersion>
-                    </rules>    
-                  </configuration>
-                </execution>
-              </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireSameVersions>
+                                    <plugins>
+                                        <plugin>org.apache.maven.plugins:maven-surefire-plugin</plugin>
+                                        <plugin>org.apache.maven.plugins:maven-failsafe-plugin</plugin>
+                                        <plugin>org.apache.maven.plugins:maven-surefire-report-plugin</plugin>
+                                    </plugins>
+                                </requireSameVersions>
+                                <requireMavenVersion>
+                                    <version>${maven.version}</version>
+                                </requireMavenVersion>
+                            </rules>    
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.nifi</groupId>