Skip to content

Commit 91d8421

Browse files
velovelo
committed
Use recommended_2008_06 on sortpom
1 parent b2c9f26 commit 91d8421

File tree

13 files changed

+123
-685
lines changed

13 files changed

+123
-685
lines changed

‎apt-test-generator/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@
106106
<version>3.6.0</version>
107107
<executions>
108108
<execution>
109-
<phase>package</phase>
110109
<goals>
111110
<goal>shade</goal>
112111
</goals>
112+
<phase>package</phase>
113113
<configuration>
114114
<transformers>
115115
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -130,10 +130,10 @@
130130
</configuration>
131131
<executions>
132132
<execution>
133-
<phase>package</phase>
134133
<goals>
135134
<goal>really-executable-jar</goal>
136135
</goals>
136+
<phase>package</phase>
137137
</execution>
138138
</executions>
139139
</plugin>
@@ -176,10 +176,10 @@
176176
<executions>
177177
<!-- see definition of how this runs above -->
178178
<execution>
179-
<phase>post-integration-test</phase>
180179
<goals>
181180
<goal>build</goal>
182181
</goals>
182+
<phase>post-integration-test</phase>
183183
</execution>
184184
</executions>
185185
</plugin>

‎benchmark/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@
140140
<version>3.6.0</version>
141141
<executions>
142142
<execution>
143-
<phase>package</phase>
144143
<goals>
145144
<goal>shade</goal>
146145
</goals>
146+
<phase>package</phase>
147147
<configuration>
148148
<transformers>
149149
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -164,10 +164,10 @@
164164
</configuration>
165165
<executions>
166166
<execution>
167-
<phase>package</phase>
168167
<goals>
169168
<goal>really-executable-jar</goal>
170169
</goals>
170+
<phase>package</phase>
171171
</execution>
172172
</executions>
173173
</plugin>

‎example-github-with-coroutine/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
<version>3.6.0</version>
6262
<executions>
6363
<execution>
64-
<phase>package</phase>
6564
<goals>
6665
<goal>shade</goal>
6766
</goals>
67+
<phase>package</phase>
6868
<configuration>
6969
<transformers>
7070
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -85,10 +85,10 @@
8585
</configuration>
8686
<executions>
8787
<execution>
88-
<phase>package</phase>
8988
<goals>
9089
<goal>really-executable-jar</goal>
9190
</goals>
91+
<phase>package</phase>
9292
</execution>
9393
</executions>
9494
</plugin>

‎example-github/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
<version>3.6.0</version>
5858
<executions>
5959
<execution>
60-
<phase>package</phase>
6160
<goals>
6261
<goal>shade</goal>
6362
</goals>
63+
<phase>package</phase>
6464
<configuration>
6565
<transformers>
6666
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -81,10 +81,10 @@
8181
</configuration>
8282
<executions>
8383
<execution>
84-
<phase>package</phase>
8584
<goals>
8685
<goal>really-executable-jar</goal>
8786
</goals>
87+
<phase>package</phase>
8888
</execution>
8989
</executions>
9090
</plugin>

‎example-wikipedia/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
<version>3.6.0</version>
5959
<executions>
6060
<execution>
61-
<phase>package</phase>
6261
<goals>
6362
<goal>shade</goal>
6463
</goals>
64+
<phase>package</phase>
6565
<configuration>
6666
<transformers>
6767
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
@@ -82,10 +82,10 @@
8282
</configuration>
8383
<executions>
8484
<execution>
85-
<phase>package</phase>
8685
<goals>
8786
<goal>really-executable-jar</goal>
8887
</goals>
88+
<phase>package</phase>
8989
</execution>
9090
</executions>
9191
</plugin>

‎jakarta/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@
2727
<name>Feign Jakarta</name>
2828
<description>Feign Jakarta</description>
2929

30-
<properties>
31-
<main.java.version>11</main.java.version>
32-
<main.basedir>${project.basedir}/..</main.basedir>
33-
34-
<moditect.skip>true</moditect.skip>
35-
</properties>
36-
3730
<distributionManagement>
3831
<relocation>
3932
<groupId>${project.groupId}</groupId>
4033
<artifactId>feign-jaxrs3</artifactId>
4134
</relocation>
4235
</distributionManagement>
4336

37+
<properties>
38+
<main.java.version>11</main.java.version>
39+
<main.basedir>${project.basedir}/..</main.basedir>
40+
41+
<moditect.skip>true</moditect.skip>
42+
</properties>
43+
4444
<dependencies>
4545
<dependency>
4646
<groupId>${project.groupId}</groupId>

‎jaxrs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@
7777
<executions>
7878
<execution>
7979
<id>jakarta-ee</id>
80-
<phase>package</phase>
8180
<goals>
8281
<goal>run</goal>
8382
</goals>
83+
<phase>package</phase>
8484
<configuration>
8585
<classifier>jakarta</classifier>
8686
</configuration>

‎jaxrs2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@
122122
<executions>
123123
<execution>
124124
<id>jakarta-ee</id>
125-
<phase>package</phase>
126125
<goals>
127126
<goal>run</goal>
128127
</goals>
128+
<phase>package</phase>
129129
<configuration>
130130
<classifier>jakarta</classifier>
131131
</configuration>

‎kotlin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,17 +126,17 @@
126126
</execution>
127127
<execution>
128128
<id>java-compile</id>
129-
<phase>compile</phase>
130129
<goals>
131130
<goal>compile</goal>
132131
</goals>
132+
<phase>compile</phase>
133133
</execution>
134134
<execution>
135135
<id>java-test-compile</id>
136-
<phase>test-compile</phase>
137136
<goals>
138137
<goal>testCompile</goal>
139138
</goals>
139+
<phase>test-compile</phase>
140140
</execution>
141141
</executions>
142142
</plugin>

‎okhttp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@
7171
<executions>
7272
<execution>
7373
<id>add-module-infos</id>
74-
<phase>package</phase>
7574
<goals>
7675
<goal>add-module-info</goal>
7776
</goals>
77+
<phase>package</phase>
7878
<configuration>
7979
<exclusions>
8080
<exclusion>

0 commit comments

Comments
 (0)