diff --git a/bom/openhab-addons/pom.xml b/bom/openhab-addons/pom.xml index 8e2a9ade62de9..0abb42b065f17 100644 --- a/bom/openhab-addons/pom.xml +++ b/bom/openhab-addons/pom.xml @@ -396,6 +396,11 @@ org.openhab.binding.elerotransmitterstick ${project.version} + + org.openhab.addons.bundles + org.openhab.binding.elroconnects + ${project.version} + org.openhab.addons.bundles org.openhab.binding.energenie diff --git a/bundles/org.openhab.binding.elroconnects/pom.xml b/bundles/org.openhab.binding.elroconnects/pom.xml index 4413e86385d3d..fb12eb46dc333 100644 --- a/bundles/org.openhab.binding.elroconnects/pom.xml +++ b/bundles/org.openhab.binding.elroconnects/pom.xml @@ -1,13 +1,13 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.openhab.addons.bundles org.openhab.addons.reactor.bundles - 3.2.0-SNAPSHOT + 3.3.0-SNAPSHOT org.openhab.binding.elroconnects diff --git a/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/binding/binding.xml b/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/binding/binding.xml index 65555f75dd63c..474aac1f533d8 100644 --- a/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/binding/binding.xml +++ b/bundles/org.openhab.binding.elroconnects/src/main/resources/OH-INF/binding/binding.xml @@ -5,5 +5,4 @@ ELRO Connects Binding This is the binding for the ELRO Connects smart home system. - diff --git a/bundles/pom.xml b/bundles/pom.xml index 1ffcbc5aa29ee..7ec6484dd1acc 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -1,29 +1,7 @@ -<<<<<<< Upstream, based on origin/main -<<<<<<< Upstream, based on origin/main -======= - - ->>>>>>> d402e66 Elro Connects inital commit. - 4.0.0 - - - - org.openhab.addons - - org.openhab.addons.reactor -<<<<<<< Upstream, based on upstream/main - 3.3.0-SNAPSHOT -======= - 3.2.0-SNAPSHOT -======= - ->>>>>>> 43ac694 Fix pom.xml - 4.0.0