demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Raise minimum JDK version to 17 (#2994)

Browse Source 
* Raise source level to Java 17 (except for model classes)
* Remove Nashorn script engine
* Upgrade spotless and add jvm options  
  See https://github.com/diffplug/spotless/issues/834
* Add suppression for findBugs false positive error
* Upgrade xtext to 2.29.0
* Adjust JNA
* Resolve itests

Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2022-12-19 19:52:43 +01:00 committed by GitHub
parent d48ac20377
commit 41ba3ff854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
42 changed files with 163 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci-build.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '11', '17' ]
java: [ '17' ]
maven: [ '3.8.6' ]
os: [ 'ubuntu-22.04' ]
name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
@ -56,7 +56,7 @@ jobs:
maven-version: ${{ matrix.maven }}
- name: Register Problem Matchers
if: ${{ matrix.java == '11' }}
if: ${{ matrix.java == '17' }}
id: problem_matchers
run: |
echo "::add-matcher::.github/openhab-compile-problems.json"
@ -86,7 +86,7 @@ jobs:
path: target/summary_report.html
- name: Report SAT Errors as Annotations
if: ${{ matrix.java == '11' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
uses: ghys/checkstyle-github-action@main
with:
title: CheckStyle Violations

2
README.md
View File

@ -23,7 +23,7 @@ If you have not worked with Maven yet, just follow the instructions and everythi
What you need before you start:
- Java SE Development Kit 11
- Java SE Development Kit 17
- Maven 3 from https://maven.apache.org/download.html
Make sure that the `mvn` command is available on your path

2
bom/compile-model/pom.xml
View File

@ -140,7 +140,7 @@
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>io.github.classgraph</artifactId>
<version>4.8.138.v20211212-1642 </version>
<version>4.8.149.v20220915-0556</version>
<scope>compile</scope>
</dependency>

2
bom/compile/pom.xml
View File

@ -99,7 +99,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
<version>2.9.1</version>
<scope>compile</scope>
</dependency>

9
bom/runtime/pom.xml
View File

@ -440,7 +440,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
<version>2.9.1</version>
<scope>compile</scope>
</dependency>
@ -771,7 +771,7 @@
<dependency>
<groupId>org.eclipse.orbit.bundles</groupId>
<artifactId>io.github.classgraph</artifactId>
<version>4.8.138.v20211212-1642 </version>
<version>4.8.149.v20220915-0556</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -878,11 +878,6 @@
<version>${xtext.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>

86
bundles/org.openhab.core.automation.module.script/src/main/java/org/openhab/core/automation/module/script/internal/NashornScriptEngineFactory.java
View File

@ -1,86 +0,0 @@
/**
* Copyright (c) 2010-2022 Contributors to the openHAB project
*
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.automation.module.script.internal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.automation.module.script.AbstractScriptEngineFactory;
import org.openhab.core.automation.module.script.ScriptEngineFactory;
import org.osgi.service.component.annotations.Component;
/**
* An implementation of {@link ScriptEngineFactory} with customizations for Nashorn ScriptEngines.
*
* @author Simon Merschjohann - Initial contribution
* @author Scott Rushworth - removed default methods provided by ScriptEngineFactory
* @author Yannick Schaus - create script engines with the bundle's class loader as "app" class loader
*/
@NonNullByDefault
@Component(service = ScriptEngineFactory.class)
public class NashornScriptEngineFactory extends AbstractScriptEngineFactory {
private static final String SCRIPT_TYPE = "js";
@Override
public List<String> getScriptTypes() {
List<String> scriptTypes = new ArrayList<>();
for (javax.script.ScriptEngineFactory f : ENGINE_MANAGER.getEngineFactories()) {
List<String> extensions = f.getExtensions();
if (extensions.contains(SCRIPT_TYPE)) {
scriptTypes.addAll(extensions);
scriptTypes.addAll(f.getMimeTypes());
}
}
return Collections.unmodifiableList(scriptTypes);
}
@Override
public void scopeValues(ScriptEngine scriptEngine, Map<String, Object> scopeValues) {
Set<String> expressions = new HashSet<>();
for (Entry<String, Object> entry : scopeValues.entrySet()) {
scriptEngine.put(entry.getKey(), entry.getValue());
if (entry.getValue() instanceof Class) {
expressions.add(String.format("%s = %<s.static;", entry.getKey()));
}
}
String scriptToEval = String.join("\n", expressions);
try {
scriptEngine.eval(scriptToEval);
} catch (ScriptException ex) {
logger.error("ScriptException while importing scope: {}", ex.getMessage());
}
}
@Override
public @Nullable ScriptEngine createScriptEngine(String scriptType) {
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(NashornScriptEngineFactory.class.getClassLoader());
ScriptEngine scriptEngine = super.createScriptEngine(scriptType);
Thread.currentThread().setContextClassLoader(originalClassLoader);
return scriptEngine;
}
}

2
bundles/pom.xml
View File

@ -161,7 +161,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<version>3.3.0</version>
<executions>
<execution>
<id>unpack-eea</id>

6
features/karaf/openhab-core/src/main/feature/feature.xml
View File

@ -28,7 +28,7 @@
<feature dependency="true">openhab.tp-gson</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.26.0)(!(version&gt;=2.27.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext)(version&gt;=2.29.0)(!(version&gt;=2.30.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext</feature>
<requirement>openhab.tp;filter:="(feature=jax-rs-whiteboard)"</requirement>
@ -349,10 +349,10 @@
<feature name="openhab-core-model-lsp" version="${project.version}">
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.26.0)(!(version&gt;=2.27.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=xtext-ide)(version&gt;=2.29.0)(!(version&gt;=2.30.0)))"</requirement>
<feature dependency="true">openhab.tp-xtext-ide</feature>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.12.0)(!(version&gt;=0.13.0)))"</requirement>
<requirement>openhab.tp;filter:="(&amp;(feature=lsp4j)(version&gt;=0.19.0)(!(version&gt;=0.20.0)))"</requirement>
<feature dependency="true">openhab.tp-lsp4j</feature>
<feature>openhab-core-model-item-ide</feature>

2
features/karaf/openhab-tp/pom.xml
View File

@ -16,7 +16,7 @@
<properties>
<jetty.version>9.4.46.v20220331</jetty.version>
<jna.version>5.11.0</jna.version>
<jna.version>5.12.1</jna.version>
</properties>
<build>

38
features/karaf/openhab-tp/src/main/feature/feature.xml
View File

@ -54,8 +54,8 @@
</feature>
<feature name="openhab.tp-gson" description="Gson" version="${project.version}">
<capability>openhab.tp;feature=gson;version=2.8.9</capability>
<bundle>mvn:com.google.code.gson/gson/2.8.9</bundle>
<capability>openhab.tp;feature=gson;version=2.9.1</capability>
<bundle>mvn:com.google.code.gson/gson/2.9.1</bundle>
</feature>
<feature name="openhab.tp-hivemqclient" description="MQTT Client" version="${project.version}">
@ -200,9 +200,9 @@
</feature>
<feature name="openhab.tp-lsp4j" description="Eclipse LSP4J" version="${project.version}">
<capability>openhab.tp;feature=lsp4j;version=0.12.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.12.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.12.0</bundle>
<capability>openhab.tp;feature=lsp4j;version=0.19.0</capability>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j/0.19.0</bundle>
<bundle>mvn:org.eclipse.lsp4j/org.eclipse.lsp4j.jsonrpc/0.19.0</bundle>
<feature dependency="true">openhab.tp-gson</feature>
<feature dependency="true">openhab.tp-xtext</feature>
@ -222,24 +222,24 @@
</feature>
<feature name="openhab.tp-xtext" description="Xtext - Language Engineering Made Easy" version="${project.version}">
<capability>openhab.tp;feature=xtext;version=2.26.0</capability>
<capability>openhab.tp;feature=xtext;version=2.29.0</capability>
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.26.0</bundle>
<bundle>mvn:org.eclipse.xtext/org.eclipse.xtext/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.common/2.17.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore/2.20.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.change/2.14.0</bundle>
<bundle dependency="true">mvn:org.eclipse.emf/org.eclipse.emf.ecore.xmi/2.16.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.common.types/2.29.0</bundle>
<bundle dependency="true">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.smap/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.util/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.29.0</bundle>
<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.1</bundle>
<bundle dependency="true">mvn:com.google.guava/guava/30.1-jre</bundle>
@ -247,7 +247,7 @@
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.aopalliance/1.0.0.v201105210816</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/com.google.inject/5.0.1.v20210324-2015</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.138.v20211212-1642</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/io.github.classgraph/4.8.149.v20220915-0556</bundle>
<bundle dependency="true">mvn:org.eclipse.orbit.bundles/org.antlr.runtime/3.2.0.v201101311130</bundle>
<bundle dependency="true">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.13.0</bundle>
@ -256,16 +256,16 @@
<!-- Add ASM package -->
<!-- org.eclipse.xtext.common.types is using Require-Bundle -->
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/9.2</bundle>
<bundle dependency="true" start-level="20">mvn:org.ow2.asm/asm/9.4</bundle>
</feature>
<feature name="openhab.tp-xtext-ide" description="Xtext - IDE Support" version="${project.version}">
<capability>openhab.tp;feature=xtext-ide;version=2.26.0</capability>
<capability>openhab.tp;feature=xtext-ide;version=2.29.0</capability>
<feature dependency="true">openhab.tp-xtext</feature>
<!-- Support for the Language Server Protocol -->
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.26.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.ide/2.29.0</bundle>
<bundle dependency="true">mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.29.0</bundle>
</feature>
<feature name="openhab.tp-swagger-jaxrs" description="JAX-RS Whiteboard Swagger Support" version="${project.version}">

3
itests/itest-include.bndrun
View File

@ -15,7 +15,7 @@ Test-Cases: ${classes;CONCRETE;PUBLIC;NAMED;*Test}
-runsystempackages: sun.reflect
-runfw: org.eclipse.osgi
-runee: JavaSE-11
-runee: JavaSE-17
# An unused random HTTP port is used during tests to prevent resource conflicts
# This property is set by the build-helper-maven-plugin in the itests pom.xml
@ -36,7 +36,6 @@ Export-Package:
bnd.identity;id='junit-jupiter-engine'
-runproperties: \
nashorn.args=--no-deprecation-warning,\
org.ops4j.pax.logging.DefaultServiceLog.level=WARN
-runvm.java9plus: \

4
itests/org.openhab.core.auth.oauth2client.tests/itest.bndrun
View File

@ -39,7 +39,6 @@ Fragment-Host: org.openhab.core.auth.oauth2client
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
@ -62,4 +61,5 @@ Fragment-Host: org.openhab.core.auth.oauth2client
org.openhab.core.auth.oauth2client.tests;version='[4.0.0,4.0.1)',\
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)'
org.openhab.core.test;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.automation.integration.tests/itest.bndrun
View File

@ -37,7 +37,6 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)'
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.automation.module.core.tests/itest.bndrun
View File

@ -37,7 +37,6 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)'
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

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

@ -37,7 +37,6 @@ Fragment-Host: org.openhab.core.automation.module.script
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -58,4 +57,5 @@ Fragment-Host: org.openhab.core.automation.module.script
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.transform;version='[4.0.0,4.0.1)'
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

83
itests/org.openhab.core.automation.module.script.tests/src/main/java/org/openhab/core/automation/module/script/internal/defaultscope/ScriptScopeOSGiTest.java
View File

@ -1,83 +0,0 @@
/**
* Copyright (c) 2010-2022 Contributors to the openHAB project
*
* See the NOTICE file(s) distributed with this work for additional
* information.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.core.automation.module.script.internal.defaultscope;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
import javax.script.ScriptEngine;
import javax.script.ScriptException;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.core.automation.module.script.ScriptEngineContainer;
import org.openhab.core.automation.module.script.ScriptEngineManager;
import org.openhab.core.test.java.JavaOSGiTest;
/**
* This tests the script modules if the Nashorn JavaScript engine is available.
*
* @author Kai Kreuzer - Initial contribution
*/
@NonNullByDefault
public class ScriptScopeOSGiTest extends JavaOSGiTest {
private static final boolean NASHORN_AVAILABLE = isNashornAvailable();
private @NonNullByDefault({}) ScriptEngine engine;
private final String path = "OH-INF/automation/jsr223/";
private final String workingFile = "scopeWorking.js";
private final String failureFile = "scopeFailure.js";
/**
* Returns if the Nashorn JavaScript engine is available based on the Java specification version property.
* Nashorn has been removed from JDK 15 and onwards.
*
* @return {@code true} if Nashorn is available, {@code false} otherwise
*/
private static boolean isNashornAvailable() {
try {
String javaVersion = System.getProperty("java.specification.version");
return javaVersion == null ? false : Long.parseLong(javaVersion) < 15;
} catch (NumberFormatException e) {
return false;
}
}
@BeforeEach
public void init() {
assumeTrue(NASHORN_AVAILABLE);
ScriptEngineManager scriptManager = getService(ScriptEngineManager.class);
ScriptEngineContainer container = scriptManager.createScriptEngine("js", "myJSEngine");
engine = container.getScriptEngine();
}
@Test
public void testScopeDefinesItemTypes() throws ScriptException, IOException {
URL url = bundleContext.getBundle().getResource(path + workingFile);
engine.eval(new InputStreamReader(url.openStream()));
}
@Test
public void testScopeDoesNotDefineFoobar() throws ScriptException, IOException {
URL url = bundleContext.getBundle().getResource(path + failureFile);
assertThrows(ScriptException.class, () -> engine.eval(new InputStreamReader(url.openStream())));
}
}

5
itests/org.openhab.core.automation.module.script.tests/src/main/resources/OH-INF/automation/jsr223/scopeFailure.js
View File

@ -1,5 +0,0 @@
'use strict';
if(FOOBAR === undefined && UnDefType.FOOBAR === undefined) {
throw "FOOBAR and UnDefType.FOOBAR not defined";
}

194
itests/org.openhab.core.automation.module.script.tests/src/main/resources/OH-INF/automation/jsr223/scopeWorking.js
View File

@ -1,194 +0,0 @@
'use strict';
if(State === undefined) {
throw "State not defined";
}
if(Command === undefined) {
throw "Command not defined";
}
if(URLEncoder === undefined) {
throw "URLEncoder not defined";
}
if(File === undefined) {
throw "File not defined";
}
if(Files === undefined) {
throw "Files not defined";
}
if(Path === undefined) {
throw "Path not defined";
}
if(Paths === undefined) {
throw "Paths not defined";
}
//types
if(IncreaseDecreaseType === undefined) {
throw "IncreaseDecreaseType not defined";
}
if(DECREASE === undefined) {
throw "DECREASE not defined";
}
if(INCREASE === undefined) {
throw "INCREASE not defined";
}
if(OnOffType === undefined) {
throw "OnOffType not defined";
}
if(ON === undefined) {
throw "OFF not defined";
}
if(OpenClosedType === undefined) {
throw "OpenClosedType not defined";
}
if(CLOSED === undefined) {
throw "CLOSED not defined";
}
if(OPEN === undefined) {
throw "OPEN not defined";
}
if(StopMoveType === undefined) {
throw "StopMoveType not defined";
}
if(MOVE === undefined) {
throw "MOVE not defined";
}
if(STOP === undefined) {
throw "STOP not defined";
}
if(UpDownType === undefined) {
throw "UpDownType not defined";
}
if(DOWN === undefined) {
throw "DOWN not defined";
}
if(UP === undefined) {
throw "UP not defined";
}
if(UnDefType === undefined) {
throw "UnDefType not defined";
}
if(NULL === undefined) {
throw "NULL not defined";
}
if(NextPreviousType === undefined) {
throw "NextPreviousType not defined";
}
if(NEXT === undefined) {
throw "NEXT not defined";
}
if(PREVIOUS === undefined) {
throw "PREVIOUS not defined";
}
if(PlayPauseType === undefined) {
throw "PlayPauseType not defined";
}
if(PLAY === undefined) {
throw "PLAY not defined";
}
if(PAUSE === undefined) {
throw "PAUSE not defined";
}
if(RewindFastforwardType === undefined) {
throw "RewindFastforwardType not defined";
}
if(REWIND === undefined) {
throw "REWIND not defined";
}
if(FASTFORWARD === undefined) {
throw "FASTFORWARD not defined";
}
if(QuantityType === undefined) {
throw "QuantityType not defined";
}
if(StringListType === undefined) {
throw "StringListType not defined";
}
if(RawType === undefined) {
throw "RawType not defined";
}
if(DateTimeType === undefined) {
throw "DateTimeType not defined";
}
if(DecimalType === undefined) {
throw "DecimalType not defined";
}
if(DateTimeType === undefined) {
throw "DateTimeType not defined";
}
if(HSBType === undefined) {
throw "HSBType not defined";
}
if(PercentType === undefined) {
throw "PercentType not defined";
}
if(PointType === undefined) {
throw "PointType not defined";
}
if(StringType === undefined) {
throw "StringType not defined";
}
if(items === undefined) {
throw "items not defined";
}
if(ir === undefined) {
throw "ir not defined";
}
if(itemRegistry === undefined) {
throw "itemRegistry not defined";
}
if(things === undefined) {
throw "things not defined";
}
if(events === undefined) {
throw "events not defined";
}
if(rules === undefined) {
throw "rules not defined";
}

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

@ -37,7 +37,6 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)'
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.automation.tests/itest.bndrun
View File

@ -37,7 +37,6 @@ Fragment-Host: org.openhab.core.automation
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.automation
org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)'
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.binding.xml.tests/itest.bndrun
View File

@ -40,7 +40,6 @@ Fragment-Host: org.openhab.core.binding.xml
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@ -58,4 +57,5 @@ Fragment-Host: org.openhab.core.binding.xml
org.openhab.core.binding.xml.tests;version='[4.0.0,4.0.1)',\
org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)'
org.openhab.core.test;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.config.core.tests/itest.bndrun
View File

@ -41,7 +41,6 @@ Fragment-Host: org.openhab.core.config.core
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
org.mockito.junit-jupiter;version='[4.1.0,4.1.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -56,4 +55,5 @@ Fragment-Host: org.openhab.core.config.core
org.openhab.core;version='[4.0.0,4.0.1)',\
org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
org.openhab.core.config.core.tests;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)'
org.openhab.core.test;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

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

@ -39,7 +39,6 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
net.bytebuddy.byte-buddy-agent;version='[1.12.1,1.12.2)',\
org.mockito.mockito-core;version='[4.1.0,4.1.1)',\
org.objenesis;version='[3.2.0,3.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@ -62,4 +61,5 @@ Fragment-Host: org.openhab.core.config.discovery.mdns
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.io.transport.mdns;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)'
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.config.discovery.tests/itest.bndrun
View File

@ -43,7 +43,6 @@ Fragment-Host: org.openhab.core.config.discovery
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@ -65,4 +64,5 @@ Fragment-Host: org.openhab.core.config.discovery
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

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

@ -40,7 +40,6 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@ -62,4 +61,5 @@ Fragment-Host: org.openhab.core.config.discovery.usbserial.linuxsysfs
org.openhab.core.config.discovery.usbserial.linuxsysfs.tests;version='[4.0.0,4.0.1)',\
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)'
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.config.discovery.usbserial.tests/itest.bndrun
View File

@ -49,7 +49,6 @@ Provide-Capability: \
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@ -70,4 +69,5 @@ Provide-Capability: \
org.openhab.core.config.discovery.usbserial.tests;version='[4.0.0,4.0.1)',\
org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)'
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.config.dispatch.tests/itest.bndrun
View File

@ -35,7 +35,6 @@ Fragment-Host: org.openhab.core.config.dispatch
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@ -52,4 +51,5 @@ Fragment-Host: org.openhab.core.config.dispatch
org.openhab.core;version='[4.0.0,4.0.1)',\
org.openhab.core.config.dispatch;version='[4.0.0,4.0.1)',\
org.openhab.core.config.dispatch.tests;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)'
org.openhab.core.test;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.config.xml.tests/itest.bndrun
View File

@ -36,7 +36,6 @@ Fragment-Host: org.openhab.core.config.xml
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -52,4 +51,5 @@ Fragment-Host: org.openhab.core.config.xml
org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
org.openhab.core.config.xml.tests;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)'
org.openhab.core.test;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.ephemeris.tests/itest.bndrun
View File

@ -44,7 +44,6 @@ feature.openhab-config: \
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -61,4 +60,5 @@ feature.openhab-config: \
org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
org.openhab.core.ephemeris;version='[4.0.0,4.0.1)',\
org.openhab.core.ephemeris.tests;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)'
org.openhab.core.test;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

6
itests/org.openhab.core.io.rest.core.tests/itest.bndrun
View File

@ -68,8 +68,6 @@ Fragment-Host: org.openhab.core.io.rest.core
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
@ -101,4 +99,6 @@ Fragment-Host: org.openhab.core.io.rest.core
org.openhab.core.semantics;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.transform;version='[4.0.0,4.0.1)'
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.objectweb.asm;version='[9.4.0,9.4.1)'

26
itests/org.openhab.core.model.core.tests/itest.bndrun
View File

@ -27,7 +27,6 @@ Fragment-Host: org.openhab.core.model.core
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
com.google.guava;version='[30.1.0,30.1.1)',\
org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
jakarta.inject.jakarta.inject-api;version='[2.0.0,2.0.1)',\
javax.measure.unit-api;version='[2.1.2,2.1.3)',\
@ -49,18 +48,8 @@ Fragment-Host: org.openhab.core.model.core
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
com.google.inject;version='[5.0.1,5.0.2)',\
org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
org.eclipse.xtext;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
io.github.classgraph;version='[4.8.138,4.8.139)',\
jollyday;version='[0.5.10,0.5.11)',\
org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
org.threeten.extra;version='[1.5.0,1.5.1)',\
@ -110,4 +99,17 @@ Fragment-Host: org.openhab.core.model.core
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
org.openhab.core.voice;version='[4.0.0,4.0.1)'
org.openhab.core.voice;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
io.github.classgraph;version='[4.8.149,4.8.150)',\
org.apache.log4j;version='[1.2.19,1.2.20)',\
org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
org.eclipse.xtext;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.openhab.core.model.sitemap.runtime;version='[4.0.0,4.0.1)'

26
itests/org.openhab.core.model.item.tests/itest.bndrun
View File

@ -31,7 +31,6 @@ Fragment-Host: org.openhab.core.model.item
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
com.google.guava;version='[30.1.0,30.1.1)',\
org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@ -50,17 +49,7 @@ Fragment-Host: org.openhab.core.model.item
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
com.google.inject;version='[5.0.1,5.0.2)',\
io.github.classgraph;version='[4.8.138,4.8.139)',\
org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
org.eclipse.xtext;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
@ -108,4 +97,17 @@ Fragment-Host: org.openhab.core.model.item
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
org.openhab.core.voice;version='[4.0.0,4.0.1)'
org.openhab.core.voice;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
io.github.classgraph;version='[4.8.149,4.8.150)',\
org.apache.log4j;version='[1.2.19,1.2.20)',\
org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
org.eclipse.xtext;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.openhab.core.model.sitemap.runtime;version='[4.0.0,4.0.1)'

26
itests/org.openhab.core.model.rule.tests/itest.bndrun
View File

@ -32,7 +32,6 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
com.google.guava;version='[30.1.0,30.1.1)',\
org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@ -51,17 +50,7 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
com.google.inject;version='[5.0.1,5.0.2)',\
io.github.classgraph;version='[4.8.138,4.8.139)',\
org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
org.eclipse.xtext;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
@ -109,5 +98,18 @@ Fragment-Host: org.openhab.core.model.rule.runtime
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
org.openhab.core.voice;version='[4.0.0,4.0.1)'
org.openhab.core.voice;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
io.github.classgraph;version='[4.8.149,4.8.150)',\
org.apache.log4j;version='[1.2.19,1.2.20)',\
org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
org.eclipse.xtext;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.openhab.core.model.sitemap.runtime;version='[4.0.0,4.0.1)'
-runblacklist: bnd.identity;id='jakarta.activation-api'

26
itests/org.openhab.core.model.script.tests/itest.bndrun
View File

@ -34,7 +34,6 @@ Fragment-Host: org.openhab.core.model.script
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
com.google.guava;version='[30.1.0,30.1.1)',\
org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@ -52,17 +51,7 @@ Fragment-Host: org.openhab.core.model.script
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
com.google.inject;version='[5.0.1,5.0.2)',\
io.github.classgraph;version='[4.8.138,4.8.139)',\
org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
org.eclipse.xtext;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
@ -110,4 +99,17 @@ Fragment-Host: org.openhab.core.model.script
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
org.openhab.core.voice;version='[4.0.0,4.0.1)'
org.openhab.core.voice;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
io.github.classgraph;version='[4.8.149,4.8.150)',\
org.apache.log4j;version='[1.2.19,1.2.20)',\
org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
org.eclipse.xtext;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.openhab.core.model.sitemap.runtime;version='[4.0.0,4.0.1)'

26
itests/org.openhab.core.model.thing.tests/itest.bndrun
View File

@ -33,7 +33,6 @@ Fragment-Host: org.openhab.core.model.thing
org.eclipse.emf.ecore.xmi;version='[2.16.0,2.16.1)',\
org.glassfish.hk2.osgi-resource-locator;version='[1.0.3,1.0.4)',\
com.google.guava;version='[30.1.0,30.1.1)',\
org.eclipse.equinox.common;version='[3.13.0,3.13.1)',\
org.objectweb.asm.commons;version='[9.0.0,9.0.1)',\
org.objectweb.asm.tree;version='[9.0.0,9.0.1)',\
jakarta.annotation-api;version='[2.0.0,2.0.1)',\
@ -59,17 +58,7 @@ Fragment-Host: org.openhab.core.model.thing
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
com.google.inject;version='[5.0.1,5.0.2)',\
io.github.classgraph;version='[4.8.138,4.8.139)',\
org.eclipse.xtend.lib;version='[2.26.0,2.26.1)',\
org.eclipse.xtend.lib.macro;version='[2.26.0,2.26.1)',\
org.eclipse.xtext;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.common.types;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.util;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.xbase;version='[2.26.0,2.26.1)',\
org.eclipse.xtext.xbase.lib;version='[2.26.0,2.26.1)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
org.eclipse.jetty.client;version='[9.4.46,9.4.47)',\
@ -121,4 +110,17 @@ Fragment-Host: org.openhab.core.model.thing
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
org.openhab.core.transform;version='[4.0.0,4.0.1)',\
org.openhab.core.voice;version='[4.0.0,4.0.1)'
org.openhab.core.voice;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
io.github.classgraph;version='[4.8.149,4.8.150)',\
org.apache.log4j;version='[1.2.19,1.2.20)',\
org.eclipse.equinox.common;version='[3.16.200,3.16.201)',\
org.eclipse.xtend.lib;version='[2.29.0,2.29.1)',\
org.eclipse.xtend.lib.macro;version='[2.29.0,2.29.1)',\
org.eclipse.xtext;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.common.types;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.util;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.xbase;version='[2.29.0,2.29.1)',\
org.eclipse.xtext.xbase.lib;version='[2.29.0,2.29.1)',\
org.objectweb.asm;version='[9.4.0,9.4.1)',\
org.openhab.core.model.sitemap.runtime;version='[4.0.0,4.0.1)'

4
itests/org.openhab.core.storage.json.tests/itest.bndrun
View File

@ -35,7 +35,6 @@ Fragment-Host: org.openhab.core.storage.json
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -53,4 +52,5 @@ Fragment-Host: org.openhab.core.storage.json
org.openhab.core.storage.json;version='[4.0.0,4.0.1)',\
org.openhab.core.storage.json.tests;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)'
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.tests/itest.bndrun
View File

@ -40,7 +40,6 @@ Fragment-Host: org.openhab.core
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -54,4 +53,5 @@ Fragment-Host: org.openhab.core
biz.aQute.tester.junit-platform;version='[6.4.0,6.4.1)',\
org.openhab.core;version='[4.0.0,4.0.1)',\
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.tests;version='[4.0.0,4.0.1)'
org.openhab.core.tests;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.thing.tests/itest.bndrun
View File

@ -47,7 +47,6 @@ Fragment-Host: org.openhab.core.thing
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
@ -67,4 +66,5 @@ Fragment-Host: org.openhab.core.thing
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.tests;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

4
itests/org.openhab.core.thing.xml.tests/itest.bndrun
View File

@ -38,7 +38,6 @@ Fragment-Host: org.openhab.core.thing.xml
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
xstream;version='[1.4.19,1.4.20)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.eclipse.jetty.http;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.io;version='[9.4.46,9.4.47)',\
org.eclipse.jetty.security;version='[9.4.46,9.4.47)',\
@ -58,4 +57,5 @@ Fragment-Host: org.openhab.core.thing.xml
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
org.openhab.core.thing.xml.tests;version='[4.0.0,4.0.1)'
org.openhab.core.thing.xml.tests;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)'

6
itests/org.openhab.core.voice.tests/itest.bndrun
View File

@ -42,8 +42,6 @@ Fragment-Host: org.openhab.core.voice
org.apache.felix.scr;version='[2.1.30,2.1.31)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
com.google.gson;version='[2.8.9,2.8.10)',\
org.objectweb.asm;version='[9.2.0,9.2.1)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.apache.xbean.bundleutils;version='[4.21.0,4.21.1)',\
org.apache.xbean.finder;version='[4.21.0,4.21.1)',\
@ -71,4 +69,6 @@ Fragment-Host: org.openhab.core.voice
org.openhab.core.test;version='[4.0.0,4.0.1)',\
org.openhab.core.thing;version='[4.0.0,4.0.1)',\
org.openhab.core.voice;version='[4.0.0,4.0.1)',\
org.openhab.core.voice.tests;version='[4.0.0,4.0.1)'
org.openhab.core.voice.tests;version='[4.0.0,4.0.1)',\
com.google.gson;version='[2.9.1,2.9.2)',\
org.objectweb.asm;version='[9.4.0,9.4.1)'

23
pom.xml
View File

@ -64,7 +64,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<oh.java.version>11</oh.java.version>
<oh.java.version>17</oh.java.version>
<maven.compiler.source>${oh.java.version}</maven.compiler.source>
<maven.compiler.target>${oh.java.version}</maven.compiler.target>
<maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
@ -76,8 +76,9 @@
<karaf.tooling.version>4.3.7</karaf.tooling.version>
<sat.version>0.13.0</sat.version>
<slf4j.version>1.7.32</slf4j.version>
<xtext.version>2.26.0</xtext.version>
<spotless.version>2.0.3</spotless.version>
<xtext.version>2.29.0</xtext.version>
<spotless.version>2.28.0</spotless.version>
<spotless.eclipse.version>4.21.0</spotless.eclipse.version>
</properties>
<dependencyManagement>
@ -292,12 +293,12 @@ Import-Package: \\
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
<version>2.11.1</version>
<version>2.12.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<version>3.28.0</version>
<version>3.30.0</version>
</dependency>
</dependencies>
</plugin>
@ -387,7 +388,7 @@ Import-Package: \\
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.0.0-M7</version>
<configuration>
<argLine>
--add-opens java.base/java.net=ALL-UNNAMED
@ -537,7 +538,7 @@ Import-Package: \\
<java>
<eclipse>
<file>openhab_codestyle.xml</file>
<version>4.13.0</version>
<version>${spotless.eclipse.version}</version>
</eclipse>
<removeUnusedImports/>
<importOrder>
@ -560,7 +561,7 @@ Import-Package: \\
<files>
<file>openhab_wst_xml_files.prefs</file>
</files>
<version>4.13.0</version>
<version>${spotless.eclipse.version}</version>
</eclipseWtp>
<trimTrailingWhitespace/>
<endWithNewline/>
@ -575,7 +576,7 @@ Import-Package: \\
<files>
<file>openhab_wst_feature_file.prefs</file>
</files>
<version>4.13.0</version>
<version>${spotless.eclipse.version}</version>
</eclipseWtp>
<trimTrailingWhitespace/>
<endWithNewline/>
@ -590,7 +591,7 @@ Import-Package: \\
<files>
<file>openhab_wst_pom_file.prefs</file>
</files>
<version>4.13.0</version>
<version>${spotless.eclipse.version}</version>
</eclipseWtp>
<trimTrailingWhitespace/>
<endWithNewline/>
@ -647,7 +648,7 @@ Import-Package: \\
<configuration>
<rules>
<requireJavaVersion>
<version>[11.0,18.0)</version>
<version>[17.0,18.0)</version>
</requireJavaVersion>
</rules>
</configuration>

4
tools/static-code-analysis/spotbugs/suppressions.xml
View File

@ -35,4 +35,8 @@
<Match>
<Bug pattern="SLF4J_SIGN_ONLY_FORMAT"/>
</Match>
<Match>
<!-- see https://github.com/spotbugs/spotbugs/issues/1992 -->
<Bug pattern="SA_LOCAL_SELF_COMPARISON"/>
</Match>
</FindBugsFilter>