Update to openHAB 4.0.x API.

Signed-off-by: Łukasz Dywicki <luke@code-house.org>
thingfour · Feb 5, 2024 · 4f4f3b8 · 4f4f3b8
1 parent af5f34e
commit 4f4f3b8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/bundles/org.thing4.core.model.facade/pom.xml b/bundles/org.thing4.core.model.facade/pom.xml
@@ -76,11 +76,7 @@
     </dependency>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core.thing.xml</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core.config.xml</artifactId>
+      <artifactId>org.openhab.core.config.core</artifactId>
     </dependency>
 
     <dependency>
@@ -127,6 +123,14 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.service.component.annotations</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.service.component</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -137,7 +141,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>osgi.cmpn</artifactId>
+      <artifactId>org.osgi.service.cm</artifactId>
     </dependency>
 
     <dependency>

diff --git a/...hing4.core.model.facade/src/main/java/org/thing4/core/model/facade/ThingParserFacade.java b/...hing4.core.model.facade/src/main/java/org/thing4/core/model/facade/ThingParserFacade.java
@@ -144,10 +144,8 @@ public void modelChanged(String modelName, EventType type) {
         logger.info("Model level event {}, model {}", type, modelName);
       }
     });
-    repository.addOrRefreshModel("test.things", new ByteArrayInputStream(contents));
-
-    thingProvider.activate();
 
+    repository.addOrRefreshModel("test.things", new ByteArrayInputStream(contents));
     return new ArrayList<>(thingProvider.getAll());
   }
 

diff --git a/dependencies/units-si/pom.xml b/dependencies/units-si/pom.xml
@@ -41,8 +41,8 @@
       <type>pom</type>
     </dependency>
     <dependency>
-      <groupId>tec.uom</groupId>
-      <artifactId>uom-se</artifactId>
+      <groupId>si.uom</groupId>
+      <artifactId>si-units</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/dependencies/units/pom.xml b/dependencies/units/pom.xml
@@ -40,8 +40,8 @@
       <artifactId>unit-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>tec.uom</groupId>
-      <artifactId>uom-se</artifactId>
+      <groupId>tech.units</groupId>
+      <artifactId>indriya</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -34,26 +34,24 @@
   <description>Parent for Thing4 tools, addons and extensions.</description>
 
   <properties>
-    <compiler.source>11</compiler.source>
-    <compiler.target>11</compiler.target>
+    <compiler.source>17</compiler.source>
+    <compiler.target>17</compiler.target>
 
-    <bom.version>3.0.4</bom.version>
-    <openhab.version>3.0.4</openhab.version>
-    <openhab-distro.version>3.0.4</openhab-distro.version>
+    <bom.version>4.0.4</bom.version>
+    <openhab.version>4.0.4</openhab.version>
+    <openhab-distro.version>4.0.4</openhab-distro.version>
 
     <karaf.version>4.4.4</karaf.version>
 
     <slf4j.version>1.7.36</slf4j.version>
     <fasterxml-classmate.version>1.5.1</fasterxml-classmate.version>
-    <osgi.version>6.0.0</osgi.version>
 
     <assertj.version>3.23.1</assertj.version>
     <junit-jupiter.version>5.9.1</junit-jupiter.version>
     <mockito.version>4.9.0</mockito.version>
 
     <!-- various build related variables -->
     <feature.file>${project.basedir}/target/feature/feature.xml</feature.file>
-    <osgi.version>6.0.0</osgi.version>
 
     <connectorio-testcontainers.version>0.1.0</connectorio-testcontainers.version>
     <testcontainers.version>1.17.6</testcontainers.version>

diff --git a/tools/thing4-maven-plugin/pom.xml b/tools/thing4-maven-plugin/pom.xml
@@ -43,11 +43,11 @@
 
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core.config.xml</artifactId>
+      <artifactId>org.openhab.core.thing</artifactId>
     </dependency>
     <dependency>
       <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core.thing.xml</artifactId>
+      <artifactId>org.openhab.core.config.core</artifactId>
     </dependency>
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>

diff --git a/...hing4-maven-plugin/src/main/java/org/thing4/tools/maven/plexus/ConfigDescriptorCache.java b/...hing4-maven-plugin/src/main/java/org/thing4/tools/maven/plexus/ConfigDescriptorCache.java
@@ -27,7 +27,7 @@
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.component.annotations.Component;
 import org.openhab.core.config.core.ConfigDescription;
-import org.openhab.core.config.xml.internal.ConfigDescriptionReader;
+import org.openhab.core.config.core.xml.internal.ConfigDescriptionReader;
 import org.thing4.tools.maven.Cache;
 
 @Component(role = Cache.class, hint = ConfigDescriptorCache.HINT)