From bd47dcfb65175db6acac18d5ab3cab0ba50a656d Mon Sep 17 00:00:00 2001
From: dev-manuel <manuel_krofficial@online.de>
Date: Tue, 26 Jan 2021 10:28:21 +0100
Subject: [PATCH] Upgraded to 3.1.0
---
.gitignore | 1 +
build.properties | 6 ------
pom.xml | 4 ++--
src/main/feature/feature.xml | 14 --------------
src/main/history/dependencies.xml | 6 +++---
src/main/resources/OH-INF/thing/thing-types.xml | 4 ++--
6 files changed, 8 insertions(+), 27 deletions(-)
delete mode 100644 build.properties
diff --git a/.gitignore b/.gitignore
index 2f7896d..0bdd78e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
target/
+*.iml
\ No newline at end of file
diff --git a/build.properties b/build.properties
deleted file mode 100644
index f16d47d..0000000
--- a/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source..=src/main/java/
-output..=target/classes
-bin.includes=META-INF/,\
- .,\
- OSGI-INF/,\
- ESH-INF/
diff --git a/pom.xml b/pom.xml
index ec585db..09f0ed2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<dependency>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.binding.mqtt</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
@@ -16,7 +16,7 @@
<parent>
<groupId>org.openhab.addons.bundles</groupId>
<artifactId>org.openhab.addons.reactor.bundles</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.openhab.binding.openlicht</artifactId>
diff --git a/src/main/feature/feature.xml b/src/main/feature/feature.xml
index e086eca..a008900 100644
--- a/src/main/feature/feature.xml
+++ b/src/main/feature/feature.xml
@@ -1,18 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010-2020 Contributors to the openHAB project
-
- See the NOTICE file(s) distributed with this work for additional
- information.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License 2.0 which is available at
- http://www.eclipse.org/legal/epl-2.0
-
- SPDX-License-Identifier: EPL-2.0
-
--->
<features name="org.openhab.binding.openlicht-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
diff --git a/src/main/history/dependencies.xml b/src/main/history/dependencies.xml
index 2a648aa..87aff69 100644
--- a/src/main/history/dependencies.xml
+++ b/src/main/history/dependencies.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="org.openhab.binding.openlicht-3.0.0-SNAPSHOT">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="org.openhab.binding.openlicht-3.1.0-SNAPSHOT">
<feature version="0.0.0">
<feature>openhab-runtime-base</feature>
<feature>wrap</feature>
- <bundle>mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/3.0.0-SNAPSHOT</bundle>
- <bundle>mvn:org.openhab.addons.bundles/org.openhab.binding.openlicht/3.0.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.openhab.addons.bundles/org.openhab.binding.mqtt/3.1.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.openhab.addons.bundles/org.openhab.binding.openlicht/3.1.0-SNAPSHOT</bundle>
<bundle>wrap:mvn:org.lastnpe.eea/eea-all/2.2.1</bundle>
</feature>
</features>
diff --git a/src/main/resources/OH-INF/thing/thing-types.xml b/src/main/resources/OH-INF/thing/thing-types.xml
index b7dbb83..33bb3fe 100644
--- a/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/src/main/resources/OH-INF/thing/thing-types.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<thing:thing-descriptions bindingId="openlicht"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
- xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0 http://eclipse.org/smarthome/schemas/thing-description-1.0.0.xsd">
+ xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0"
+ xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd">
<!-- Eraser Thing Type -->
<thing-type id="eraser">
--
GitLab