From 0f1c1bbb2dc03a0e3bb004ec081fdf7569253cd1 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Thu, 13 Jun 2019 20:03:16 +0200 Subject: [PATCH] Fix Ephemeris ClassNotFoundException (#869) Fixes #868 Also-by: Markus Rathgeb Signed-off-by: Wouter Born --- bundles/org.openhab.core.model.script/bnd.bnd | 1 + .../itest.bndrun | 3 +- .../itest.bndrun | 6 ++- .../itest.bndrun | 3 +- .../org.openhab.core.magic.tests/itest.bndrun | 15 ++++++- .../itest.bndrun | 44 ++++++++++++++++++- .../itest.bndrun | 16 ++++++- .../itest.bndrun | 43 +++++++++++++++++- .../itest.bndrun | 5 ++- .../itest.bndrun | 3 +- itests/org.openhab.core.ui.tests/itest.bndrun | 6 ++- .../org.openhab.core.voice.tests/itest.bndrun | 3 +- 12 files changed, 135 insertions(+), 13 deletions(-) diff --git a/bundles/org.openhab.core.model.script/bnd.bnd b/bundles/org.openhab.core.model.script/bnd.bnd index ec97be88f32..08bce5ce721 100644 --- a/bundles/org.openhab.core.model.script/bnd.bnd +++ b/bundles/org.openhab.core.model.script/bnd.bnd @@ -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,\ diff --git a/itests/org.openhab.core.binding.xml.tests/itest.bndrun b/itests/org.openhab.core.binding.xml.tests/itest.bndrun index f6f85ba5e33..3b7d340b45e 100644 --- a/itests/org.openhab.core.binding.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.binding.xml.tests/itest.bndrun @@ -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)' diff --git a/itests/org.openhab.core.compat1x.tests/itest.bndrun b/itests/org.openhab.core.compat1x.tests/itest.bndrun index 014f73850ed..730cebd3292 100644 --- a/itests/org.openhab.core.compat1x.tests/itest.bndrun +++ b/itests/org.openhab.core.compat1x.tests/itest.bndrun @@ -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)' diff --git a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun index 62320ab4616..878adff3ce9 100644 --- a/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun +++ b/itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun @@ -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)' diff --git a/itests/org.openhab.core.magic.tests/itest.bndrun b/itests/org.openhab.core.magic.tests/itest.bndrun index 9db6e73552b..dcb208f8b6b 100644 --- a/itests/org.openhab.core.magic.tests/itest.bndrun +++ b/itests/org.openhab.core.magic.tests/itest.bndrun @@ -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)' diff --git a/itests/org.openhab.core.model.core.tests/itest.bndrun b/itests/org.openhab.core.model.core.tests/itest.bndrun index 5011f844a5e..e361f837208 100644 --- a/itests/org.openhab.core.model.core.tests/itest.bndrun +++ b/itests/org.openhab.core.model.core.tests/itest.bndrun @@ -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)' diff --git a/itests/org.openhab.core.model.lsp.tests/itest.bndrun b/itests/org.openhab.core.model.lsp.tests/itest.bndrun index f93af68beec..6e8e554e737 100644 --- a/itests/org.openhab.core.model.lsp.tests/itest.bndrun +++ b/itests/org.openhab.core.model.lsp.tests/itest.bndrun @@ -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)' diff --git a/itests/org.openhab.core.model.persistence.tests/itest.bndrun b/itests/org.openhab.core.model.persistence.tests/itest.bndrun index 7ac4a77621d..506e2590740 100644 --- a/itests/org.openhab.core.model.persistence.tests/itest.bndrun +++ b/itests/org.openhab.core.model.persistence.tests/itest.bndrun @@ -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)' diff --git a/itests/org.openhab.core.model.thing.tests/itest.bndrun b/itests/org.openhab.core.model.thing.tests/itest.bndrun index 5c45ec69a34..3e8144d39cf 100644 --- a/itests/org.openhab.core.model.thing.tests/itest.bndrun +++ b/itests/org.openhab.core.model.thing.tests/itest.bndrun @@ -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)' diff --git a/itests/org.openhab.core.thing.xml.tests/itest.bndrun b/itests/org.openhab.core.thing.xml.tests/itest.bndrun index ee96efe1ac4..7bcece5c6e4 100644 --- a/itests/org.openhab.core.thing.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.thing.xml.tests/itest.bndrun @@ -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)' diff --git a/itests/org.openhab.core.ui.tests/itest.bndrun b/itests/org.openhab.core.ui.tests/itest.bndrun index 2f63d6bb03d..bd62e0535ac 100644 --- a/itests/org.openhab.core.ui.tests/itest.bndrun +++ b/itests/org.openhab.core.ui.tests/itest.bndrun @@ -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)' diff --git a/itests/org.openhab.core.voice.tests/itest.bndrun b/itests/org.openhab.core.voice.tests/itest.bndrun index f9ce9e59841..958df1dd133 100644 --- a/itests/org.openhab.core.voice.tests/itest.bndrun +++ b/itests/org.openhab.core.voice.tests/itest.bndrun @@ -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)'