[accumulo] branch main updated: Remove redundant sortpom execution

[ct...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 18ba45e  Remove redundant sortpom execution
18ba45e is described below

commit 18ba45e144ea8213a9637fe36bf0d8a68c3f15f5
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Nov 5 22:28:45 2020 -0500

    Remove redundant sortpom execution
    
    Minor fixup of #1767
    
    * Remove redundant execution of sortpom verification that existed before
      the verifyformat profile was created in PR #1767 and keep the original
      execution phase and execution ID
    * Deconflict execution IDs for other plugins in the verifyformat
      profile, so plugin execution definitions don't clobber each other if
      both verifyformat and autoformat profiles are active
---
 pom.xml | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 59717b6..38a8acf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1133,20 +1133,6 @@
         </executions>
       </plugin>
       <plugin>
-        <!-- verify before compile; should be sorted already -->
-        <groupId>com.github.ekryd.sortpom</groupId>
-        <artifactId>sortpom-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>verify-sorted-pom</id>
-            <goals>
-              <goal>verify</goal>
-            </goals>
-            <phase>process-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
         <executions>
@@ -1521,11 +1507,11 @@
             <artifactId>sortpom-maven-plugin</artifactId>
             <executions>
               <execution>
-                <id>sort-pom</id>
+                <id>verify-sorted-pom</id>
                 <goals>
                   <goal>verify</goal>
                 </goals>
-                <phase>process-sources</phase>
+                <phase>process-resources</phase>
               </execution>
             </executions>
           </plugin>
@@ -1534,7 +1520,7 @@
             <artifactId>license-maven-plugin</artifactId>
             <executions>
               <execution>
-                <id>license-headers</id>
+                <id>verify-license-headers</id>
                 <goals>
                   <goal>check</goal>
                 </goals>
@@ -1547,7 +1533,7 @@
             <artifactId>formatter-maven-plugin</artifactId>
             <executions>
               <execution>
-                <id>format-java-source</id>
+                <id>verify-formatted-java-source</id>
                 <goals>
                   <goal>validate</goal>
                 </goals>
@@ -1559,7 +1545,7 @@
             <artifactId>impsort-maven-plugin</artifactId>
             <executions>
               <execution>
-                <id>sort-imports</id>
+                <id>verify-sorted-imports</id>
                 <goals>
                   <goal>check</goal>
                 </goals>