Skip to content

Commit 881bbf0

Browse files
Vincent PotucekPankraz76
Vincent Potucek
authored and
Pankraz76
committed
Run maven BestPractices
1 parent fd774a3 commit 881bbf0

File tree

8 files changed

+171
-193
lines changed

8 files changed

+171
-193
lines changed

‎guava-bom/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
<url>https://github.com/google/guava</url>
1717
<inceptionYear>2010</inceptionYear>
1818

19-
<issueManagement>
20-
<system>GitHub Issues</system>
21-
<url>https://github.com/google/guava/issues</url>
22-
</issueManagement>
23-
2419
<licenses>
2520
<license>
2621
<name>Apache License, Version 2.0</name>
@@ -29,6 +24,11 @@
2924
</license>
3025
</licenses>
3126

27+
<issueManagement>
28+
<system>GitHub Issues</system>
29+
<url>https://github.com/google/guava/issues</url>
30+
</issueManagement>
31+
3232
<distributionManagement>
3333
<snapshotRepository>
3434
<id>sonatype-nexus-snapshots</id>

‎guava-gwt/pom.xml‎

Lines changed: 50 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,6 @@
2121
<gwt.plugin.version>2.10.0</gwt.plugin.version>
2222
<gwt.logLevel>WARN</gwt.logLevel>
2323
</properties>
24-
<repositories>
25-
<repository>
26-
<id>sonatype-google-snapshots</id>
27-
<name>sonatype-google-snapshots</name>
28-
<url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
29-
<snapshots>
30-
<enabled>true</enabled>
31-
</snapshots>
32-
</repository>
33-
</repositories>
34-
<pluginRepositories>
35-
<pluginRepository>
36-
<id>sonatype-snapshots</id>
37-
<name>sonatype-snapshots</name>
38-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
39-
<snapshots>
40-
<enabled>true</enabled>
41-
</snapshots>
42-
</pluginRepository>
43-
</pluginRepositories>
4424
<dependencies>
4525
<dependency>
4626
<groupId>com.google.guava</groupId>
@@ -123,16 +103,38 @@
123103
</exclusions>
124104
</dependency>
125105
</dependencies>
106+
<repositories>
107+
<repository>
108+
<id>sonatype-google-snapshots</id>
109+
<name>sonatype-google-snapshots</name>
110+
<url>https://oss.sonatype.org/content/repositories/google-snapshots/</url>
111+
<snapshots>
112+
<enabled>true</enabled>
113+
</snapshots>
114+
</repository>
115+
</repositories>
116+
<pluginRepositories>
117+
<pluginRepository>
118+
<id>sonatype-snapshots</id>
119+
<name>sonatype-snapshots</name>
120+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
121+
<snapshots>
122+
<enabled>true</enabled>
123+
</snapshots>
124+
</pluginRepository>
125+
</pluginRepositories>
126126
<build>
127127
<plugins>
128128
<plugin>
129129
<groupId>org.mvnsearch</groupId>
130130
<artifactId>toolchains-maven-plugin</artifactId>
131131
</plugin>
132132
<plugin>
133+
<groupId>org.apache.maven.plugins</groupId>
133134
<artifactId>maven-toolchains-plugin</artifactId>
134135
</plugin>
135136
<plugin>
137+
<groupId>org.apache.maven.plugins</groupId>
136138
<artifactId>maven-compiler-plugin</artifactId>
137139
<executions>
138140
<execution>
@@ -150,6 +152,7 @@
150152
</executions>
151153
</plugin>
152154
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
153156
<artifactId>maven-jar-plugin</artifactId>
154157
<configuration>
155158
<excludes>
@@ -160,6 +163,7 @@
160163
</configuration>
161164
</plugin>
162165
<plugin>
166+
<groupId>org.apache.maven.plugins</groupId>
163167
<artifactId>maven-source-plugin</artifactId>
164168
<configuration>
165169
<excludes>
@@ -170,6 +174,7 @@
170174
</configuration>
171175
</plugin>
172176
<plugin>
177+
<groupId>org.apache.maven.plugins</groupId>
173178
<artifactId>maven-javadoc-plugin</artifactId>
174179
<configuration>
175180
<sourceFileExcludes>
@@ -184,18 +189,22 @@
184189
</plugin>
185190
<!-- Disable "normal" testing, which doesn't work for GWT tests. -->
186191
<plugin>
192+
<groupId>org.apache.maven.plugins</groupId>
187193
<artifactId>maven-surefire-plugin</artifactId>
188194
<configuration>
189195
<skip>true</skip>
190196
</configuration>
191197
</plugin>
192198
<plugin>
199+
<groupId>org.apache.maven.plugins</groupId>
193200
<artifactId>maven-dependency-plugin</artifactId>
194201
<executions>
195202
<execution>
196203
<id>unpack-failureaccess-sources</id>
197204
<phase>generate-resources</phase>
198-
<goals><goal>unpack-dependencies</goal></goals>
205+
<goals>
206+
<goal>unpack-dependencies</goal>
207+
</goals>
199208
<configuration>
200209
<includeArtifactIds>failureaccess</includeArtifactIds>
201210
<classifier>sources</classifier>
@@ -209,7 +218,9 @@
209218
<execution>
210219
<id>unpack-guava-sources</id>
211220
<phase>generate-resources</phase>
212-
<goals><goal>unpack-dependencies</goal></goals>
221+
<goals>
222+
<goal>unpack-dependencies</goal>
223+
</goals>
213224
<configuration>
214225
<includeArtifactIds>guava</includeArtifactIds>
215226
<classifier>sources</classifier>
@@ -223,7 +234,9 @@
223234
<execution>
224235
<id>unpack-guava-testlib-sources</id>
225236
<phase>generate-resources</phase>
226-
<goals><goal>unpack-dependencies</goal></goals>
237+
<goals>
238+
<goal>unpack-dependencies</goal>
239+
</goals>
227240
<configuration>
228241
<includeArtifactIds>guava-testlib</includeArtifactIds>
229242
<classifier>sources</classifier>
@@ -237,7 +250,9 @@
237250
<execution>
238251
<id>unpack-guava-testlib-test-sources</id>
239252
<phase>generate-resources</phase>
240-
<goals><goal>unpack-dependencies</goal></goals>
253+
<goals>
254+
<goal>unpack-dependencies</goal>
255+
</goals>
241256
<configuration>
242257
<includeArtifactIds>guava-testlib</includeArtifactIds>
243258
<classifier>test-sources</classifier>
@@ -251,7 +266,9 @@
251266
<execution>
252267
<id>unpack-guava-test-sources</id>
253268
<phase>generate-resources</phase>
254-
<goals><goal>unpack-dependencies</goal></goals>
269+
<goals>
270+
<goal>unpack-dependencies</goal>
271+
</goals>
255272
<configuration>
256273
<includeArtifactIds>guava-tests</includeArtifactIds>
257274
<classifier>test-sources</classifier>
@@ -297,12 +314,15 @@
297314
</dependencies>
298315
</plugin>
299316
<plugin>
317+
<groupId>org.apache.maven.plugins</groupId>
300318
<artifactId>maven-antrun-plugin</artifactId>
301319
<executions>
302320
<execution>
303321
<id>copy-gwt-files</id>
304322
<phase>generate-resources</phase>
305-
<goals><goal>run</goal></goals>
323+
<goals>
324+
<goal>run</goal>
325+
</goals>
306326
<configuration>
307327
<target name="copy-gwt-resources">
308328
<delete dir="${project.build.directory}/guava-gwt-sources" quiet="true" />
@@ -418,8 +438,10 @@
418438
<extraJvmArgs>-Xms3500m -Xmx3500m -Xss1024k</extraJvmArgs>
419439
<sourceLevel>1.8</sourceLevel>
420440
<!-- Keep these timeouts very large because, if we hit the timeout, the tests silently pass :( -->
421-
<testTimeOut>86400 <!-- seconds --></testTimeOut>
422-
<testMethodTimeout>1440 <!-- minutes --></testMethodTimeout>
441+
<testTimeOut>86400
442+
<!-- seconds --></testTimeOut>
443+
<testMethodTimeout>1440
444+
<!-- minutes --></testMethodTimeout>
423445
<!-- Presumably we want watchFileChanges=false here, since we want it for compile: -->
424446
<extraJvmArgs>-Dgwt.watchFileChanges=false</extraJvmArgs>
425447
</configuration>

‎guava-testlib/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,11 @@
6767
<artifactId>toolchains-maven-plugin</artifactId>
6868
</plugin>
6969
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
7071
<artifactId>maven-toolchains-plugin</artifactId>
7172
</plugin>
7273
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
7375
<artifactId>maven-compiler-plugin</artifactId>
7476
<executions>
7577
<execution>
@@ -112,6 +114,7 @@
112114
</executions>
113115
</plugin>
114116
<plugin>
117+
<groupId>org.apache.maven.plugins</groupId>
115118
<artifactId>maven-source-plugin</artifactId>
116119
<executions>
117120
<execution>
@@ -122,6 +125,7 @@
122125
</executions>
123126
</plugin>
124127
<plugin>
128+
<groupId>org.apache.maven.plugins</groupId>
125129
<artifactId>maven-jar-plugin</artifactId>
126130
<executions>
127131
<execution>
@@ -135,9 +139,11 @@
135139
<artifactId>animal-sniffer-maven-plugin</artifactId>
136140
</plugin>
137141
<plugin>
142+
<groupId>org.apache.maven.plugins</groupId>
138143
<artifactId>maven-javadoc-plugin</artifactId>
139144
</plugin>
140145
<plugin>
146+
<groupId>org.apache.maven.plugins</groupId>
141147
<artifactId>maven-surefire-plugin</artifactId>
142148
</plugin>
143149
</plugins>

‎guava-tests/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,15 @@
7373
<artifactId>toolchains-maven-plugin</artifactId>
7474
</plugin>
7575
<plugin>
76+
<groupId>org.apache.maven.plugins</groupId>
7677
<artifactId>maven-toolchains-plugin</artifactId>
7778
</plugin>
7879
<plugin>
80+
<groupId>org.apache.maven.plugins</groupId>
7981
<artifactId>maven-compiler-plugin</artifactId>
8082
</plugin>
8183
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
8285
<artifactId>maven-source-plugin</artifactId>
8386
<executions>
8487
<execution>
@@ -89,9 +92,11 @@
8992
</executions>
9093
</plugin>
9194
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
9296
<artifactId>maven-surefire-plugin</artifactId>
9397
</plugin>
9498
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
95100
<artifactId>maven-jar-plugin</artifactId>
96101
<executions>
97102
<execution>
@@ -103,6 +108,7 @@
103108
<plugin>
104109
<groupId>org.sonatype.central</groupId>
105110
<artifactId>central-publishing-maven-plugin</artifactId>
111+
<version>0.8.0</version>
106112
<configuration>
107113
<skipPublishing>true</skipPublishing>
108114
</configuration>

‎guava/pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<artifactId>guava</artifactId>
1212
<packaging>bundle</packaging>
1313
<name>Guava: Google Core Libraries for Java</name>
14-
<url>https://github.com/google/guava</url>
1514
<description>
1615
Guava is a suite of core and expanded libraries that include
1716
utility classes, Google's collections, I/O classes, and
1817
much more.
1918
</description>
19+
<url>https://github.com/google/guava</url>
2020
<dependencies>
2121
<dependency>
2222
<groupId>com.google.guava</groupId>
@@ -46,7 +46,8 @@
4646
<resource>
4747
<directory>..</directory>
4848
<includes>
49-
<include>LICENSE</include> <!-- copied from the parent pom because I couldn't figure out a way to make combine.children="append" work -->
49+
<include>LICENSE</include>
50+
<!-- copied from the parent pom because I couldn't figure out a way to make combine.children="append" work -->
5051
<include>proguard/*</include>
5152
</includes>
5253
<targetPath>META-INF</targetPath>
@@ -58,9 +59,11 @@
5859
<artifactId>toolchains-maven-plugin</artifactId>
5960
</plugin>
6061
<plugin>
62+
<groupId>org.apache.maven.plugins</groupId>
6163
<artifactId>maven-toolchains-plugin</artifactId>
6264
</plugin>
6365
<plugin>
66+
<groupId>org.apache.maven.plugins</groupId>
6467
<artifactId>maven-jar-plugin</artifactId>
6568
</plugin>
6669
<plugin>
@@ -98,6 +101,7 @@
98101
</configuration>
99102
</plugin>
100103
<plugin>
104+
<groupId>org.apache.maven.plugins</groupId>
101105
<artifactId>maven-compiler-plugin</artifactId>
102106
<executions>
103107
<execution>
@@ -140,13 +144,15 @@
140144
</executions>
141145
</plugin>
142146
<plugin>
147+
<groupId>org.apache.maven.plugins</groupId>
143148
<artifactId>maven-source-plugin</artifactId>
144149
</plugin>
145150
<plugin>
146151
<groupId>org.codehaus.mojo</groupId>
147152
<artifactId>animal-sniffer-maven-plugin</artifactId>
148153
</plugin>
149154
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
150156
<artifactId>maven-javadoc-plugin</artifactId>
151157
<configuration>
152158
<!-- Passing `-subpackages com.google.common` breaks things, so we explicitly exclude everything else instead. -->
@@ -202,6 +208,7 @@
202208
</configuration>
203209
</plugin>
204210
<plugin>
211+
<groupId>org.apache.maven.plugins</groupId>
205212
<artifactId>maven-resources-plugin</artifactId>
206213
<executions>
207214
<execution>

‎pmd.xml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)