Skip to content

Commit

Permalink
java 17
Browse files Browse the repository at this point in the history 
Signed-off-by: Jan N. Klug <[email protected]>
  • Loading branch information
@J-N-K
J-N-K committed Aug 16, 2022
1 parent 4bf7a4a commit d224f16
Show file tree
Hide file tree
Showing 17 changed files with 44 additions and 26 deletions.
1 change: 1 addition & 0 deletions .mvn/jvm.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
4 changes: 2 additions & 2 deletions bundles/org.openhab.persistence.jpa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.2</version>
<configuration>
<excludes>org/apache/bval/**</excludes>
<includes>**/model/*.class</includes>
Expand All @@ -51,7 +51,7 @@
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<!-- set the version to be the same as the level in your runtime -->
<version>3.1.0</version>
<version>3.2.2</version>
</dependency>
</dependencies>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion itests/itest-common.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Test-Cases: ${classes;CONCRETE;PUBLIC;NAMED;*Test}
-runsystempackages: sun.reflect

-runfw: org.eclipse.osgi
-runee: JavaSE-11
-runee: JavaSE-17

# An unused random HTTP port is used during tests to prevent resource conflicts
# This property is set by the build-helper-maven-plugin in the itests pom.xml
Expand Down
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.astro.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,5 @@ Fragment-Host: org.openhab.binding.astro
org.openhab.core.config.discovery;version='[3.4.0,3.4.1)',\
org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
org.openhab.core.storage.json;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)'
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.avmfritz.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,5 @@ Fragment-Host: org.openhab.binding.avmfritz
org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
org.openhab.core.io.net;version='[3.4.0,3.4.1)',\
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)'
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.hue.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,5 @@ Fragment-Host: org.openhab.binding.hue
org.openhab.core.io.net;version='[3.4.0,3.4.1)',\
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.max.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,5 @@ Fragment-Host: org.openhab.binding.max
org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.mielecloud.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,5 @@ Fragment-Host: org.openhab.binding.mielecloud
org.openhab.core.io.net;version='[3.4.0,3.4.1)',\
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.modbus.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,5 @@ Fragment-Host: org.openhab.binding.modbus
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.openhab.core.transform;version='[3.4.0,3.4.1)'
org.openhab.core.transform;version='[3.4.0,3.4.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
4 changes: 3 additions & 1 deletion itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,6 @@ Import-Package: \
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.openhab.core.transform;version='[3.4.0,3.4.1)'
org.openhab.core.transform;version='[3.4.0,3.4.1)',\
jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
4 changes: 3 additions & 1 deletion itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,7 @@ Import-Package: \
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.openhab.core.transform;version='[3.4.0,3.4.1)'
org.openhab.core.transform;version='[3.4.0,3.4.1)',\
jakarta.ws.rs-api;version='[2.1.6,2.1.7)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'

4 changes: 3 additions & 1 deletion itests/org.openhab.binding.nest.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,6 @@ Fragment-Host: org.openhab.binding.nest
org.openhab.core.io.net;version='[3.4.0,3.4.1)',\
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.jsr-305;version='[3.0.2,3.0.3)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.ntp.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,5 @@ Fragment-Host: org.openhab.binding.ntp
org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.systeminfo.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,5 @@ Fragment-Host: org.openhab.binding.systeminfo
org.openhab.core.io.console;version='[3.4.0,3.4.1)',\
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.tradfri.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,5 @@ Fragment-Host: org.openhab.binding.tradfri
org.openhab.core.io.transport.mdns;version='[3.4.0,3.4.1)',\
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.binding.wemo.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,5 @@ Fragment-Host: org.openhab.binding.wemo
org.openhab.core.io.transport.upnp;version='[3.4.0,3.4.1)',\
org.openhab.core.test;version='[3.4.0,3.4.1)',\
org.openhab.core.thing;version='[3.4.0,3.4.1)',\
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)'
org.openhab.core.thing.xml;version='[3.4.0,3.4.1)',\
org.osgi.service.cm;version='[1.6.0,1.6.1)'
21 changes: 11 additions & 10 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,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>
Expand All @@ -77,7 +77,8 @@
<netty.version>4.1.72.Final</netty.version>
<okhttp.version>3.14.9</okhttp.version>
<sat.version>0.13.0</sat.version>
<spotless.version>2.0.3</spotless.version>
<spotless.version>2.22.5</spotless.version>
<spotless.eclipse.version>4.21.0</spotless.eclipse.version>

<bnd.importpackage/>
<bnd.exportpackage/>
Expand Down Expand Up @@ -311,12 +312,12 @@ Import-Package: \\
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
<version>2.11.1</version>
<version>2.12.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<version>3.28.0</version>
<version>3.29.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -384,7 +385,7 @@ Import-Package: \\
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M6</version>
<configuration>
<argLine>
--add-opens java.base/java.lang=ALL-UNNAMED
Expand Down Expand Up @@ -479,7 +480,7 @@ Import-Package: \\
<java>
<eclipse>
<file>openhab_codestyle.xml</file>
<version>4.13.0</version>
<version>${spotless.eclipse.version}</version>
</eclipse>
<removeUnusedImports/>
<importOrder>
Expand Down Expand Up @@ -507,7 +508,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/>
Expand All @@ -522,7 +523,7 @@ Import-Package: \\
<files>
<file>openhab_wst_feature_file.prefs</file>
</files>
<version>4.13.0</version>
<version>${spotless.eclipse.version}</version>
</eclipseWtp>
<trimTrailingWhitespace/>
<endWithNewline/>
Expand All @@ -537,7 +538,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/>
Expand Down Expand Up @@ -599,7 +600,7 @@ Import-Package: \\
<configuration>
<rules>
<requireJavaVersion>
<version>[11.0,18.0)</version>
<version>[17.0,18.0)</version>
</requireJavaVersion>
</rules>
</configuration>
Expand Down

0 comments on commit d224f16

Please sign in to comment.