demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Upgrade to Jollyday 0.5.10 (#1684)

Browse Source 
With some excludes and the upgraded JAXB I got the most recent Jollyday version working.
The integration tests also succeed again on Java 11.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-10-03 11:04:25 +02:00
committed by GitHub
parent 3bf2f4934d
commit af266b5d9f
15 changed files with 59 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bom/compile/pom.xml
+11 -3
View File
@@ -267,10 +267,18 @@
<dependency>
<groupId>de.jollyday</groupId>
<artifactId>jollyday</artifactId>
<!-- Upgrading to 0.5.9 causes Java 11 builds to fail -->
<!-- On Java 11 the bundle requires JAXB 2.3 whereas we depend on JAXB 2.2 for Java 8 compatibility -->
<version>0.5.8</version>
<version>0.5.10</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- JAXB -->
bom/runtime/pom.xml
+12 -4
View File
@@ -901,10 +901,18 @@
<dependency>
<groupId>de.jollyday</groupId>
<artifactId>jollyday</artifactId>
<!-- Upgrading to 0.5.9 and adding compile scope causes Java 11 builds to fail -->
<!-- On Java 11 the bundle requires JAXB 2.3 whereas we depend on JAXB 2.2 for Java 8 compatibility -->
<version>0.5.8</version>
<!-- <scope>compile</scope> -->
<version>0.5.10</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- jose4j -->