Skip to content

Commit eb14b09

Browse files
Prepare for OH 5.2.0 (#1852)
* Fix spotless after unleash * Resolve app runbundles * Update app version * Adapt dependabot config Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent ab8f6bc commit eb14b09

14 files changed

Lines changed: 119 additions & 99 deletions

File tree

.github/dependabot.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -163,34 +163,34 @@ updates:
163163
- dependency-name: "org.openhab.addons.bundles:org.openhab.binding.zigbee.slzb06"
164164
- dependency-name: "org.openhab.addons.bundles:org.openhab.binding.zigbee.telegesis"
165165
- dependency-name: "org.openhab.addons.bundles:org.openhab.binding.zigbee.xbee"
166-
- dependency-name: "org.openhab.addons.features.karaf:openhab-binding-zigbee:xml:features:5.0.0-SNAPSHOT:compile"
167-
- dependency-name: "org.openhab.addons.features.karaf:openhab-binding-zigbee:xml:features:5.0.0-SNAPSHOT:provided"
168-
- dependency-name: "org.openhab.addons.features.karaf:openhab-binding-zigbee:xml:features:5.0.0-SNAPSHOT:runtime"
169-
- dependency-name: "org.openhab.addons.features.karaf:org.openhab.addons.features.karaf.openhab-addons:xml:features:5.0.0-SNAPSHOT:compile"
170-
- dependency-name: "org.openhab.addons.features.karaf:org.openhab.addons.features.karaf.openhab-addons:xml:features:5.0.0-SNAPSHOT:provided"
171-
- dependency-name: "org.openhab.addons.features.karaf:org.openhab.addons.features.karaf.openhab-addons:xml:features:5.0.0-SNAPSHOT:runtime"
172-
- dependency-name: "org.openhab.distro:addons:feature:5.0.0-SNAPSHOT"
173-
- dependency-name: "org.openhab.distro:addons:xml:features:5.0.0-SNAPSHOT:compile"
174-
- dependency-name: "org.openhab.distro:addons:xml:features:5.0.0-SNAPSHOT:provided"
175-
- dependency-name: "org.openhab.distro:addons:xml:features:5.0.0-SNAPSHOT:runtime"
176-
- dependency-name: "org.openhab.distro:distro-kar:kar:5.0.0-SNAPSHOT"
177-
- dependency-name: "org.openhab.distro:distro-kar:kar:5.0.0-SNAPSHOT:provided"
178-
- dependency-name: "org.openhab.distro:distro:feature:5.0.0-SNAPSHOT"
179-
- dependency-name: "org.openhab.distro:distro:xml:features:5.0.0-SNAPSHOT:compile"
180-
- dependency-name: "org.openhab.distro:distro:xml:features:5.0.0-SNAPSHOT:provided"
181-
- dependency-name: "org.openhab.distro:distro:xml:features:5.0.0-SNAPSHOT:runtime"
182-
- dependency-name: "org.openhab.distro:openhab-addons:kar:5.0.0-SNAPSHOT"
183-
- dependency-name: "org.openhab.distro:openhab-addons:kar:5.0.0-SNAPSHOT:provided"
184-
- dependency-name: "org.openhab.distro:openhab-addons:xml:features:5.0.0-SNAPSHOT:runtime"
185-
- dependency-name: "org.openhab.distro:openhab-demo:pom:5.0.0-SNAPSHOT"
186-
- dependency-name: "org.openhab.distro:openhab-verify:pom:5.0.0-SNAPSHOT"
187-
- dependency-name: "org.openhab.distro:openhab:karaf-assembly:5.0.0-SNAPSHOT"
188-
- dependency-name: "org.openhab.distro:pom-distributions:pom:5.0.0-SNAPSHOT"
189-
- dependency-name: "org.openhab.distro:pom-features:pom:5.0.0-SNAPSHOT"
190-
- dependency-name: "org.openhab.distro:pom:pom:5.0.0-SNAPSHOT"
191-
- dependency-name: "org.openhab.ui.features:org.openhab.ui.features:xml:features:5.0.0-SNAPSHOT:compile"
192-
- dependency-name: "org.openhab.ui.features:org.openhab.ui.features:xml:features:5.0.0-SNAPSHOT:provided"
193-
- dependency-name: "org.openhab.ui.features:org.openhab.ui.features:xml:features:5.0.0-SNAPSHOT:runtime"
166+
- dependency-name: "org.openhab.addons.features.karaf:openhab-binding-zigbee:xml:features:5.1.0-SNAPSHOT:compile"
167+
- dependency-name: "org.openhab.addons.features.karaf:openhab-binding-zigbee:xml:features:5.1.0-SNAPSHOT:provided"
168+
- dependency-name: "org.openhab.addons.features.karaf:openhab-binding-zigbee:xml:features:5.1.0-SNAPSHOT:runtime"
169+
- dependency-name: "org.openhab.addons.features.karaf:org.openhab.addons.features.karaf.openhab-addons:xml:features:5.1.0-SNAPSHOT:compile"
170+
- dependency-name: "org.openhab.addons.features.karaf:org.openhab.addons.features.karaf.openhab-addons:xml:features:5.1.0-SNAPSHOT:provided"
171+
- dependency-name: "org.openhab.addons.features.karaf:org.openhab.addons.features.karaf.openhab-addons:xml:features:5.1.0-SNAPSHOT:runtime"
172+
- dependency-name: "org.openhab.distro:addons:feature:5.1.0-SNAPSHOT"
173+
- dependency-name: "org.openhab.distro:addons:xml:features:5.1.0-SNAPSHOT:compile"
174+
- dependency-name: "org.openhab.distro:addons:xml:features:5.1.0-SNAPSHOT:provided"
175+
- dependency-name: "org.openhab.distro:addons:xml:features:5.1.0-SNAPSHOT:runtime"
176+
- dependency-name: "org.openhab.distro:distro-kar:kar:5.1.0-SNAPSHOT"
177+
- dependency-name: "org.openhab.distro:distro-kar:kar:5.1.0-SNAPSHOT:provided"
178+
- dependency-name: "org.openhab.distro:distro:feature:5.1.0-SNAPSHOT"
179+
- dependency-name: "org.openhab.distro:distro:xml:features:5.1.0-SNAPSHOT:compile"
180+
- dependency-name: "org.openhab.distro:distro:xml:features:5.1.0-SNAPSHOT:provided"
181+
- dependency-name: "org.openhab.distro:distro:xml:features:5.1.0-SNAPSHOT:runtime"
182+
- dependency-name: "org.openhab.distro:openhab-addons:kar:5.1.0-SNAPSHOT"
183+
- dependency-name: "org.openhab.distro:openhab-addons:kar:5.1.0-SNAPSHOT:provided"
184+
- dependency-name: "org.openhab.distro:openhab-addons:xml:features:5.1.0-SNAPSHOT:runtime"
185+
- dependency-name: "org.openhab.distro:openhab-demo:pom:5.1.0-SNAPSHOT"
186+
- dependency-name: "org.openhab.distro:openhab-verify:pom:5.1.0-SNAPSHOT"
187+
- dependency-name: "org.openhab.distro:openhab:karaf-assembly:5.1.0-SNAPSHOT"
188+
- dependency-name: "org.openhab.distro:pom-distributions:pom:5.1.0-SNAPSHOT"
189+
- dependency-name: "org.openhab.distro:pom-features:pom:5.1.0-SNAPSHOT"
190+
- dependency-name: "org.openhab.distro:pom:pom:5.1.0-SNAPSHOT"
191+
- dependency-name: "org.openhab.ui.features:org.openhab.ui.features:xml:features:5.1.0-SNAPSHOT:compile"
192+
- dependency-name: "org.openhab.ui.features:org.openhab.ui.features:xml:features:5.1.0-SNAPSHOT:provided"
193+
- dependency-name: "org.openhab.ui.features:org.openhab.ui.features:xml:features:5.1.0-SNAPSHOT:runtime"
194194
- dependency-name: "org.opentest4j:opentest4j"
195195
- dependency-name: "org.ops4j.base:ops4j-base-lang"
196196
- dependency-name: "org.ops4j.base:ops4j-base-util-collections"

distributions/openhab-addons/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
24

35
<modelVersion>4.0.0</modelVersion>
46

distributions/openhab-demo/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
24
<modelVersion>4.0.0</modelVersion>
35

46
<parent>

distributions/openhab-verify/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
24

35
<modelVersion>4.0.0</modelVersion>
46

distributions/openhab/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
24
<modelVersion>4.0.0</modelVersion>
35

46
<parent>

distributions/openhab/src/main/resources/bin/update

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ setup(){
1010
echo "Usage: ./runtime/bin/update [VersionNumber] [openHAB Dir]"
1111
echo ""
1212
echo " e.g. ./runtime/bin/update << Updates to the next version"
13-
echo " ./runtime/bin/update 5.0.0 << Updates to a specific version"
14-
echo " ./update 5.0.0 /opt/openHAB << Updates a specific root folder"
15-
echo " ./runtime/bin/update 5.1.0-SNAPSHOT << Updates to latest SNAPSHOT"
13+
echo " ./runtime/bin/update 5.1.0 << Updates to a specific version"
14+
echo " ./update 5.1.0 /opt/openHAB << Updates a specific root folder"
15+
echo " ./runtime/bin/update 5.2.0-SNAPSHOT << Updates to latest SNAPSHOT"
1616
echo ""
1717
echo "Use this script to change openHAB to another version. Specifying the version allows"
1818
echo "you to upgrade or downgrade to that version, or to the latest snapshot. Not specifying"

distributions/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
24
<modelVersion>4.0.0</modelVersion>
35

46
<parent>

features/addons/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
24

35
<modelVersion>4.0.0</modelVersion>
46

features/distro-kar/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
24

35
<modelVersion>4.0.0</modelVersion>
46

features/distro/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
24

35
<modelVersion>4.0.0</modelVersion>
46

0 commit comments

Comments
 (0)