demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-addons synced 2026-07-29 12:34:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bump bnd.version from 7.1.0 to 7.2.1 (#20061)

Browse Source 
* Bump bnd.version from 7.1.0 to 7.2.1

Bumps `bnd.version` from 7.1.0 to 7.2.1.

Updates `biz.aQute.bnd:bnd-maven-plugin` from 7.1.0 to 7.2.1
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Commits](https://github.com/bndtools/bnd/compare/7.1.0...7.2.1)

Updates `biz.aQute.bnd:bnd-indexer-maven-plugin` from 7.1.0 to 7.2.1
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Commits](https://github.com/bndtools/bnd/compare/7.1.0...7.2.1)

Updates `biz.aQute.bnd:bnd-resolver-maven-plugin` from 7.1.0 to 7.2.1
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Commits](https://github.com/bndtools/bnd/compare/7.1.0...7.2.1)

Updates `biz.aQute.bnd:bnd-export-maven-plugin` from 7.1.0 to 7.2.1
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Commits](https://github.com/bndtools/bnd/compare/7.1.0...7.2.1)

Updates `biz.aQute.bnd:bnd-testing-maven-plugin` from 7.1.0 to 7.2.1
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Commits](https://github.com/bndtools/bnd/compare/7.1.0...7.2.1)

Updates `biz.aQute.bnd:bnd-baseline-maven-plugin` from 7.1.0 to 7.2.1
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Commits](https://github.com/bndtools/bnd/compare/7.1.0...7.2.1)

Updates `biz.aQute.bnd:biz.aQute.bnd.annotation` from 7.1.0 to 7.2.1
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Commits](https://github.com/bndtools/bnd/compare/7.1.0...7.2.1)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd:bnd-maven-plugin
  dependency-version: 7.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: biz.aQute.bnd:bnd-indexer-maven-plugin
  dependency-version: 7.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: biz.aQute.bnd:bnd-resolver-maven-plugin
  dependency-version: 7.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: biz.aQute.bnd:bnd-export-maven-plugin
  dependency-version: 7.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: biz.aQute.bnd:bnd-testing-maven-plugin
  dependency-version: 7.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: biz.aQute.bnd:bnd-baseline-maven-plugin
  dependency-version: 7.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: biz.aQute.bnd:biz.aQute.bnd.annotation
  dependency-version: 7.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix bnd warnings about backslashes in pom.xml

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* Tweak homeassistant itest

* Suppress SSL warning
* Allow to override system property polyglot.engine.userResourceCache
* Create cache within target directory

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* Tweak mapdb itest

* Clear temporary database between tests

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* Handle resolver issue with commons-codec

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* Add Californium3.properties to .gitignore

Moving to target folder did not succeed. Ignoring to avoid broken CI
build.

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

* [mielecloud] Enable itests, disable ThingDiscoveryTest

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
dependabot[bot]
2026-03-01 21:11:37 +01:00
committed by GitHub
co-authored by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Holger Friedrich
parent cbeb159336
commit 9aeb547d5b
12 changed files with 67 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.homeassistant/src/main/java/org/openhab/binding/homeassistant/internal/HomeAssistantPythonBridge.java
+11 -2
View File
@@ -56,8 +56,11 @@ public class HomeAssistantPythonBridge {
VirtualFileSystem vfs = VirtualFileSystem.newBuilder().resourceLoadingClass(HomeAssistantPythonBridge.class)
.build();
File cachePath = Path.of(OpenHAB.getUserDataFolder(), "cache", "org.graalvm.polyglot").toFile();
System.setProperty("polyglot.engine.userResourceCache", cachePath.getAbsolutePath());
// Set cache path if not already configured (e.g., by test environment)
if (System.getProperty("polyglot.engine.userResourceCache") == null) {
File cachePath = Path.of(OpenHAB.getUserDataFolder(), "cache", "org.graalvm.polyglot").toFile();
System.setProperty("polyglot.engine.userResourceCache", cachePath.getAbsolutePath());
}
context = GraalPyResources.contextBuilder(vfs).logHandler(new LogHandler(logger))
.option("engine.WarnInterpreterOnly", "false").build();
@@ -70,6 +73,12 @@ public class HomeAssistantPythonBridge {
import os
import sys
try:
import requests
requests.urllib3.disable_warnings(requests.urllib3.exceptions.InsecureRequestWarning)
except Exception:
pass
if os.sep != '/':
sys.path.append(os.path.join(sys.prefix, "lib", "python%d.%d" % sys.version_info[:2], "site-packages"))
itests/org.openhab.binding.homeassistant.tests/itest.bndrun
+3 -2
View File
@@ -23,7 +23,8 @@ Import-Package: \
-runvm.mqtt: \
-Dio.netty.noUnsafe=true,\
-Dmqttbroker.port=${mqttbroker.port}
-Dmqttbroker.port=${mqttbroker.port},\
-Dpolyglot.engine.userResourceCache=${.}/target/userdata/cache/org.graalvm.polyglot
#
# done
@@ -148,4 +149,4 @@ Import-Package: \
org.graalvm.python.python-language;version='[25.0.1,25.0.2)',\
org.graalvm.python.python-resources;version='[25.0.1,25.0.2)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.apache.commons.commons-codec;version='[1.16.0,1.16.1)'
org.apache.commons.commons-codec;version='[1.17.1,1.17.2)'
itests/org.openhab.binding.homeassistant.tests/pom.xml
+6
View File
@@ -104,6 +104,12 @@
<artifactId>org.graalvm.truffle.truffle-runtime</artifactId>
<version>${graalvm.version}</version>
</dependency>
<!-- added due to inconsistency of resolved versions -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>
<dependency>
<groupId>org.openhab.addons.bundles</groupId>
itests/org.openhab.binding.homie.tests/itest.bndrun
+1 -1
View File
@@ -116,4 +116,4 @@ Import-Package: \
jakarta.inject.jakarta.inject-api;version='[1.0.5,1.0.6)',\
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.apache.commons.commons-codec;version='[1.16.0,1.16.1)'
org.apache.commons.commons-codec;version='[1.17.1,1.17.2)'
itests/org.openhab.binding.homie.tests/pom.xml
+6
View File
@@ -79,6 +79,12 @@
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
</dependency>
<!-- added due to inconsistency of resolved versions -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>
</dependencies>
<build>
itests/org.openhab.binding.mielecloud.tests/src/main/java/org/openhab/binding/mielecloud/internal/discovery/ThingDiscoveryTest.java
+2
View File
@@ -24,6 +24,7 @@ import java.util.stream.Collectors;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.openhab.binding.mielecloud.internal.MieleCloudBindingConstants;
import org.openhab.binding.mielecloud.internal.util.MieleCloudBindingIntegrationTestConstants;
@@ -44,6 +45,7 @@ import org.openhab.core.thing.ThingUID;
/**
* @author Björn Lange - Initial contribution
*/
@Disabled("Disabled as all tests are currently failing. No thing added to Inbox.")
@NonNullByDefault
public class ThingDiscoveryTest extends OpenHabOsgiTest {
private static final String DEVICE_TYPE_NAME_COFFEE_SYSTEM = "Coffee System";
itests/org.openhab.binding.mqtt.ruuvigateway.tests/itest.bndrun
+1 -1
View File
@@ -117,4 +117,4 @@ Import-Package: \
jakarta.inject.jakarta.inject-api;version='[1.0.5,1.0.6)',\
org.openhab.core.semantics;version='[5.2.0,5.2.1)',\
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
org.apache.commons.commons-codec;version='[1.16.0,1.16.1)'
org.apache.commons.commons-codec;version='[1.17.1,1.17.2)'
itests/org.openhab.binding.mqtt.ruuvigateway.tests/pom.xml
+6
View File
@@ -79,6 +79,12 @@
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
</dependency>
<!-- added due to inconsistency of resolved versions -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>
</dependencies>
<build>
itests/org.openhab.binding.tradfri.tests/.gitignore
+2
View File
@@ -0,0 +1,2 @@
# Californium auto-generated properties file
Californium3.properties
itests/org.openhab.persistence.mapdb.tests/src/main/java/org/openhab/persistence/mapdb/MapDbPersistenceServiceOSGiTest.java
+11 -2
View File
@@ -52,13 +52,22 @@ public class MapDbPersistenceServiceOSGiTest extends JavaOSGiTest {
private MapDbPersistenceService persistenceService;
@BeforeEach
public void setUp() {
public void setUp() throws IOException {
// Get service first, then deactivate to close database
persistenceService = getService(QueryablePersistenceService.class, MapDbPersistenceService.class);
// Deactivate to close the current database instance
persistenceService.deactivate();
// Now clean up database files while they're not locked
removeDirRecursive("userdata/persistence/mapdb");
// Reactivate to create a fresh database
persistenceService.activate();
}
@AfterAll
public static void tearDown() throws IOException {
// clean up database files ...
// Final cleanup of database files after all tests
removeDirRecursive("userdata");
removeDirRecursive("runtime");
}
itests/pom.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<module>org.openhab.binding.homie.tests</module>
<module>org.openhab.binding.hue.tests</module>
<module>org.openhab.binding.max.tests</module>
<!-- <module>org.openhab.binding.mielecloud.tests</module> -->
<module>org.openhab.binding.mielecloud.tests</module>
<module>org.openhab.binding.modbus.tests</module>
<module>org.openhab.binding.mqtt.ruuvigateway.tests</module>
<module>org.openhab.binding.ntp.tests</module>
pom.xml
+17 -16
View File
@@ -67,7 +67,8 @@
<maven.compiler.release>${oh.java.version}</maven.compiler.release>
<ohc.version>5.2.0-SNAPSHOT</ohc.version>
<bnd.version>7.1.0</bnd.version>
<bnd.version>7.2.1</bnd.version>
<commons.codec.version>1.17.1</commons.codec.version>
<commons.net.version>3.9.0</commons.net.version>
<eea.version>2.4.0</eea.version>
<jackson.annotations.version>2.21</jackson.annotations.version>
@@ -97,27 +98,27 @@
<oh.bndDefaults><![CDATA[Bundle-SymbolicName: ${project.artifactId}
Automatic-Module-Name: ${def;bsn}
Import-Package: \\
io.swagger.v3.oas.annotations.*;resolution:=optional,\\
javax.annotation.security.*;resolution:=optional,\\
org.eclipse.jdt.annotation.*;resolution:=optional,\\
org.openhab.core.automation.annotation.*;resolution:=optional;version=!,\\
org.openhab.*;version=!,\\
com.google.common.*;version="14.0",\\
${bnd.importpackage},\\
Import-Package: \
io.swagger.v3.oas.annotations.*;resolution:=optional,\
javax.annotation.security.*;resolution:=optional,\
org.eclipse.jdt.annotation.*;resolution:=optional,\
org.openhab.core.automation.annotation.*;resolution:=optional;version=!,\
org.openhab.*;version=!,\
com.google.common.*;version="14.0",\
${bnd.importpackage},\
*
-exportcontents: \\
!*.internal.*,\\
!*.impl.*, \\
org.openhab.*, \\
-exportcontents: \
!*.internal.*,\
!*.impl.*, \
org.openhab.*, \
${bnd.exportpackage}
-noimportjava: true
-sources: false
-contract: *
-includeresource: ${bnd.includeresource}
-fixupmessages: \\
'Unused Import-Package instructions';is:=ignore,\\
'Unused Export-Package instructions';is:=ignore,\\
-fixupmessages: \
'Unused Import-Package instructions';is:=ignore,\
'Unused Export-Package instructions';is:=ignore,\
${bnd.fixupmessages}]]></oh.bndDefaults>
</properties>