some more fixes after rebase

Signed-off-by: Kai Kreuzer <kai@openhab.org>
openhab · Dec 8, 2020 · 950bd59 · 950bd59
1 parent 9aa2425
commit 950bd59
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 36 deletions.
diff --git a/bundles/org.openhab.binding.modbus.e3dc/pom.xml b/bundles/org.openhab.binding.modbus.e3dc/pom.xml
@@ -21,11 +21,5 @@
  <version>${project.version}</version>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>org.openhab.core.bundles</groupId>
- <artifactId>org.openhab.core.io.transport.modbus</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
  </dependencies>
 </project>
diff --git a/bundles/org.openhab.binding.modbus.helioseasycontrols/pom.xml b/bundles/org.openhab.binding.modbus.helioseasycontrols/pom.xml
@@ -21,12 +21,6 @@
  <version>${project.version}</version>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>org.openhab.core.bundles</groupId>
- <artifactId>org.openhab.core.io.transport.modbus</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
  </dependencies>
 
 </project>
diff --git a/bundles/org.openhab.binding.modbus.stiebeleltron/pom.xml b/bundles/org.openhab.binding.modbus.stiebeleltron/pom.xml
@@ -21,12 +21,6 @@
  <version>${project.version}</version>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>org.openhab.core.bundles</groupId>
- <artifactId>org.openhab.core.io.transport.modbus</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
  </dependencies>
 
 </project>
diff --git a/...ain/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/AbstractBaseParser.java b/...ain/java/org/openhab/binding/modbus/stiebeleltron/internal/parser/AbstractBaseParser.java
@@ -16,8 +16,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.io.transport.modbus.ModbusBitUtilities;
-import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
 import org.openhab.core.io.transport.modbus.ModbusConstants.ValueType;
+import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
 import org.openhab.core.library.types.DecimalType;
 
 /**

diff --git a/bundles/org.openhab.binding.modbus.studer/pom.xml b/bundles/org.openhab.binding.modbus.studer/pom.xml
@@ -20,11 +20,5 @@
  <version>${project.version}</version>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>org.openhab.core.bundles</groupId>
- <artifactId>org.openhab.core.io.transport.modbus</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
  </dependencies>
 </project>
diff --git a/...modbus.studer/src/main/java/org/openhab/binding/modbus/studer/internal/StuderHandler.java b/...modbus.studer/src/main/java/org/openhab/binding/modbus/studer/internal/StuderHandler.java
@@ -30,11 +30,11 @@
 import org.openhab.core.io.transport.modbus.AsyncModbusFailure;
 import org.openhab.core.io.transport.modbus.ModbusBitUtilities;
 import org.openhab.core.io.transport.modbus.ModbusCommunicationInterface;
+import org.openhab.core.io.transport.modbus.ModbusConstants.ValueType;
 import org.openhab.core.io.transport.modbus.ModbusReadFunctionCode;
 import org.openhab.core.io.transport.modbus.ModbusReadRequestBlueprint;
 import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
 import org.openhab.core.io.transport.modbus.PollTask;
-import org.openhab.core.io.transport.modbus.ModbusConstants.ValueType;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.OnOffType;
 import org.openhab.core.library.types.QuantityType;

diff --git a/bundles/org.openhab.binding.modbus.sunspec/pom.xml b/bundles/org.openhab.binding.modbus.sunspec/pom.xml
@@ -21,12 +21,6 @@
  <version>${project.version}</version>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>org.openhab.core.bundles</groupId>
- <artifactId>org.openhab.core.io.transport.modbus</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
  </dependencies>
 
 </project>
diff --git a/...n/java/org/openhab/binding/modbus/sunspec/internal/discovery/SunspecDiscoveryProcess.java b/...n/java/org/openhab/binding/modbus/sunspec/internal/discovery/SunspecDiscoveryProcess.java
@@ -33,10 +33,10 @@
 import org.openhab.core.io.transport.modbus.AsyncModbusFailure;
 import org.openhab.core.io.transport.modbus.ModbusBitUtilities;
 import org.openhab.core.io.transport.modbus.ModbusCommunicationInterface;
+import org.openhab.core.io.transport.modbus.ModbusConstants.ValueType;
 import org.openhab.core.io.transport.modbus.ModbusReadFunctionCode;
 import org.openhab.core.io.transport.modbus.ModbusReadRequestBlueprint;
 import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
-import org.openhab.core.io.transport.modbus.ModbusConstants.ValueType;
 import org.openhab.core.io.transport.modbus.exception.ModbusSlaveErrorResponseException;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.thing.ThingTypeUID;

diff --git a/.../src/main/java/org/openhab/binding/modbus/sunspec/internal/parser/AbstractBaseParser.java b/.../src/main/java/org/openhab/binding/modbus/sunspec/internal/parser/AbstractBaseParser.java
@@ -16,8 +16,8 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.openhab.core.io.transport.modbus.ModbusBitUtilities;
-import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
 import org.openhab.core.io.transport.modbus.ModbusConstants.ValueType;
+import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
 import org.openhab.core.library.types.DecimalType;
 
 /**

diff --git a/bundles/org.openhab.binding.modbus/src/main/feature/feature.xml b/bundles/org.openhab.binding.modbus/src/main/feature/feature.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features name="org.openhab.binding.modbus-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
- <repository>file:${basedirRoot}/bundles/org.openhab.io.transport.modbus/target/feature/feature.xml</repository>
 
  <feature name="openhab-binding-modbus" description="Modbus Binding" version="${project.version}">
  <feature>openhab-runtime-base</feature>

diff --git a/...bus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java b/...bus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java
@@ -38,13 +38,13 @@
 import org.openhab.core.io.transport.modbus.ModbusBitUtilities;
 import org.openhab.core.io.transport.modbus.ModbusCommunicationInterface;
 import org.openhab.core.io.transport.modbus.ModbusConstants;
+import org.openhab.core.io.transport.modbus.ModbusConstants.ValueType;
 import org.openhab.core.io.transport.modbus.ModbusReadFunctionCode;
 import org.openhab.core.io.transport.modbus.ModbusReadRequestBlueprint;
 import org.openhab.core.io.transport.modbus.ModbusRegisterArray;
 import org.openhab.core.io.transport.modbus.ModbusWriteCoilRequestBlueprint;
 import org.openhab.core.io.transport.modbus.ModbusWriteRegisterRequestBlueprint;
 import org.openhab.core.io.transport.modbus.ModbusWriteRequestBlueprint;
-import org.openhab.core.io.transport.modbus.ModbusConstants.ValueType;
 import org.openhab.core.io.transport.modbus.exception.ModbusConnectionException;
 import org.openhab.core.io.transport.modbus.exception.ModbusTransportException;
 import org.openhab.core.io.transport.modbus.json.WriteRequestJsonUtilities;