Skip to content

Commit 18523c1

Browse files
authored
Merge pull request #60 from nibi79/oh4
Merge OH4 into master
2 parents 522fcff + b5e4758 commit 18523c1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+77
-206
lines changed

.settings/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

.settings/org.eclipse.m2e.core.prefs

Lines changed: 0 additions & 4 deletions
This file was deleted.

SynologySurveillanceStationWidget.widget.json

Lines changed: 0 additions & 46 deletions
This file was deleted.

about.html

Lines changed: 0 additions & 32 deletions
This file was deleted.

header.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44

55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
88
<groupId>org.openhab.addons.bundles</groupId>
99
<artifactId>org.openhab.addons.reactor.bundles</artifactId>
10-
<version>3.3.0-SNAPSHOT</version>
10+
<version>4.3.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>org.openhab.binding.synologysurveillancestation</artifactId>

src/etc/header.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/etc/xml-header-style.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/main/feature/feature.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
4-
Copyright (c) 2010-2021 Contributors to the openHAB project
5-
6-
See the NOTICE file(s) distributed with this work for additional
7-
information.
8-
9-
This program and the accompanying materials are made available under the
10-
terms of the Eclipse Public License 2.0 which is available at
11-
http://www.eclipse.org/legal/epl-2.0
12-
13-
SPDX-License-Identifier: EPL-2.0
14-
15-
-->
162
<features name="org.openhab.binding.synologysurveillancestation-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
173
<repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository>
184

src/main/history/dependencies.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="org.openhab.binding.synologysurveillancestation-3.3.0-SNAPSHOT">
2+
<features xmlns="http://karaf.apache.org/xmlns/features/v1.6.0" name="org.openhab.binding.synologysurveillancestation-4.3.0-SNAPSHOT">
33
<feature version="0.0.0">
44
<feature>openhab-runtime-base</feature>
55
<feature>wrap</feature>
6-
<bundle>mvn:org.openhab.addons.bundles/org.openhab.binding.synologysurveillancestation/3.3.0-SNAPSHOT</bundle>
7-
<bundle>wrap:mvn:org.lastnpe.eea/eea-all/2.2.1</bundle>
6+
<bundle>mvn:org.openhab.addons.bundles/org.openhab.binding.synologysurveillancestation/4.3.0-SNAPSHOT</bundle>
7+
<bundle>wrap:mvn:org.lastnpe.eea/eea-all/2.4.0</bundle>
88
</feature>
99
</features>

0 commit comments

Comments
 (0)