Skip to content

Commit

Permalink
Fix Ephemeris ClassNotFoundException (#869)
Browse files Browse the repository at this point in the history 
Fixes #868

Also-by: Markus Rathgeb <[email protected]>
Signed-off-by: Wouter Born <[email protected]>
  • Loading branch information
@wborn @kaikreuzer
wborn authored and kaikreuzer committed Jun 13, 2019
1 parent 3e3cbea commit 0f1c1bb
Show file tree
Hide file tree
Showing 12 changed files with 135 additions and 13 deletions.
1 change: 1 addition & 0 deletions bundles/org.openhab.core.model.script/bnd.bnd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Export-Package: org.eclipse.smarthome.model.script,\
Import-Package: \
org.eclipse.smarthome.core.audio,\
org.eclipse.smarthome.core.common.registry,\
org.eclipse.smarthome.core.ephemeris,\
org.eclipse.smarthome.core.events,\
org.eclipse.smarthome.core.items,\
org.eclipse.smarthome.core.items.events,\
Expand Down
3 changes: 2 additions & 1 deletion itests/org.openhab.core.binding.xml.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ Fragment-Host: org.openhab.core.binding.xml
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
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)'
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
6 changes: 4 additions & 2 deletions itests/org.openhab.core.compat1x.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,7 @@ Fragment-Host: org.openhab.core.compat1x
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.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)',\
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)'
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.4.0,1.4.1)',\
jollyday;version='[0.5.8,0.5.9)',\
org.openhab.core.model.thing.runtime;version='[2.5.0,2.5.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,5 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
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)'
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
15 changes: 14 additions & 1 deletion itests/org.openhab.core.magic.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,17 @@ Fragment-Host: org.openhab.core.test.magic
org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
org.openhab.core.test.magic;version='[2.5.0,2.5.1)',\
org.openhab.core.test.magic.tests;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)'
slf4j.api;version='[1.7.25,1.7.26)',\
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
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)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
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.openhab.core.storage.json;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-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)'
44 changes: 43 additions & 1 deletion itests/org.openhab.core.model.core.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,46 @@ Fragment-Host: org.openhab.core.model.core
org.objenesis;version='[2.6.0,2.6.1)',\
org.openhab.core.model.core.tests;version='[2.5.0,2.5.1)',\
org.openhab.core.test;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)'
slf4j.api;version='[1.7.25,1.7.26)',\
joda-time;version='[2.9.2,2.9.3)',\
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.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
org.objectweb.asm;version='[7.0.0,7.0.1)',\
org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
org.objectweb.asm.tree;version='[7.0.0,7.0.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.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.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)',\
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)',\
jollyday;version='[0.5.8,0.5.9)',\
org.openhab.core.model.thing.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
16 changes: 15 additions & 1 deletion itests/org.openhab.core.model.lsp.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,18 @@ Fragment-Host: org.openhab.core.model.lsp
org.openhab.core.model.rule.ide;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script.ide;version='[2.5.0,2.5.1)',\
org.openhab.core.model.thing.ide;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)'
slf4j.api;version='[1.7.25,1.7.26)',\
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
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.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
org.openhab.core.storage.json;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-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)',\
jollyday;version='[0.5.8,0.5.9)',\
org.openhab.core.model.thing.runtime;version='[2.5.0,2.5.1)'
43 changes: 42 additions & 1 deletion itests/org.openhab.core.model.persistence.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,45 @@ Fragment-Host: org.openhab.core.model.persistence
org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
org.objectweb.asm;version='[7.0.0,7.0.1)',\
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
slf4j.api;version='[1.7.25,1.7.26)'
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.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
org.objectweb.asm.tree;version='[7.0.0,7.0.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.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.4.0,1.4.1)',\
jollyday;version='[0.5.8,0.5.9)',\
org.openhab.core.model.thing.runtime;version='[2.5.0,2.5.1)'
5 changes: 4 additions & 1 deletion itests/org.openhab.core.model.thing.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,8 @@ Fragment-Host: org.openhab.core.model.thing
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.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)',\
org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.4.0,1.4.1)',\
jollyday;version='[0.5.8,0.5.9)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'

3 changes: 2 additions & 1 deletion itests/org.openhab.core.thing.xml.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,5 @@ Fragment-Host: org.openhab.core.thing.xml
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
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)'
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
6 changes: 4 additions & 2 deletions itests/org.openhab.core.ui.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,7 @@ Fragment-Host: org.openhab.core.ui
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.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)',\
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)'
org.openhab.core.ephemeris;version='[2.5.0,2.5.1)',\
org.threeten.extra;version='[1.4.0,1.4.1)',\
jollyday;version='[0.5.8,0.5.9)',\
org.openhab.core.model.thing.runtime;version='[2.5.0,2.5.1)'
3 changes: 2 additions & 1 deletion itests/org.openhab.core.voice.tests/itest.bndrun
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,5 @@ Fragment-Host: org.openhab.core.voice
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
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)'
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'

0 comments on commit 0f1c1bb

Please sign in to comment.