Use recommended_2008_06 on sortpom

OpenFeign · Oct 7, 2024 · 19a6131 · 19a6131
1 parent 93a86db
commit 19a6131
Show file tree

Hide file tree

Showing 14 changed files with 119 additions and 681 deletions.
diff --git a/.mvn/.develocity/develocity-workspace-id b/.mvn/.develocity/develocity-workspace-id
@@ -1 +1 @@
-kb5sou75s5bebgilztnvdtqvw4
+h5io2ff2gzdbbjanvoljkzgzra
diff --git a/apt-test-generator/pom.xml b/apt-test-generator/pom.xml
@@ -106,10 +106,10 @@
         <version>3.6.0</version>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -130,10 +130,10 @@
         </configuration>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>really-executable-jar</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
@@ -176,10 +176,10 @@
         <executions>
           <!-- see definition of how this runs above -->
           <execution>
-            <phase>post-integration-test</phase>
             <goals>
               <goal>build</goal>
             </goals>
+            <phase>post-integration-test</phase>
           </execution>
         </executions>
       </plugin>

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
@@ -140,10 +140,10 @@
         <version>3.6.0</version>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -164,10 +164,10 @@
         </configuration>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>really-executable-jar</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>

diff --git a/example-github-with-coroutine/pom.xml b/example-github-with-coroutine/pom.xml
@@ -61,10 +61,10 @@
         <version>3.6.0</version>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -85,10 +85,10 @@
         </configuration>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>really-executable-jar</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>

diff --git a/example-github/pom.xml b/example-github/pom.xml
@@ -57,10 +57,10 @@
         <version>3.6.0</version>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -81,10 +81,10 @@
         </configuration>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>really-executable-jar</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>

diff --git a/example-wikipedia/pom.xml b/example-wikipedia/pom.xml
@@ -58,10 +58,10 @@
         <version>3.6.0</version>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -82,10 +82,10 @@
         </configuration>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>really-executable-jar</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>

diff --git a/jakarta/pom.xml b/jakarta/pom.xml
@@ -27,20 +27,20 @@
   <name>Feign Jakarta</name>
   <description>Feign Jakarta</description>
 
-  <properties>
-    <main.java.version>11</main.java.version>
-    <main.basedir>${project.basedir}/..</main.basedir>
-
-    <moditect.skip>true</moditect.skip>
-  </properties>
-
   <distributionManagement>
     <relocation>
       <groupId>${project.groupId}</groupId>
       <artifactId>feign-jaxrs3</artifactId>
     </relocation>
   </distributionManagement>
 
+  <properties>
+    <main.java.version>11</main.java.version>
+    <main.basedir>${project.basedir}/..</main.basedir>
+
+    <moditect.skip>true</moditect.skip>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
@@ -77,10 +77,10 @@
         <executions>
           <execution>
             <id>jakarta-ee</id>
-            <phase>package</phase>
             <goals>
               <goal>run</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <classifier>jakarta</classifier>
             </configuration>

diff --git a/jaxrs2/pom.xml b/jaxrs2/pom.xml
@@ -122,10 +122,10 @@
         <executions>
           <execution>
             <id>jakarta-ee</id>
-            <phase>package</phase>
             <goals>
               <goal>run</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <classifier>jakarta</classifier>
             </configuration>

diff --git a/kotlin/pom.xml b/kotlin/pom.xml
@@ -126,17 +126,17 @@
           </execution>
           <execution>
             <id>java-compile</id>
-            <phase>compile</phase>
             <goals>
               <goal>compile</goal>
             </goals>
+            <phase>compile</phase>
           </execution>
           <execution>
             <id>java-test-compile</id>
-            <phase>test-compile</phase>
             <goals>
               <goal>testCompile</goal>
             </goals>
+            <phase>test-compile</phase>
           </execution>
         </executions>
       </plugin>

diff --git a/okhttp/pom.xml b/okhttp/pom.xml
@@ -71,10 +71,10 @@
         <executions>
           <execution>
             <id>add-module-infos</id>
-            <phase>package</phase>
             <goals>
               <goal>add-module-info</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <exclusions>
                 <exclusion>