Skip to content

Commit 12c17c3

Browse files
holgerfriedrichholgerfriedrich
authored
Prepare for OH 5.3.0 (#1936)
* Fix spotless after unleash * Resolve app runbundles * Update app version * Update dependabot config * Adapt batch files Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 153ae0f commit 12c17c3

16 files changed

Lines changed: 132 additions & 112 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.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"
166+
- dependency-name: "org.openhab.addons.features.karaf:openhab-binding-zigbee:xml:features:5.2.0-SNAPSHOT:compile"
167+
- dependency-name: "org.openhab.addons.features.karaf:openhab-binding-zigbee:xml:features:5.2.0-SNAPSHOT:provided"
168+
- dependency-name: "org.openhab.addons.features.karaf:openhab-binding-zigbee:xml:features:5.2.0-SNAPSHOT:runtime"
169+
- dependency-name: "org.openhab.addons.features.karaf:org.openhab.addons.features.karaf.openhab-addons:xml:features:5.2.0-SNAPSHOT:compile"
170+
- dependency-name: "org.openhab.addons.features.karaf:org.openhab.addons.features.karaf.openhab-addons:xml:features:5.2.0-SNAPSHOT:provided"
171+
- dependency-name: "org.openhab.addons.features.karaf:org.openhab.addons.features.karaf.openhab-addons:xml:features:5.2.0-SNAPSHOT:runtime"
172+
- dependency-name: "org.openhab.distro:addons:feature:5.2.0-SNAPSHOT"
173+
- dependency-name: "org.openhab.distro:addons:xml:features:5.2.0-SNAPSHOT:compile"
174+
- dependency-name: "org.openhab.distro:addons:xml:features:5.2.0-SNAPSHOT:provided"
175+
- dependency-name: "org.openhab.distro:addons:xml:features:5.2.0-SNAPSHOT:runtime"
176+
- dependency-name: "org.openhab.distro:distro-kar:kar:5.2.0-SNAPSHOT"
177+
- dependency-name: "org.openhab.distro:distro-kar:kar:5.2.0-SNAPSHOT:provided"
178+
- dependency-name: "org.openhab.distro:distro:feature:5.2.0-SNAPSHOT"
179+
- dependency-name: "org.openhab.distro:distro:xml:features:5.2.0-SNAPSHOT:compile"
180+
- dependency-name: "org.openhab.distro:distro:xml:features:5.2.0-SNAPSHOT:provided"
181+
- dependency-name: "org.openhab.distro:distro:xml:features:5.2.0-SNAPSHOT:runtime"
182+
- dependency-name: "org.openhab.distro:openhab-addons:kar:5.2.0-SNAPSHOT"
183+
- dependency-name: "org.openhab.distro:openhab-addons:kar:5.2.0-SNAPSHOT:provided"
184+
- dependency-name: "org.openhab.distro:openhab-addons:xml:features:5.2.0-SNAPSHOT:runtime"
185+
- dependency-name: "org.openhab.distro:openhab-demo:pom:5.2.0-SNAPSHOT"
186+
- dependency-name: "org.openhab.distro:openhab-verify:pom:5.2.0-SNAPSHOT"
187+
- dependency-name: "org.openhab.distro:openhab:karaf-assembly:5.2.0-SNAPSHOT"
188+
- dependency-name: "org.openhab.distro:pom-distributions:pom:5.2.0-SNAPSHOT"
189+
- dependency-name: "org.openhab.distro:pom-features:pom:5.2.0-SNAPSHOT"
190+
- dependency-name: "org.openhab.distro:pom:pom:5.2.0-SNAPSHOT"
191+
- dependency-name: "org.openhab.ui.features:org.openhab.ui.features:xml:features:5.2.0-SNAPSHOT:compile"
192+
- dependency-name: "org.openhab.ui.features:org.openhab.ui.features:xml:features:5.2.0-SNAPSHOT:provided"
193+
- dependency-name: "org.openhab.ui.features:org.openhab.ui.features:xml:features:5.2.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.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"
13+
echo " ./runtime/bin/update 5.2.0 << Updates to a specific version"
14+
echo " ./update 5.2.0 /opt/openHAB << Updates a specific root folder"
15+
echo " ./runtime/bin/update 5.3.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/openhab/src/main/resources/bin/update.bat‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ EXIT /B 0
2020

2121
:printArgs
2222
ECHO Usage: update.bat {OHVersion}
23-
ECHO OHVersion (required) - The version you want to update (4.0, 4.1, etc)
23+
ECHO OHVersion (required) - The version you want to update (5.1, 5.2, etc)
2424
ECHO.
25-
ECHO Example to update to openHAB version 4.0.0 stable:
26-
ECHO update.bat 4.0.0
25+
ECHO Example to update to openHAB version 5.2.0 stable:
26+
ECHO update.bat 5.2.0
2727
ECHO.
28-
ECHO Example to update to openHAB version 4.0.0 snapshot:
29-
ECHO update.bat 4.0.0-SNAPSHOT
28+
ECHO Example to update to openHAB version 5.3.0 snapshot:
29+
ECHO update.bat 5.3.0-SNAPSHOT
3030
ECHO.
31-
ECHO Example to update to openHAB version 4.0.0 milestone 1:
32-
ECHO update.bat 4.0.0-M1
31+
ECHO Example to update to openHAB version 5.2.0 milestone 1:
32+
ECHO update.bat 5.2.0-M1
3333
ECHO.
3434
EXIT /B -1

‎distributions/openhab/src/main/resources/bin/update.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ Set-StrictMode -Version Latest
1212
The version to upgrade to.
1313
.PARAMETER Snapshot
1414
DEPRECATED - Upgrade to a snapshot version ($true) or a release version ($false) (default: $false)
15-
DEPRECATED - Please specify "-snapshot" in the OHVersion instead (ex: "3.0.0-SNAPSHOT")
15+
DEPRECATED - Please specify "-snapshot" in the OHVersion instead (ex: "5.3.0-SNAPSHOT")
1616
.PARAMETER AutoConfirm
1717
Automatically confirm update (used for headless mode)
1818
.EXAMPLE
1919
Update the openHAB distribution in the current directory to the current stable version
2020
Update-openHAB
2121
.EXAMPLE
2222
Update the openHAB distribution in the C:\oh-snapshot directory to the next snapshot version
23-
Update-openHAB -OHDirectory C:\oh-snapshot -OHVersion 3.0.0-SNAPSHOT
23+
Update-openHAB -OHDirectory C:\oh-snapshot -OHVersion 5.3.0-SNAPSHOT
2424
#>
2525

2626
###########################################################################
@@ -408,8 +408,8 @@ Function Update-openHAB() {
408408

409409
# If the OHVersion parameter was not specified,
410410
# If the current version is snapshot - make OHVersion the same snapshot
411-
# If the current version is stable - make OHVersion the next minor upgrade (current version 3.0.0 would make our OHversion 3.1.0)
412-
# If the current version is milestone - make OHVersion the stable version (3.1.0.M6 becomes 3.1.0)
411+
# If the current version is stable - make OHVersion the next minor upgrade (current version 5.1.0 would make our OHversion 5.2.0)
412+
# If the current version is milestone - make OHVersion the stable version (5.2.0.M6 becomes 5.2.0)
413413
if (-Not $OHVersion) {
414414
if ($parts.Length -eq 3) {
415415
if ($parts[2].EndsWith("-SNAPSHOT", "CurrentCultureIgnoreCase")) {

‎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

0 commit comments

Comments
 (0)