accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/7] accumulo git commit: ACCUMULO-3782 Automatically run sortpom
Date Fri, 08 May 2015 00:03:09 GMT
ACCUMULO-3782 Automatically run sortpom

* Enable sortpom-maven-plugin by default in the autoformat profile.
* Verify pom sort after sorting.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6d8f47c3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6d8f47c3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6d8f47c3

Branch: refs/heads/master
Commit: 6d8f47c35285c7f76d2cc84db01719a19008ce31
Parents: 6771ff7
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu May 7 17:10:59 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu May 7 17:42:52 2015 -0400

----------------------------------------------------------------------
 pom.xml | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6d8f47c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3188cac..3aaff0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -547,6 +547,7 @@
           <version>2.4.0</version>
           <configuration>
             <predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
+            <createBackupFile>false</createBackupFile>
             <lineSeparator>\n</lineSeparator>
             <expandEmptyElements>false</expandEmptyElements>
             <nrOfIndentSpace>2</nrOfIndentSpace>
@@ -862,6 +863,7 @@
                     <artifactId>sortpom-maven-plugin</artifactId>
                     <versionRange>[2.4.0,)</versionRange>
                     <goals>
+                      <goal>sort</goal>
                       <goal>verify</goal>
                     </goals>
                   </pluginExecutionFilter>
@@ -954,7 +956,7 @@
     </pluginManagement>
     <plugins>
       <plugin>
-        <!-- verify only; 'mvn clean -P sortpom' sorts -->
+        <!-- verify before compile; should be sorted already -->
         <groupId>com.github.ekryd.sortpom</groupId>
         <artifactId>sortpom-maven-plugin</artifactId>
         <executions>
@@ -963,7 +965,7 @@
             <goals>
               <goal>verify</goal>
             </goals>
-            <phase>validate</phase>
+            <phase>process-resources</phase>
           </execution>
         </executions>
       </plugin>
@@ -1314,21 +1316,6 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
-            <artifactId>maven-java-formatter-plugin</artifactId>
-            <configuration>
-              <configFile>${eclipseFormatterStyle}</configFile>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <!-- 'mvn clean -P sortpom' sorts -->
-      <id>sortpom</id>
-      <build>
-        <plugins>
-          <plugin>
             <groupId>com.github.ekryd.sortpom</groupId>
             <artifactId>sortpom-maven-plugin</artifactId>
             <executions>
@@ -1337,10 +1324,17 @@
                 <goals>
                   <goal>sort</goal>
                 </goals>
-                <phase>clean</phase>
+                <phase>process-sources</phase>
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
+            <artifactId>maven-java-formatter-plugin</artifactId>
+            <configuration>
+              <configFile>${eclipseFormatterStyle}</configFile>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>


Mime
View raw message