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

Downgrade Jollyday again to fix Java 11 build issues (#1195)

Browse Source 
Jollyday requires JAXB 2.3 on Java 11 whereas only 2.2 is available during compilation for Java 8 compatibility.

See also:
* https://github.com/openhab/openhab2-addons/issues/6334
* https://github.com/openhab/openhab-core/pull/1170
* https://github.com/openhab/openhab-core/pull/1169

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2019-11-08 15:18:58 +01:00
committed by Kai Kreuzer
parent cd3f33738f
commit d627a6b7e6
17 changed files with 112 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bom/compile/pom.xml
+3 -1
View File
@@ -282,7 +282,9 @@
<dependency>
<groupId>de.jollyday</groupId>
<artifactId>jollyday</artifactId>
<version>0.5.9</version>
<!-- 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>
<scope>compile</scope>
</dependency>
bom/runtime/pom.xml
+4 -2
View File
@@ -893,8 +893,10 @@
<dependency>
<groupId>de.jollyday</groupId>
<artifactId>jollyday</artifactId>
<version>0.5.9</version>
<scope>compile</scope>
<!-- 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> -->
</dependency>
</dependencies>
features/karaf/openhab-tp/src/main/feature/feature.xml
+3 -3
View File
@@ -169,9 +169,9 @@
</feature>
<feature name="openhab.tp-jollyday" description="Jollyday library" version="${project.version}">
<capability>openhab.tp;feature=jollyday;version=0.5.9</capability>
<bundle>mvn:org.threeten/threeten-extra/1.5.0</bundle>
<bundle>mvn:de.jollyday/jollyday/0.5.9</bundle>
<capability>openhab.tp;feature=jollyday;version=0.5.8</capability>
<bundle>mvn:org.threeten/threeten-extra/1.4</bundle>
<bundle>mvn:de.jollyday/jollyday/0.5.8</bundle>
</feature>
<feature name="openhab.tp-jmdns" description="An implementation of multi-cast DNS in Java." version="${project.version}">
itests/org.openhab.core.automation.integration.tests/itest.bndrun
+2 -2
View File
@@ -46,6 +46,6 @@ Bundle-SymbolicName: ${project.artifactId}
slf4j.api;version='[1.7.25,1.7.26)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
jollyday;version='[0.5.9,0.5.10)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)'
itests/org.openhab.core.automation.module.core.tests/itest.bndrun
+2 -2
View File
@@ -47,6 +47,6 @@ Fragment-Host: org.openhab.core.automation
slf4j.api;version='[1.7.25,1.7.26)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
jollyday;version='[0.5.9,0.5.10)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)'
itests/org.openhab.core.automation.module.script.defaultscope.tests/itest.bndrun
+2 -2
View File
@@ -47,6 +47,6 @@ Bundle-SymbolicName: ${project.artifactId}
slf4j.api;version='[1.7.25,1.7.26)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
jollyday;version='[0.5.9,0.5.10)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)'
itests/org.openhab.core.automation.module.script.tests/itest.bndrun
+2 -2
View File
@@ -48,6 +48,6 @@ Fragment-Host: org.openhab.core.automation.module.script
slf4j.api;version='[1.7.25,1.7.26)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
jollyday;version='[0.5.9,0.5.10)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)'
itests/org.openhab.core.automation.module.timer.tests/itest.bndrun
+2 -2
View File
@@ -47,6 +47,6 @@ Fragment-Host: org.openhab.core.automation
slf4j.api;version='[1.7.25,1.7.26)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
jollyday;version='[0.5.9,0.5.10)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)'
itests/org.openhab.core.automation.tests/itest.bndrun
+2 -2
View File
@@ -47,6 +47,6 @@ Fragment-Host: org.openhab.core.automation
slf4j.api;version='[1.7.25,1.7.26)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
jollyday;version='[0.5.9,0.5.10)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)'
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)'
itests/org.openhab.core.ephemeris.tests/itest.bndrun
+3 -3
View File
@@ -52,13 +52,13 @@ feature.openhab-config: \
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
jollyday;version='[0.5.9,0.5.10)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\
org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.apache.felix.log;version='[1.2.0,1.2.1)',\
org.apache.felix.logback;version='[1.0.0,1.0.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)'
tec.uom.se;version='[1.0.10,1.0.11)',\
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)'
itests/org.openhab.core.ephemeris.tests/src/main/java/org/eclipse/smarthome/core/ephemeris/internal/EphemerisManagerImplOSGiTest.java
+5
View File
@@ -34,6 +34,8 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.smarthome.config.core.ParameterOption;
import org.eclipse.smarthome.core.ephemeris.EphemerisManager;
import org.eclipse.smarthome.test.java.JavaOSGiTest;
import org.hamcrest.CoreMatchers;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
@@ -59,6 +61,9 @@ public class EphemerisManagerImplOSGiTest extends JavaOSGiTest {
@Before
public void setUp() {
// TODO: Tests currently fail on Java 11 due to Jollyday requiring JAXB 2.3
Assume.assumeThat(System.getProperty("java.version"), CoreMatchers.startsWith("1.8"));
ephemerisManager = getService(EphemerisManager.class, EphemerisManagerImpl.class);
assertNotNull(ephemerisManager);
itests/org.openhab.core.model.core.tests/itest.bndrun
+11 -11
View File
@@ -64,7 +64,15 @@ Fragment-Host: org.openhab.core.model.core
org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
io.github.classgraph;version='[4.8.35,4.8.36)',\
joda-time;version='[2.9.2,2.9.3)',\
jollyday;version='[0.5.9,0.5.10)',\
org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
org.openhab.core.thing;version='[2.5.0,2.5.1)',\
jollyday;version='[0.5.8,0.5.9)',\
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
@@ -73,26 +81,18 @@ Fragment-Host: org.openhab.core.model.core
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.openhab.core.audio;version='[2.5.0,2.5.1)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
org.openhab.core.thing;version='[2.5.0,2.5.1)',\
org.openhab.core.transform;version='[2.5.0,2.5.1)',\
org.openhab.core.voice;version='[2.5.0,2.5.1)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
@@ -100,5 +100,5 @@ Fragment-Host: org.openhab.core.model.core
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
org.threeten.extra;version='[1.4.0,1.4.1)',\
org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'
itests/org.openhab.core.model.item.tests/itest.bndrun
+27 -27
View File
@@ -57,37 +57,12 @@ Fragment-Host: org.openhab.core.model.item
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
joda-time;version='[2.9.2,2.9.3)',\
jollyday;version='[0.5.9,0.5.10)',\
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
org.openhab.core.audio;version='[2.5.0,2.5.1)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
org.openhab.core.transform;version='[2.5.0,2.5.1)',\
org.openhab.core.voice;version='[2.5.0,2.5.1)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.1)',\
@@ -99,9 +74,34 @@ Fragment-Host: org.openhab.core.model.item
org.eclipse.xtext;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
jollyday;version='[0.5.8,0.5.9)',\
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
org.openhab.core.audio;version='[2.5.0,2.5.1)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
org.openhab.core.transform;version='[2.5.0,2.5.1)',\
org.openhab.core.voice;version='[2.5.0,2.5.1)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
org.threeten.extra;version='[1.4.0,1.4.1)',\
org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'
itests/org.openhab.core.model.persistence.tests/itest.bndrun
+35 -34
View File
@@ -46,43 +46,11 @@ Fragment-Host: org.openhab.core.model.persistence
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
org.openhab.core.audio;version='[2.5.0,2.5.1)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
org.openhab.core.transform;version='[2.5.0,2.5.1)',\
org.openhab.core.voice;version='[2.5.0,2.5.1)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\
jollyday;version='[0.5.9,0.5.10)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.1)',\
@@ -94,8 +62,41 @@ Fragment-Host: org.openhab.core.model.persistence
org.eclipse.xtext;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.common.types;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.util;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.eclipse.xtext.xbase.lib;version='[2.19.0,2.19.1)',\
org.objectweb.asm;version='[7.1.0,7.1.1)',\
jollyday;version='[0.5.8,0.5.9)',\
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
org.eclipse.xtext.xbase;version='[2.19.0,2.19.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)'
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.openhab.core.audio;version='[2.5.0,2.5.1)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
org.openhab.core.transform;version='[2.5.0,2.5.1)',\
org.openhab.core.voice;version='[2.5.0,2.5.1)',\
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
org.threeten.extra;version='[1.4.0,1.4.1)',\
org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'
itests/org.openhab.core.model.rule.tests/itest.bndrun
+2 -3
View File
@@ -76,7 +76,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.openhab.core.test;version='[2.5.0,2.5.1)',\
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
jollyday;version='[0.5.9,0.5.10)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
@@ -87,7 +86,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.1)',\
@@ -104,4 +102,5 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)'
itests/org.openhab.core.model.script.tests/itest.bndrun
+4 -4
View File
@@ -70,7 +70,6 @@ Fragment-Host: org.openhab.core.model.script
org.openhab.core.test;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)',\
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
jollyday;version='[0.5.9,0.5.10)',\
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
@@ -81,7 +80,6 @@ Fragment-Host: org.openhab.core.model.script
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
com.google.guava;version='[27.1.0,27.1.1)',\
@@ -98,5 +96,7 @@ Fragment-Host: org.openhab.core.model.script
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'
itests/org.openhab.core.model.thing.tests/itest.bndrun
+3 -3
View File
@@ -89,8 +89,6 @@ Fragment-Host: org.openhab.core.model.thing
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\
jollyday;version='[0.5.9,0.5.10)',\
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
tec.uom.se;version='[1.0.10,1.0.11)',\
net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
@@ -110,6 +108,8 @@ Fragment-Host: org.openhab.core.model.thing
org.objectweb.asm;version='[7.1.0,7.1.1)',\
org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
jollyday;version='[0.5.8,0.5.9)',\
org.threeten.extra;version='[1.4.0,1.4.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)'
org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'