[itest] Exclude json and mapdb storage by default for itests (#1193)

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>

itests/itest-common.bndrun

@@ -1,28 +1,6 @@
--standalone: \
-    ../../bom/runtime-index/target/index.xml;name="org.openhab.core.bom.runtime-index",\
-    ../../bom/test-index/target/index.xml;name="org.openhab.core.bom.test-index",\
-    ../../bom/openhab-core-index/target/local-index.xml;name="org.openhab.core.bom.openhab-core-index",\
-     target/index.xml;name="self"
+-include: itest-include.bndrun
 
--resolve.effective: active
-
-# Run all integration tests which are named xyzTest
-Test-Cases: ${classes;CONCRETE;PUBLIC;NAMED;*Test}
-
-# A temporary inclusion until an R7 framework is available
-Import-Package: org.osgi.framework.*;version="[1.8,2)",*
-
-# Used by Objenesis/Mockito and not actually optional
--runsystempackages: sun.reflect
-
--runfw: org.eclipse.osgi
--runee: JavaSE-1.8
-
-# The integration test itself does not export anything.
-Export-Package: 
--exportcontents: 
-
--runrequires.ee: \
-    bnd.identity;id='org.apache.servicemix.specs.activation-api-1.1',\
-    bnd.identity;id='org.apache.servicemix.specs.annotation-api-1.3',\
-    bnd.identity;id='org.apache.servicemix.specs.jaxb-api-2.2'
+# If we would like to use a storage at all, we will use the "volatile" storage.
+-runblacklist: \
+    bnd.identity;id='org.openhab.core.storage.json',\
+    bnd.identity;id='org.openhab.core.storage.mapdb'

itests/itest-include.bndrun

@@ -0,0 +1,28 @@
+-standalone: \
+    ../../bom/runtime-index/target/index.xml;name="org.openhab.core.bom.runtime-index",\
+    ../../bom/test-index/target/index.xml;name="org.openhab.core.bom.test-index",\
+    ../../bom/openhab-core-index/target/local-index.xml;name="org.openhab.core.bom.openhab-core-index",\
+     target/index.xml;name="self"
+
+-resolve.effective: active
+
+# Run all integration tests which are named xyzTest
+Test-Cases: ${classes;CONCRETE;PUBLIC;NAMED;*Test}
+
+# A temporary inclusion until an R7 framework is available
+Import-Package: org.osgi.framework.*;version="[1.8,2)",*
+
+# Used by Objenesis/Mockito and not actually optional
+-runsystempackages: sun.reflect
+
+-runfw: org.eclipse.osgi
+-runee: JavaSE-1.8
+
+# The integration test itself does not export anything.
+Export-Package:
+-exportcontents:
+
+-runrequires.ee: \
+    bnd.identity;id='org.apache.servicemix.specs.activation-api-1.1',\
+    bnd.identity;id='org.apache.servicemix.specs.annotation-api-1.3',\
+    bnd.identity;id='org.apache.servicemix.specs.jaxb-api-2.2'

itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun

@@ -28,14 +28,12 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
 	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
 	org.openhab.core.auth.oauth2client;version='[2.5.0,2.5.1)',\
 	org.openhab.core.auth.oauth2client.tests;version='[2.5.0,2.5.1)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
-	org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
@@ -47,4 +45,9 @@ Fragment-Host: org.openhab.core.auth.oauth2client
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)'
+	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
+	org.apache.commons.io;version='[2.2.0,2.2.1)',\
+	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.test;version='[2.5.0,2.5.1)'

itests/org.openhab.core.automation.integration.tests/itest.bndrun

@@ -4,11 +4,6 @@ Bundle-SymbolicName: ${project.artifactId}
 
 -runrequires: bnd.identity;id='org.openhab.core.automation.integration.tests'
 
-# If we would like to use a storage at all, we will use the "volatile" storage.
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #

itests/org.openhab.core.automation.module.core.tests/itest.bndrun

@@ -5,11 +5,6 @@ Fragment-Host: org.openhab.core.automation
 
 -runrequires: bnd.identity;id='org.openhab.core.automation.module.core.tests'
 
-# If we would like to use a storage at all, we will use the "volatile" storage.
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #

itests/org.openhab.core.automation.module.script.defaultscope.tests/itest.bndrun

@@ -4,11 +4,6 @@ Bundle-SymbolicName: ${project.artifactId}
 
 -runrequires: bnd.identity;id='org.openhab.core.automation.module.script.defaultscope.tests'
 
-# If we would like to use a storage at all, we will use the "volatile" storage.
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #
@@ -49,4 +44,4 @@ Bundle-SymbolicName: ${project.artifactId}
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	org.openhab.core.ephemeris;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.threeten.extra;version='[1.4.0,1.4.1)'

itests/org.openhab.core.automation.module.script.tests/itest.bndrun

@@ -5,11 +5,6 @@ Fragment-Host: org.openhab.core.automation.module.script
 
 -runrequires: bnd.identity;id='org.openhab.core.automation.module.script.tests'
 
-# If we would like to use a storage at all, we will use the "volatile" storage.
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #
@@ -50,4 +45,4 @@ Fragment-Host: org.openhab.core.automation.module.script
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	org.openhab.core.ephemeris;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.threeten.extra;version='[1.4.0,1.4.1)'

itests/org.openhab.core.automation.module.timer.tests/itest.bndrun

@@ -5,11 +5,6 @@ Fragment-Host: org.openhab.core.automation
 
 -runrequires: bnd.identity;id='org.openhab.core.automation.module.timer.tests'
 
-# If we would like to use a storage at all, we will use the "volatile" storage.
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #

itests/org.openhab.core.automation.tests/itest.bndrun

@@ -5,11 +5,6 @@ Fragment-Host: org.openhab.core.automation
 
 -runrequires: bnd.identity;id='org.openhab.core.automation.tests'
 
-# If we would like to use a storage at all, we will use the "volatile" storage.
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #

itests/org.openhab.core.binding.xml.tests/itest.bndrun

@@ -41,5 +41,4 @@ Fragment-Host: org.openhab.core.binding.xml
 	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)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
-	tec.uom.se;version='[1.0.10,1.0.11)',\
-	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
+	tec.uom.se;version='[1.0.10,1.0.11)'

itests/org.openhab.core.config.core.tests/itest.bndrun

@@ -6,11 +6,6 @@ Fragment-Host: org.openhab.core.config.core
 -runrequires: \
 	bnd.identity;id='org.openhab.core.config.core.tests'
 
-# We would like to use the "volatile" storage only
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #

itests/org.openhab.core.config.discovery.mdns.tests/itest.bndrun

@@ -45,5 +45,4 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
 	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)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
-	tec.uom.se;version='[1.0.10,1.0.11)',\
-	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
+	tec.uom.se;version='[1.0.10,1.0.11)'

itests/org.openhab.core.config.discovery.tests/itest.bndrun

@@ -7,11 +7,6 @@ Fragment-Host: org.openhab.core.config.discovery
 	bnd.identity;id='org.openhab.core.config.discovery.tests',\
 	bnd.identity;id='org.openhab.core.thing.xml'
 
-# If we would like to use a storage at all, we will use the "volatile" storage.
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #

itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/itest.bndrun

@@ -30,7 +30,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	org.openhab.core.config.discovery.usbserial;version='[2.5.0,2.5.1)',\
 	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.console;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;version='[2.5.0,2.5.1)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
@@ -41,5 +40,13 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)'
+	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
+	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+	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.openhab.core.test;version='[2.5.0,2.5.1)'
 

itests/org.openhab.core.config.dispatch.tests/itest.bndrun

@@ -39,5 +39,4 @@ Fragment-Host: org.openhab.core.config.dispatch
 	org.openhab.core.test;version='[2.5.0,2.5.1)',\
 	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)',\
-	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
+	tec.uom.se;version='[1.0.10,1.0.11)'

itests/org.openhab.core.config.xml.tests/itest.bndrun

@@ -5,11 +5,6 @@ Fragment-Host: org.openhab.core.config.xml
 
 -runrequires: bnd.identity;id='org.openhab.core.config.xml.tests'
 
-# We would like to use the "volatile" storage only
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #

itests/org.openhab.core.ephemeris.tests/itest.bndrun

@@ -16,11 +16,6 @@ feature.openhab-config: \
     ${feature.openhab-config},\
     bnd.identity;id='org.openhab.core.ephemeris.tests'
 
-# If we would like to use a storage at all, we will use the "volatile" storage.
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #

itests/org.openhab.core.io.rest.core.tests/itest.bndrun

@@ -7,11 +7,6 @@ Fragment-Host: org.openhab.core.io.rest.core
 	bnd.identity;id='org.openhab.core.io.rest.core.tests',\
 	bnd.identity;id='com.eclipsesource.jaxrs.jersey-all'
 
-# If we would like to use a storage at all, we will use the "volatile" storage.
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #

itests/org.openhab.core.model.core.tests/itest.bndrun

@@ -92,13 +92,12 @@ Fragment-Host: org.openhab.core.model.core
 	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.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)',\
-	org.openhab.core.model.rule.runtime;version='[2.5.0,2.5.1)'
+	org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\
+	org.threeten.extra;version='[1.4.0,1.4.1)'

itests/org.openhab.core.model.item.tests/itest.bndrun

@@ -7,11 +7,6 @@ Fragment-Host: org.openhab.core.model.item
     bnd.identity;id='org.openhab.core.model.item.tests',\
     bnd.identity;id='org.openhab.core.model.item.runtime'
 
-# We would like to use the "volatile" storage only
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #
@@ -103,5 +98,4 @@ Fragment-Host: org.openhab.core.model.item
 	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)'
+	org.threeten.extra;version='[1.4.0,1.4.1)'

itests/org.openhab.core.model.persistence.tests/itest.bndrun

@@ -50,7 +50,6 @@ Fragment-Host: org.openhab.core.model.persistence
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	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.storage.json;version='[2.5.0,2.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 +97,22 @@ Fragment-Host: org.openhab.core.model.persistence
 	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)'
+	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)',\
+	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
+	io.github.classgraph;version='[4.8.35,4.8.36)',\
+	org.eclipse.equinox.common;version='[3.10.400,3.10.401)',\
+	org.eclipse.xtend.lib;version='[2.19.0,2.19.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.19.0,2.19.1)',\
+	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)',\
+	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.item.runtime;version='[2.5.0,2.5.1)',\
+	org.openhab.core.test;version='[2.5.0,2.5.1)',\
+	org.threeten.extra;version='[1.4.0,1.4.1)'

itests/org.openhab.core.model.rule.tests/itest.bndrun

@@ -7,11 +7,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
     bnd.identity;id='org.openhab.core.model.rule.tests',\
     bnd.identity;id='org.openhab.core.model.rule.runtime'
 
-# We would like to use the "volatile" storage only
--runblacklist: \
-    bnd.identity;id='org.openhab.core.storage.json',\
-    bnd.identity;id='org.openhab.core.storage.mapdb'
-
 #
 # done
 #
@@ -103,4 +98,5 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	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.threeten.extra;version='[1.4.0,1.4.1)',\
+	org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)'

itests/org.openhab.core.model.script.tests/itest.bndrun

@@ -97,6 +97,5 @@ Fragment-Host: org.openhab.core.model.script
 	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.rule.runtime;version='[2.5.0,2.5.1)'
+	org.openhab.core.model.item.runtime;version='[2.5.0,2.5.1)',\
+	org.threeten.extra;version='[1.4.0,1.4.1)'

itests/org.openhab.core.model.thing.tests/itest.bndrun

@@ -109,7 +109,5 @@ Fragment-Host: org.openhab.core.model.thing
 	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.rule.runtime;version='[2.5.0,2.5.1)'
+	org.threeten.extra;version='[1.4.0,1.4.1)'
 

itests/org.openhab.core.storage.json.tests/itest.bndrun

@@ -1,4 +1,4 @@
--include: ../itest-common.bndrun
+-include: ../itest-include.bndrun
 
 Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.core.storage.json