Update development cycle

Signed-off-by: Mark Herwege <[email protected]>
mherwege · Dec 23, 2021 · 02b72de · 02b72de
1 parent 0f15af8
commit 02b72de
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 25 deletions.
diff --git a/bom/openhab-addons/pom.xml b/bom/openhab-addons/pom.xml
@@ -396,6 +396,11 @@
       <artifactId>org.openhab.binding.elerotransmitterstick</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.elroconnects</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.energenie</artifactId>

diff --git a/bundles/org.openhab.binding.elroconnects/pom.xml b/bundles/org.openhab.binding.elroconnects/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.openhab.addons.bundles</groupId>
     <artifactId>org.openhab.addons.reactor.bundles</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <version>3.3.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.binding.elroconnects</artifactId>

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
@@ -5,5 +5,4 @@
 
 	<name>ELRO Connects Binding</name>
 	<description>This is the binding for the ELRO Connects smart home system.</description>
-
 </binding:binding>
diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -1,29 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<<<<<<< Upstream, based on origin/main
-<<<<<<< Upstream, based on origin/main
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-=======
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
->>>>>>> d402e66 Elro Connects inital commit.
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-
-    <groupId>org.openhab.addons</groupId>
-
-    <artifactId>org.openhab.addons.reactor</artifactId>
-<<<<<<< Upstream, based on upstream/main
-    <version>3.3.0-SNAPSHOT</version>
-=======
-    <version>3.2.0-SNAPSHOT</version>
-=======
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
->>>>>>> 43ac694 Fix pom.xml
-
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,5 +5,4 @@

		<name>ELRO Connects Binding</name>
		<description>This is the binding for the ELRO Connects smart home system.</description>

		</binding:binding>