Upgrade SAT to 0.14 (#14981)

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

diff --git a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java
index c2389e840b6e7b5bff4dfe0f1ddc5a0196ac00b9..bb0ed17f64886b22a279e0642c1c519b717dbed8 100644 (file)
--- a/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java
+++ b/bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/accessories/HomekitCharacteristicFactory.java
@@ -392,8 +392,8 @@ public class HomekitCharacteristicFactory {
     // supporting methods
 
     public static boolean useFahrenheit() {
-        return FrameworkUtil.getBundle(HomekitImpl.class).getBundleContext()
-                .getServiceReference(Homekit.class.getName()).getProperty("useFahrenheitTemperature") == Boolean.TRUE;
+        return Boolean.TRUE.equals(FrameworkUtil.getBundle(HomekitImpl.class).getBundleContext()
+                .getServiceReference(Homekit.class.getName()).getProperty("useFahrenheitTemperature"));
     }
 
     private static <T extends CharacteristicEnum> CompletableFuture<T> getEnumFromItem(HomekitTaggedItem item,

diff --git a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/addon/addon.xml
index 9b7376e35a4f9e3e0ced61be5283c8f18e7266fa..50c5ea886d9db0db2bc00767ed66e642fc2cbd50 100644 (file)
--- a/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.homekit/src/main/resources/OH-INF/addon/addon.xml
@@ -9,6 +9,6 @@
 
        <service-id>org.openhab.homekit</service-id>
 
-       <config-description-ref uri="io.homekit"/>
+       <config-description-ref uri="io:homekit"/>
 
 </addon:addon>

diff --git a/bundles/org.openhab.io.hueemulation/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.hueemulation/src/main/resources/OH-INF/addon/addon.xml
index c54159ca92559b6d0e46a4ce5b744c72e8af6f3f..eb6c469113a9de140698a8ab52d7cd17fd8f5a00 100644 (file)
--- a/bundles/org.openhab.io.hueemulation/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.hueemulation/src/main/resources/OH-INF/addon/addon.xml
@@ -9,5 +9,5 @@
 
        <service-id>org.openhab.hueemulation</service-id>
 
-       <config-description-ref uri="io.hueemulation"/>
+       <config-description-ref uri="io:hueemulation"/>
 </addon:addon>

diff --git a/bundles/org.openhab.io.imperihome/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.imperihome/src/main/resources/OH-INF/addon/addon.xml
index 7dbcc751ee8ab18fa1b24243344f038ca3872490..9ee2f4c2bd37f079edacefe2baa0fad4db76cd6e 100644 (file)
--- a/bundles/org.openhab.io.imperihome/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.imperihome/src/main/resources/OH-INF/addon/addon.xml
@@ -9,6 +9,6 @@
 
        <service-id>org.openhab.imperihome</service-id>
 
-       <config-description-ref uri="io.imperihome"/>
+       <config-description-ref uri="io:imperihome"/>
 
 </addon:addon>

diff --git a/bundles/org.openhab.io.metrics/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.metrics/src/main/resources/OH-INF/addon/addon.xml
index 5f32eb3e8ad59fe12927460bdae45b5f39718ace..22d579a05de2a120151dc412ce25f9a8eb82b419 100644 (file)
--- a/bundles/org.openhab.io.metrics/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.metrics/src/main/resources/OH-INF/addon/addon.xml
@@ -9,6 +9,6 @@
 
        <service-id>org.openhab.metrics</service-id>
 
-       <config-description-ref uri="io.metrics"/>
+       <config-description-ref uri="io:metrics"/>
 
 </addon:addon>

diff --git a/bundles/org.openhab.io.neeo/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.neeo/src/main/resources/OH-INF/addon/addon.xml
index a37a9d7185becae86109d37ac3cf7affeec4fc1b..693b8ade8813c46af802943be4702ffaf52732af 100644 (file)
--- a/bundles/org.openhab.io.neeo/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.neeo/src/main/resources/OH-INF/addon/addon.xml
@@ -9,6 +9,6 @@
 
        <service-id>org.openhab.io.neeo.NeeoService</service-id>
 
-       <config-description-ref uri="io.neeo"/>
+       <config-description-ref uri="io:neeo"/>
 
 </addon:addon>

diff --git a/bundles/org.openhab.io.openhabcloud/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.io.openhabcloud/src/main/resources/OH-INF/addon/addon.xml
index 75720a0d87016ff62db3a8b782ee76f5c1aecbd8..35fe445aa495c9ebf4c59608486ef38b37112261 100644 (file)
--- a/bundles/org.openhab.io.openhabcloud/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.io.openhabcloud/src/main/resources/OH-INF/addon/addon.xml
@@ -9,6 +9,6 @@
 
        <service-id>org.openhab.openhabcloud</service-id>
 
-       <config-description-ref uri="io.openhabcloud"/>
+       <config-description-ref uri="io:openhabcloud"/>
 
 </addon:addon>

diff --git a/pom.xml b/pom.xml
index 86e0cecf4c9cdb9d5c8319a55214c60355f16e7b..d75fe1bbecd87ab95ea55fb6b56072298009b1cc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
     <karaf.version>4.4.3</karaf.version>
     <netty.version>4.1.72.Final</netty.version>
     <okhttp.version>3.14.9</okhttp.version>
-    <sat.version>0.13.0</sat.version>
+    <sat.version>0.14.0</sat.version>
     <spotless.version>2.35.0</spotless.version>
     <spotless.eclipse.version>4.26</spotless.eclipse.version>
     <spotless.eclipse.wtp.version>4.21.0</spotless.eclipse.wtp.version>