Skip to content

Commit 8da6f0a

Browse files
wbornwborn
authored
Upgrade Maven and plug-ins (openhab#15525)
* Use Maven 3.9.4 with GitHub Actions CI * Upgrade Maven plug-ins Signed-off-by: Wouter Born <[email protected]>
1 parent 8e18726 commit 8da6f0a

File tree

5 files changed

+37
-32
lines changed

5 files changed

+37
-32
lines changed

‎.github/workflows/ci-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
java: [ '17' ]
22-
maven: [ '3.8.6' ]
22+
maven: [ '3.9.4' ]
2323
os: [ 'ubuntu-22.04' ]
2424
name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
2525
runs-on: ${{ matrix.os }}

‎bundles/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@
606606
<plugin>
607607
<groupId>org.apache.maven.plugins</groupId>
608608
<artifactId>maven-dependency-plugin</artifactId>
609-
<version>3.1.1</version>
609+
<version>3.6.0</version>
610610
<executions>
611611
<execution>
612612
<id>embed-dependencies</id>

‎features/openhab-addons/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<plugin>
3232
<groupId>org.apache.maven.plugins</groupId>
3333
<artifactId>maven-antrun-plugin</artifactId>
34-
<version>1.8</version>
34+
<version>3.1.0</version>
3535
<inherited>false</inherited>
3636
<executions>
3737
<execution>

‎itests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<plugin>
8383
<groupId>org.apache.maven.plugins</groupId>
8484
<artifactId>maven-dependency-plugin</artifactId>
85-
<version>3.1.1</version>
85+
<version>3.6.0</version>
8686
<executions>
8787
<execution>
8888
<id>unpack-eea</id>

‎pom.xml

+33-28
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<netty.version>4.1.92.Final</netty.version>
7878
<okhttp.version>3.14.9</okhttp.version>
7979
<sat.version>0.15.0</sat.version>
80-
<spotless.version>2.37.0</spotless.version>
80+
<spotless.version>2.38.0</spotless.version>
8181
<!-- Eclipse Java formatter version 4.26+ does not check test files -->
8282
<spotless.eclipse.version>4.25</spotless.eclipse.version>
8383
<spotless.eclipse.wtp.version>4.21.0</spotless.eclipse.wtp.version>
@@ -292,13 +292,13 @@ Import-Package: \\
292292
<plugin>
293293
<groupId>org.apache.maven.plugins</groupId>
294294
<artifactId>maven-clean-plugin</artifactId>
295-
<version>3.0.0</version>
295+
<version>3.3.1</version>
296296
</plugin>
297297

298298
<plugin>
299299
<groupId>org.apache.maven.plugins</groupId>
300300
<artifactId>maven-compiler-plugin</artifactId>
301-
<version>3.10.1</version>
301+
<version>3.11.0</version>
302302
<configuration>
303303
<compilerId>eclipse</compilerId>
304304
<compilerArgs>
@@ -330,19 +330,19 @@ Import-Package: \\
330330
<plugin>
331331
<groupId>org.apache.maven.plugins</groupId>
332332
<artifactId>maven-enforcer-plugin</artifactId>
333-
<version>3.0.0-M2</version>
333+
<version>3.4.0</version>
334334
</plugin>
335335

336336
<plugin>
337337
<groupId>org.apache.maven.plugins</groupId>
338338
<artifactId>maven-install-plugin</artifactId>
339-
<version>2.5.2</version>
339+
<version>3.1.1</version>
340340
</plugin>
341341

342342
<plugin>
343343
<groupId>org.apache.maven.plugins</groupId>
344344
<artifactId>maven-jar-plugin</artifactId>
345-
<version>3.0.2</version>
345+
<version>3.3.0</version>
346346
</plugin>
347347

348348
<plugin>
@@ -365,13 +365,13 @@ Import-Package: \\
365365
<plugin>
366366
<groupId>org.apache.maven.plugins</groupId>
367367
<artifactId>maven-plugin-plugin</artifactId>
368-
<version>3.6.0</version>
368+
<version>3.9.0</version>
369369
</plugin>
370370

371371
<plugin>
372372
<groupId>org.apache.maven.plugins</groupId>
373373
<artifactId>maven-release-plugin</artifactId>
374-
<version>2.5.2</version>
374+
<version>3.0.1</version>
375375
<configuration>
376376
<preparationGoals>clean install</preparationGoals>
377377
</configuration>
@@ -380,25 +380,25 @@ Import-Package: \\
380380
<plugin>
381381
<groupId>org.apache.maven.plugins</groupId>
382382
<artifactId>maven-resources-plugin</artifactId>
383-
<version>3.0.2</version>
383+
<version>3.3.1</version>
384384
</plugin>
385385

386386
<plugin>
387387
<groupId>org.apache.maven.plugins</groupId>
388388
<artifactId>maven-site-plugin</artifactId>
389-
<version>3.7.1</version>
389+
<version>3.12.1</version>
390390
</plugin>
391391

392392
<plugin>
393393
<groupId>org.apache.maven.plugins</groupId>
394394
<artifactId>maven-source-plugin</artifactId>
395-
<version>3.0.1</version>
395+
<version>3.3.0</version>
396396
</plugin>
397397

398398
<plugin>
399399
<groupId>org.apache.maven.plugins</groupId>
400400
<artifactId>maven-surefire-plugin</artifactId>
401-
<version>3.0.0</version>
401+
<version>3.1.2</version>
402402
<configuration>
403403
<argLine>
404404
--add-opens java.base/java.lang=ALL-UNNAMED
@@ -413,41 +413,46 @@ Import-Package: \\
413413
<plugin>
414414
<groupId>org.codehaus.mojo</groupId>
415415
<artifactId>build-helper-maven-plugin</artifactId>
416-
<version>3.0.0</version>
416+
<version>3.4.0</version>
417417
</plugin>
418418

419419
<plugin>
420420
<groupId>com.mycila</groupId>
421421
<artifactId>license-maven-plugin</artifactId>
422-
<version>3.0</version>
422+
<version>4.2</version>
423423
<configuration>
424424
<basedir>${basedir}</basedir>
425-
<header>licenses/epl-2.0/header.txt</header>
426425
<quiet>false</quiet>
427426
<failIfMissing>true</failIfMissing>
428427
<strictCheck>true</strictCheck>
429428
<aggregate>true</aggregate>
430429
<mapping>
430+
<java>JAVADOC_STYLE</java>
431431
<xml>xml-header-style</xml>
432432
</mapping>
433-
<headerDefinitions>
434-
<headerDefinition>licenses/epl-2.0/xml-header-style.xml</headerDefinition>
435-
</headerDefinitions>
436-
<includes>
437-
<include>**/org/openhab/**/*.java</include>
438-
<include>**/features/**/header.xml</include>
439-
</includes>
440-
<excludes>
441-
<exclude>**/3rdparty/**</exclude>
442-
<exclude>target/**</exclude>
443-
<exclude>**/pom.xml</exclude>
444-
<exclude>_*.java</exclude>
445-
</excludes>
446433
<useDefaultExcludes>true</useDefaultExcludes>
447434
<properties>
448435
<year>2023</year>
449436
</properties>
450437
<encoding>UTF-8</encoding>
438+
<licenseSets>
439+
<licenseSet>
440+
<header>licenses/epl-2.0/header.txt</header>
441+
<headerDefinitions>
442+
<headerDefinition>licenses/epl-2.0/xml-header-style.xml</headerDefinition>
443+
</headerDefinitions>
444+
<includes>
445+
<include>**/org/openhab/**/*.java</include>
446+
<include>**/features/**/header.xml</include>
447+
</includes>
448+
<excludes>
449+
<exclude>**/3rdparty/**</exclude>
450+
<exclude>target/**</exclude>
451+
<exclude>**/pom.xml</exclude>
452+
<exclude>_*.java</exclude>
453+
</excludes>
454+
</licenseSet>
455+
</licenseSets>
451456
</configuration>
452457
<executions>
453458
<execution>

0 commit comments

Comments
 (0)