Skip to content

Commit 99cce40

Browse files
bjornbjorn
authored
libtiled-java: Various pom.xml updates (#4207)
* Specify requireMavenVersion 3.5.4 * Update all plugins accordingly * Update dependencies to their latest releases * Use maven.compiler.release from JDK 9 onwards * Updated http URLs to https
1 parent 9118420 commit 99cce40

File tree

3 files changed

+94
-40
lines changed

3 files changed

+94
-40
lines changed

‎util/java/libtiled-java/pom.xml

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<description>
1919
A small Java library to load Tiled maps.
2020
</description>
21-
<url>http://www.mapeditor.org/</url>
21+
<url>https://www.mapeditor.org/</url>
2222

2323
<scm>
2424
<url>https://github.com/mapeditor/tiled</url>
@@ -30,13 +30,33 @@
3030
<dependency>
3131
<groupId>org.junit.vintage</groupId>
3232
<artifactId>junit-vintage-engine</artifactId>
33-
<version>5.7.0</version>
33+
<version>5.13.0</version>
3434
<scope>test</scope>
3535
</dependency>
3636
</dependencies>
3737

3838
<build>
3939
<plugins>
40+
<plugin>
41+
<groupId>org.apache.maven.plugins</groupId>
42+
<artifactId>maven-enforcer-plugin</artifactId>
43+
<version>3.4.1</version>
44+
<executions>
45+
<execution>
46+
<id>enforce-maven</id>
47+
<goals>
48+
<goal>enforce</goal>
49+
</goals>
50+
<configuration>
51+
<rules>
52+
<requireMavenVersion>
53+
<version>3.5.4</version>
54+
</requireMavenVersion>
55+
</rules>
56+
</configuration>
57+
</execution>
58+
</executions>
59+
</plugin>
4060
<plugin>
4161
<groupId>org.apache.maven.plugins</groupId>
4262
<artifactId>maven-site-plugin</artifactId>
@@ -55,7 +75,7 @@
5575
<plugin>
5676
<groupId>org.jacoco</groupId>
5777
<artifactId>jacoco-maven-plugin</artifactId>
58-
<version>0.8.6</version>
78+
<version>0.8.13</version>
5979
<executions>
6080
<execution>
6181
<goals>
@@ -144,7 +164,7 @@
144164
<plugin>
145165
<groupId>org.codehaus.mojo</groupId>
146166
<artifactId>exec-maven-plugin</artifactId>
147-
<version>3.0.0</version>
167+
<version>3.1.0</version>
148168
<configuration>
149169
<executable>jar</executable>
150170
<workingDirectory>target/generated-test-resources</workingDirectory>
@@ -169,7 +189,7 @@
169189
<plugin>
170190
<groupId>org.codehaus.mojo</groupId>
171191
<artifactId>build-helper-maven-plugin</artifactId>
172-
<version>3.2.0</version>
192+
<version>3.4.0</version>
173193
<executions>
174194
<execution>
175195
<id>add-test-resources</id>
@@ -200,7 +220,7 @@
200220
<dependency>
201221
<groupId>javax.xml.bind</groupId>
202222
<artifactId>jaxb-api</artifactId>
203-
<version>2.3.1</version>
223+
<version>2.4.0-b180830.0359</version>
204224
</dependency>
205225
<dependency>
206226
<groupId>javax.annotation</groupId>
@@ -210,7 +230,7 @@
210230
<dependency>
211231
<groupId>org.glassfish.jaxb</groupId>
212232
<artifactId>jaxb-runtime</artifactId>
213-
<version>2.3.6</version>
233+
<version>4.0.5</version>
214234
</dependency>
215235
</dependencies>
216236
</profile>

‎util/java/pom.xml

Lines changed: 60 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description>
1515
Parent for Tiled map editor projects.
1616
</description>
17-
<url>http://www.mapeditor.org/</url>
17+
<url>https://www.mapeditor.org/</url>
1818
<inceptionYear>2004</inceptionYear>
1919
<organization>
2020
<name>Thorbjørn Lindeijer &lt;[email protected]&gt;</name>
@@ -77,8 +77,8 @@
7777

7878
<properties>
7979
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
80-
<maven.compiler.source>1.8</maven.compiler.source>
81-
<maven.compiler.target>1.8</maven.compiler.target>
80+
<maven.compiler.source>8</maven.compiler.source>
81+
<maven.compiler.target>8</maven.compiler.target>
8282
</properties>
8383

8484
<build>
@@ -87,60 +87,75 @@
8787
<plugin>
8888
<groupId>org.apache.maven.plugins</groupId>
8989
<artifactId>maven-antrun-plugin</artifactId>
90-
<version>3.0.0</version>
90+
<version>3.1.0</version>
9191
</plugin>
9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-assembly-plugin</artifactId>
95-
<version>3.3.0</version>
95+
<version>3.6.0</version>
9696
</plugin>
9797
<plugin>
9898
<groupId>org.apache.maven.plugins</groupId>
9999
<artifactId>maven-clean-plugin</artifactId>
100-
<version>3.1.0</version>
100+
<version>3.3.2</version>
101101
</plugin>
102102
<plugin>
103103
<groupId>org.apache.maven.plugins</groupId>
104104
<artifactId>maven-compiler-plugin</artifactId>
105-
<version>3.8.1</version>
105+
<version>3.12.1</version>
106106
<configuration>
107107
<showDeprecation>true</showDeprecation>
108108
</configuration>
109109
</plugin>
110110
<plugin>
111111
<groupId>org.apache.maven.plugins</groupId>
112112
<artifactId>maven-dependency-plugin</artifactId>
113-
<version>3.1.2</version>
113+
<version>3.6.1</version>
114114
</plugin>
115115
<plugin>
116116
<groupId>org.apache.maven.plugins</groupId>
117117
<artifactId>maven-deploy-plugin</artifactId>
118-
<version>2.8.2</version>
118+
<version>3.1.1</version>
119119
</plugin>
120120
<plugin>
121121
<groupId>org.apache.maven.plugins</groupId>
122122
<artifactId>maven-enforcer-plugin</artifactId>
123-
<version>1.4.1</version>
123+
<version>3.4.1</version>
124+
<executions>
125+
<execution>
126+
<id>enforce-maven</id>
127+
<goals>
128+
<goal>enforce</goal>
129+
</goals>
130+
<configuration>
131+
<rules>
132+
<requireMavenVersion>
133+
<version>3.5.4</version>
134+
</requireMavenVersion>
135+
</rules>
136+
</configuration>
137+
</execution>
138+
</executions>
124139
</plugin>
125140
<plugin>
126141
<groupId>org.apache.maven.plugins</groupId>
127142
<artifactId>maven-gpg-plugin</artifactId>
128-
<version>1.6</version>
143+
<version>3.2.4</version>
129144
</plugin>
130145
<plugin>
131146
<groupId>org.apache.maven.plugins</groupId>
132147
<artifactId>maven-install-plugin</artifactId>
133-
<version>2.5.2</version>
148+
<version>3.1.1</version>
134149
</plugin>
135150
<plugin>
136151
<groupId>org.apache.maven.plugins</groupId>
137152
<artifactId>maven-jar-plugin</artifactId>
138-
<version>3.2.0</version>
153+
<version>3.3.0</version>
139154
</plugin>
140155
<plugin>
141156
<groupId>org.apache.maven.plugins</groupId>
142157
<artifactId>maven-javadoc-plugin</artifactId>
143-
<version>3.2.0</version>
158+
<version>3.6.3</version>
144159
<configuration>
145160
<additionalparam>-Xdoclint:none</additionalparam>
146161
<doclet>ch.raffael.doclets.pegdown.PegdownDoclet</doclet>
@@ -155,35 +170,41 @@
155170
<plugin>
156171
<groupId>org.apache.maven.plugins</groupId>
157172
<artifactId>maven-release-plugin</artifactId>
158-
<version>2.5.3</version>
173+
<version>3.0.1</version>
159174
</plugin>
160175
<plugin>
161176
<groupId>org.apache.maven.plugins</groupId>
162177
<artifactId>maven-resources-plugin</artifactId>
163-
<version>3.2.0</version>
178+
<version>3.3.1</version>
164179
</plugin>
165180
<plugin>
166181
<groupId>org.apache.maven.plugins</groupId>
167182
<artifactId>maven-site-plugin</artifactId>
168-
<version>3.9.1</version>
183+
<version>4.0.0-M14</version>
169184
</plugin>
170185
<plugin>
171186
<groupId>org.apache.maven.plugins</groupId>
172187
<artifactId>maven-source-plugin</artifactId>
173-
<version>3.2.1</version>
188+
<version>3.3.1</version>
174189
</plugin>
175190
<plugin>
176191
<groupId>org.apache.maven.plugins</groupId>
177192
<artifactId>maven-surefire-plugin</artifactId>
178-
<version>2.22.2</version>
193+
<version>3.2.5</version>
179194
</plugin>
180195
<plugin>
181196
<groupId>org.codehaus.mojo</groupId>
182197
<artifactId>license-maven-plugin</artifactId>
183-
<version>2.0.0</version>
198+
<version>2.3.0</version>
184199
</plugin>
185200
</plugins>
186201
</pluginManagement>
202+
<plugins>
203+
<plugin>
204+
<groupId>org.apache.maven.plugins</groupId>
205+
<artifactId>maven-enforcer-plugin</artifactId>
206+
</plugin>
207+
</plugins>
187208
</build>
188209

189210
<reporting>
@@ -210,12 +231,12 @@
210231
<plugin>
211232
<groupId>org.apache.maven.plugins</groupId>
212233
<artifactId>maven-checkstyle-plugin</artifactId>
213-
<version>3.1.1</version>
234+
<version>3.3.1</version>
214235
</plugin>
215236
<plugin>
216237
<groupId>org.apache.maven.plugins</groupId>
217238
<artifactId>maven-javadoc-plugin</artifactId>
218-
<version>3.2.0</version>
239+
<version>3.6.3</version>
219240
<reportSets>
220241
<reportSet>
221242
<reports>
@@ -228,12 +249,12 @@
228249
<plugin>
229250
<groupId>org.apache.maven.plugins</groupId>
230251
<artifactId>maven-jxr-plugin</artifactId>
231-
<version>3.0.0</version>
252+
<version>3.3.2</version>
232253
</plugin>
233254
<plugin>
234255
<groupId>org.apache.maven.plugins</groupId>
235256
<artifactId>maven-pmd-plugin</artifactId>
236-
<version>3.13.0</version>
257+
<version>3.22.0</version>
237258
<configuration>
238259
<minimumTokens>100</minimumTokens>
239260
<targetJdk>${maven.compiler.target}</targetJdk>
@@ -242,7 +263,7 @@
242263
<plugin>
243264
<groupId>org.apache.maven.plugins</groupId>
244265
<artifactId>maven-project-info-reports-plugin</artifactId>
245-
<version>3.1.1</version>
266+
<version>3.5.0</version>
246267
<reportSets>
247268
<reportSet>
248269
<reports>
@@ -269,7 +290,7 @@
269290
<plugin>
270291
<groupId>org.apache.maven.plugins</groupId>
271292
<artifactId>maven-surefire-report-plugin</artifactId>
272-
<version>2.22.2</version>
293+
<version>3.2.5</version>
273294
</plugin>
274295
<plugin>
275296
<groupId>org.codehaus.mojo</groupId>
@@ -279,7 +300,7 @@
279300
<plugin>
280301
<groupId>com.github.spotbugs</groupId>
281302
<artifactId>spotbugs-maven-plugin</artifactId>
282-
<version>4.1.4</version>
303+
<version>4.8.3.1</version>
283304
<configuration>
284305
<effort>Max</effort>
285306
<xmlOutput>true</xmlOutput>
@@ -305,7 +326,7 @@
305326
<plugin>
306327
<groupId>org.codehaus.mojo</groupId>
307328
<artifactId>taglist-maven-plugin</artifactId>
308-
<version>2.4</version>
329+
<version>3.0.0</version>
309330
<configuration>
310331
<tagListOptions>
311332
<tagClasses>
@@ -325,7 +346,7 @@
325346
<plugin>
326347
<groupId>org.codehaus.mojo</groupId>
327348
<artifactId>versions-maven-plugin</artifactId>
328-
<version>2.8.1</version>
349+
<version>2.16.2</version>
329350
<reportSets>
330351
<reportSet>
331352
<reports>
@@ -339,7 +360,7 @@
339360
<plugin>
340361
<groupId>org.jacoco</groupId>
341362
<artifactId>jacoco-maven-plugin</artifactId>
342-
<version>0.8.6</version>
363+
<version>0.8.13</version>
343364
<reportSets>
344365
<reportSet>
345366
<reports>
@@ -418,5 +439,14 @@
418439
</plugins>
419440
</build>
420441
</profile>
442+
<profile>
443+
<id>set-compiler-release</id>
444+
<activation>
445+
<jdk>[9,)</jdk>
446+
</activation>
447+
<properties>
448+
<maven.compiler.release>8</maven.compiler.release>
449+
</properties>
450+
</profile>
421451
</profiles>
422452
</project>

‎util/java/tmxviewer-java/pom.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<description>
1919
A small example application that views Tiled maps using libtiled-java.
2020
</description>
21-
<url>http://www.mapeditor.org/</url>
21+
<url>https://www.mapeditor.org/</url>
2222

2323
<scm>
2424
<url>https://github.com/mapeditor/tiled</url>
@@ -35,17 +35,21 @@
3535
<dependency>
3636
<groupId>org.junit.vintage</groupId>
3737
<artifactId>junit-vintage-engine</artifactId>
38-
<version>5.7.0</version>
38+
<version>5.13.0</version>
3939
<scope>test</scope>
4040
</dependency>
4141
</dependencies>
4242

4343
<build>
4444
<plugins>
45+
<plugin>
46+
<groupId>org.apache.maven.plugins</groupId>
47+
<artifactId>maven-enforcer-plugin</artifactId>
48+
</plugin>
4549
<plugin>
4650
<groupId>org.apache.maven.plugins</groupId>
4751
<artifactId>maven-shade-plugin</artifactId>
48-
<version>3.2.4</version>
52+
<version>3.5.1</version>
4953
<executions>
5054
<execution>
5155
<phase>package</phase>

0 commit comments

Comments
 (0)