mirror of
https://github.com/danieldemus/openhab-core.git
synced 2025-01-25 11:45:49 +01:00
Upgrade Maven and plug-ins (#3788)
* Use Maven 3.9.4 with GitHub Actions CI * Upgrade Maven plug-ins Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
GitHub
parent
f8b52ea3f6
commit
e765af06cb
2
.github/workflows/ci-build.yml
vendored
2
.github/workflows/ci-build.yml
vendored
@ -19,7 +19,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
java: [ '17' ]
|
||||
maven: [ '3.8.6' ]
|
||||
maven: [ '3.9.4' ]
|
||||
os: [ 'ubuntu-22.04' ]
|
||||
name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
@ -159,7 +159,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>3.3.0</version>
|
||||
<version>3.6.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>unpack-eea</id>
|
||||
|
||||
@ -95,7 +95,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>3.1.1</version>
|
||||
<version>3.6.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>unpack-eea</id>
|
||||
|
||||
77
pom.xml
77
pom.xml
@ -77,7 +77,7 @@
|
||||
<sat.version>0.15.0</sat.version>
|
||||
<slf4j.version>1.7.32</slf4j.version>
|
||||
<xtext.version>2.29.0</xtext.version>
|
||||
<spotless.version>2.37.0</spotless.version>
|
||||
<spotless.version>2.38.0</spotless.version>
|
||||
<!-- Eclipse Java formatter version 4.26+ does not check test files -->
|
||||
<spotless.eclipse.version>4.25</spotless.eclipse.version>
|
||||
<spotless.eclipse.wtp.version>4.21.0</spotless.eclipse.wtp.version>
|
||||
@ -271,13 +271,13 @@ Import-Package: \\
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<version>3.3.1</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.10.1</version>
|
||||
<version>3.11.0</version>
|
||||
<configuration>
|
||||
<compilerId>eclipse</compilerId>
|
||||
<compilerArgs>
|
||||
@ -308,19 +308,19 @@ Import-Package: \\
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-enforcer-plugin</artifactId>
|
||||
<version>3.0.0-M2</version>
|
||||
<version>3.4.0</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
<version>3.1.1</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<version>3.3.0</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
@ -357,13 +357,13 @@ Import-Package: \\
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-plugin-plugin</artifactId>
|
||||
<version>3.6.0</version>
|
||||
<version>3.9.0</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-release-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
<version>3.0.1</version>
|
||||
<configuration>
|
||||
<preparationGoals>clean install</preparationGoals>
|
||||
</configuration>
|
||||
@ -372,25 +372,25 @@ Import-Package: \\
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<version>3.3.1</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
<version>3.7.1</version>
|
||||
<version>3.12.1</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<version>3.3.0</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<version>3.1.2</version>
|
||||
<configuration>
|
||||
<argLine>
|
||||
--add-opens java.base/java.net=ALL-UNNAMED
|
||||
@ -425,50 +425,55 @@ Import-Package: \\
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
<version>3.4.0</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>com.mycila</groupId>
|
||||
<artifactId>license-maven-plugin</artifactId>
|
||||
<version>3.0</version>
|
||||
<version>4.2</version>
|
||||
<configuration>
|
||||
<basedir>${basedir}</basedir>
|
||||
<header>licenses/epl-2.0/header.txt</header>
|
||||
<quiet>false</quiet>
|
||||
<failIfMissing>true</failIfMissing>
|
||||
<strictCheck>true</strictCheck>
|
||||
<aggregate>true</aggregate>
|
||||
<mapping>
|
||||
<groovy>JAVADOC_STYLE</groovy>
|
||||
<java>JAVADOC_STYLE</java>
|
||||
<mwe2>JAVADOC_STYLE</mwe2>
|
||||
<xtend>JAVADOC_STYLE</xtend>
|
||||
<xml>xml-header-style</xml>
|
||||
</mapping>
|
||||
<headerDefinitions>
|
||||
<headerDefinition>licenses/epl-2.0/xml-header-style.xml</headerDefinition>
|
||||
</headerDefinitions>
|
||||
<includes>
|
||||
<include>**/archetype/**/*.groovy</include>
|
||||
<include>**/org/openhab/core/**/*.java</include>
|
||||
<include>**/org/openhab/core/**/*.mwe2</include>
|
||||
<include>**/org/openhab/core/**/*.xtend</include>
|
||||
<include>**/org/openhab/**/*.java</include>
|
||||
<include>**/org.openhab.core.semantics/**/*.groovy</include>
|
||||
<include>**/feature.xml</include>
|
||||
<include>**/OSGI-INF/*.xml</include>
|
||||
</includes>
|
||||
<excludes>
|
||||
<exclude>target/**</exclude>
|
||||
<exclude>**/pom.xml</exclude>
|
||||
<exclude>_*.java</exclude>
|
||||
<exclude>**/archetype/**/feature.xml</exclude>
|
||||
</excludes>
|
||||
<useDefaultExcludes>true</useDefaultExcludes>
|
||||
<properties>
|
||||
<year>2023</year>
|
||||
</properties>
|
||||
<encoding>UTF-8</encoding>
|
||||
<licenseSets>
|
||||
<licenseSet>
|
||||
<header>licenses/epl-2.0/header.txt</header>
|
||||
<headerDefinitions>
|
||||
<headerDefinition>licenses/epl-2.0/xml-header-style.xml</headerDefinition>
|
||||
</headerDefinitions>
|
||||
<includes>
|
||||
<include>**/archetype/**/*.groovy</include>
|
||||
<include>**/org/openhab/core/**/*.java</include>
|
||||
<include>**/org/openhab/core/**/*.mwe2</include>
|
||||
<include>**/org/openhab/core/**/*.xtend</include>
|
||||
<include>**/org/openhab/**/*.java</include>
|
||||
<include>**/org.openhab.core.semantics/**/*.groovy</include>
|
||||
<include>**/feature.xml</include>
|
||||
<include>**/OSGI-INF/*.xml</include>
|
||||
</includes>
|
||||
<excludes>
|
||||
<exclude>target/**</exclude>
|
||||
<exclude>**/pom.xml</exclude>
|
||||
<exclude>_*.java</exclude>
|
||||
<exclude>**/archetype/**/feature.xml</exclude>
|
||||
</excludes>
|
||||
</licenseSet>
|
||||
</licenseSets>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
@ -482,7 +487,7 @@ Import-Package: \\
|
||||
<plugin>
|
||||
<groupId>org.openhab.core.tools</groupId>
|
||||
<artifactId>i18n-maven-plugin</artifactId>
|
||||
<version>3.3.0</version>
|
||||
<version>4.0.2</version>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
@ -512,7 +517,7 @@ Import-Package: \\
|
||||
<plugin>
|
||||
<groupId>com.github.ekryd.sortpom</groupId>
|
||||
<artifactId>sortpom-maven-plugin</artifactId>
|
||||
<version>2.10.0</version>
|
||||
<version>3.3.0</version>
|
||||
<configuration>
|
||||
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
|
||||
<createBackupFile>false</createBackupFile>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user