Raise minimum JDK version to 17 (#1588)
* Raise minimum JDK version to 17 Signed-off-by: Jan N. Klug <github@klug.nrw>pull/1602/head
parent
f97323690f
commit
38f44af1e1
|
@ -18,7 +18,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
java: [ '11', '17' ]
|
||||
java: [ '17' ]
|
||||
maven: [ '3.8.6' ]
|
||||
os: [ 'ubuntu-22.04' ]
|
||||
name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
|
||||
|
@ -56,7 +56,7 @@ jobs:
|
|||
maven-version: ${{ matrix.maven }}
|
||||
|
||||
- name: Register Problem Matchers
|
||||
if: ${{ matrix.java == '11' }}
|
||||
if: ${{ matrix.java == '17' }}
|
||||
id: problem_matchers
|
||||
run: |
|
||||
echo "::add-matcher::.github/openhab-compile-problems.json"
|
||||
|
@ -86,7 +86,7 @@ jobs:
|
|||
path: target/summary_report.html
|
||||
|
||||
- name: Report SAT Errors as Annotations
|
||||
if: ${{ matrix.java == '11' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
|
||||
if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
|
||||
uses: ghys/checkstyle-github-action@main
|
||||
with:
|
||||
title: CheckStyle Violations
|
||||
|
|
27
pom.xml
27
pom.xml
|
@ -62,7 +62,7 @@
|
|||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<oh.java.version>11</oh.java.version>
|
||||
<oh.java.version>17</oh.java.version>
|
||||
<maven.compiler.source>${oh.java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${oh.java.version}</maven.compiler.target>
|
||||
<maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
|
||||
|
@ -73,7 +73,8 @@
|
|||
<karaf.version>4.3.7</karaf.version>
|
||||
<ohc.version>4.0.0-SNAPSHOT</ohc.version>
|
||||
<sat.version>0.13.0</sat.version>
|
||||
<spotless.version>2.0.3</spotless.version>
|
||||
<spotless.version>2.28.0</spotless.version>
|
||||
<spotless.eclipse.version>4.21.0</spotless.eclipse.version>
|
||||
</properties>
|
||||
|
||||
<build>
|
||||
|
@ -254,12 +255,12 @@ Import-Package: \\
|
|||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-compiler-eclipse</artifactId>
|
||||
<version>2.11.1</version>
|
||||
<version>2.12.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jdt</groupId>
|
||||
<artifactId>ecj</artifactId>
|
||||
<version>3.28.0</version>
|
||||
<version>3.30.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
|
@ -327,8 +328,12 @@ Import-Package: \\
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>3.0.0-M5</version>
|
||||
<version>3.0.0-M7</version>
|
||||
<configuration>
|
||||
<argLine>
|
||||
--add-opens java.base/java.net=ALL-UNNAMED
|
||||
--add-opens java.base/java.util=ALL-UNNAMED
|
||||
</argLine>
|
||||
<systemPropertyVariables>
|
||||
<junit.jupiter.execution.timeout.default>15 m</junit.jupiter.execution.timeout.default>
|
||||
</systemPropertyVariables>
|
||||
|
@ -442,7 +447,7 @@ Import-Package: \\
|
|||
<java>
|
||||
<eclipse>
|
||||
<file>openhab_codestyle.xml</file>
|
||||
<version>4.13.0</version>
|
||||
<version>${spotless.eclipse.version}</version>
|
||||
</eclipse>
|
||||
<removeUnusedImports/>
|
||||
<importOrder>
|
||||
|
@ -469,7 +474,7 @@ Import-Package: \\
|
|||
<files>
|
||||
<file>openhab_wst_xml_files.prefs</file>
|
||||
</files>
|
||||
<version>4.13.0</version>
|
||||
<version>${spotless.eclipse.version}</version>
|
||||
</eclipseWtp>
|
||||
<trimTrailingWhitespace/>
|
||||
<endWithNewline/>
|
||||
|
@ -484,7 +489,7 @@ Import-Package: \\
|
|||
<files>
|
||||
<file>openhab_wst_pom_file.prefs</file>
|
||||
</files>
|
||||
<version>4.13.0</version>
|
||||
<version>${spotless.eclipse.version}</version>
|
||||
</eclipseWtp>
|
||||
<trimTrailingWhitespace/>
|
||||
<endWithNewline/>
|
||||
|
@ -516,7 +521,7 @@ Import-Package: \\
|
|||
<plugin>
|
||||
<groupId>org.commonjava.maven.plugins</groupId>
|
||||
<artifactId>directory-maven-plugin</artifactId>
|
||||
<version>0.3.1</version>
|
||||
<version>1.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>directories</id>
|
||||
|
@ -547,7 +552,7 @@ Import-Package: \\
|
|||
<configuration>
|
||||
<rules>
|
||||
<requireJavaVersion>
|
||||
<version>[11.0,18.0)</version>
|
||||
<version>[17.0,18.0)</version>
|
||||
</requireJavaVersion>
|
||||
</rules>
|
||||
</configuration>
|
||||
|
@ -612,7 +617,7 @@ Import-Package: \\
|
|||
<pluginExecutionFilter>
|
||||
<groupId>org.commonjava.maven.plugins</groupId>
|
||||
<artifactId>directory-maven-plugin</artifactId>
|
||||
<versionRange>[0.3.1,)</versionRange>
|
||||
<versionRange>[1.0,)</versionRange>
|
||||
<goals>
|
||||
<goal>directory-of</goal>
|
||||
</goals>
|
||||
|
|
Loading…
Reference in New Issue