Use a version property for flatten-maven-plugin and keep sortpom on the committed feign-bom POM

Signed-off-by: Marvin Froeder <velo.br@gmail.com>

Author: velo

feign-bom/pom.xml

@@ -269,7 +269,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
-        <version>1.7.3</version>
+        <version>${flatten-maven-plugin.version}</version>
         <configuration>
           <flattenMode>bom</flattenMode>
           <pomElements>
@@ -279,20 +279,29 @@
         <executions>
           <execution>
             <id>flatten</id>
-            <phase>process-resources</phase>
             <goals>
               <goal>flatten</goal>
             </goals>
+            <phase>process-resources</phase>
           </execution>
           <execution>
             <id>flatten.clean</id>
-            <phase>clean</phase>
             <goals>
               <goal>clean</goal>
             </goals>
+            <phase>clean</phase>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.github.ekryd.sortpom</groupId>
+        <artifactId>sortpom-maven-plugin</artifactId>
+        <!-- flatten swaps project.file for .flattened-pom.xml, so point sortpom back at
+             the committed POM to keep it under format enforcement. -->
+        <configuration>
+          <pomFile>${project.basedir}/pom.xml</pomFile>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

pom.xml

@@ -205,6 +205,7 @@
     <maven-toolchains-plugin.version>3.3.0</maven-toolchains-plugin.version>
     <go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
     <sortpom-maven-plugin.version>4.0.0</sortpom-maven-plugin.version>
+    <flatten-maven-plugin.version>1.7.3</flatten-maven-plugin.version>
     <rewrite-maven-plugin.version>6.45.0</rewrite-maven-plugin.version>
     <rewrite-testing-frameworks.version>3.43.0</rewrite-testing-frameworks.version>
     <rewrite-migrate-java.version>3.41.0</rewrite-migrate-java.version>

src/config/bom.xml

@@ -72,7 +72,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
-        <version>1.7.3</version>
+        <version>${flatten-maven-plugin.version}</version>
         <configuration>
           <flattenMode>bom</flattenMode>
           <pomElements>
@@ -82,20 +82,29 @@
         <executions>
           <execution>
             <id>flatten</id>
-            <phase>process-resources</phase>
             <goals>
               <goal>flatten</goal>
             </goals>
+            <phase>process-resources</phase>
           </execution>
           <execution>
             <id>flatten.clean</id>
-            <phase>clean</phase>
             <goals>
               <goal>clean</goal>
             </goals>
+            <phase>clean</phase>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.github.ekryd.sortpom</groupId>
+        <artifactId>sortpom-maven-plugin</artifactId>
+        <!-- flatten swaps project.file for .flattened-pom.xml, so point sortpom back at
+             the committed POM to keep it under format enforcement. -->
+        <configuration>
+          <pomFile>${project.basedir}/pom.xml</pomFile>
+        </configuration>
+      </plugin>
     </plugins>
   </build>