diff --git a/.github/workflows/ci-build-32.yml b/.github/workflows/ci-build-32.yml index 5f80b5faad..88526e58d1 100644 --- a/.github/workflows/ci-build-32.yml +++ b/.github/workflows/ci-build-32.yml @@ -19,23 +19,23 @@ jobs: fail-fast: false matrix: java: [ '11', '17' ] - maven: [ '3.8.4'] - os: [ 'ubuntu-20.04' ] + maven: [ '3.8.6'] + os: [ 'ubuntu-22.04' ] name: Build (Java ${{ matrix.java }}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} steps: - name: Checkout if: github.head_ref == '' - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Checkout merge if: github.head_ref != '' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: refs/pull/${{github.event.pull_request.number}}/merge - name: Set up Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.m2/repository @@ -46,13 +46,13 @@ jobs: ${{ runner.os }}-maven- - name: Set up Java ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'zulu' + distribution: 'temurin' java-version: ${{ matrix.java }} - name: Set up Maven ${{ matrix.maven }} - uses: stCarolas/setup-maven@v4.2 + uses: stCarolas/setup-maven@v4.5 with: maven-version: ${{ matrix.maven }} diff --git a/.github/workflows/ci-build-40.yml b/.github/workflows/ci-build-40.yml index 251c2a4b38..2c60c0cbcf 100644 --- a/.github/workflows/ci-build-40.yml +++ b/.github/workflows/ci-build-40.yml @@ -19,23 +19,23 @@ jobs: fail-fast: false matrix: java: [ '17' ] - maven: [ '3.8.4'] - os: [ 'ubuntu-20.04' ] + maven: [ '3.8.6'] + os: [ 'ubuntu-22.04' ] name: Build (Java ${{ matrix.java }}, ${{ matrix.os }}) runs-on: ${{ matrix.os }} steps: - name: Checkout if: github.head_ref == '' - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Checkout merge if: github.head_ref != '' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: refs/pull/${{github.event.pull_request.number}}/merge - name: Set up Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/.m2/repository @@ -46,13 +46,13 @@ jobs: ${{ runner.os }}-maven- - name: Set up Java ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: - distribution: 'zulu' + distribution: 'temurin' java-version: ${{ matrix.java }} - name: Set up Maven ${{ matrix.maven }} - uses: stCarolas/setup-maven@v4.2 + uses: stCarolas/setup-maven@v4.5 with: maven-version: ${{ matrix.maven }} diff --git a/bom/openhab-core-index/pom.xml b/bom/openhab-core-index/pom.xml index 624cf3e602..6129b6a521 100644 --- a/bom/openhab-core-index/pom.xml +++ b/bom/openhab-core-index/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bom/pom.xml b/bom/pom.xml index 154b7dc532..6ac37750c2 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -38,11 +39,14 @@ - + - + - + header diff --git a/bom/runtime-index/pom.xml b/bom/runtime-index/pom.xml index 64b056a1d5..e8a15833f4 100644 --- a/bom/runtime-index/pom.xml +++ b/bom/runtime-index/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bom/smarthomej-addons/pom.xml b/bom/smarthomej-addons/pom.xml index 2d0aadc7f7..1269ffdaf4 100644 --- a/bom/smarthomej-addons/pom.xml +++ b/bom/smarthomej-addons/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bom/test-index/pom.xml b/bom/test-index/pom.xml index 397d198626..94a559c1f3 100644 --- a/bom/test-index/pom.xml +++ b/bom/test-index/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.automation.javarule/pom.xml b/bundles/org.smarthomej.automation.javarule/pom.xml index b63c979837..6a8ca22dfc 100644 --- a/bundles/org.smarthomej.automation.javarule/pom.xml +++ b/bundles/org.smarthomej.automation.javarule/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.amazonechocontrol/pom.xml b/bundles/org.smarthomej.binding.amazonechocontrol/pom.xml index 25f5ba1896..74b2c6d6da 100644 --- a/bundles/org.smarthomej.binding.amazonechocontrol/pom.xml +++ b/bundles/org.smarthomej.binding.amazonechocontrol/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml b/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml index 6514646def..92b105ad35 100644 --- a/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml +++ b/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.deconz/pom.xml b/bundles/org.smarthomej.binding.deconz/pom.xml index 5e4915e8f3..d76907502e 100644 --- a/bundles/org.smarthomej.binding.deconz/pom.xml +++ b/bundles/org.smarthomej.binding.deconz/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.dmx/pom.xml b/bundles/org.smarthomej.binding.dmx/pom.xml index cf11bfeda5..0d4349d415 100644 --- a/bundles/org.smarthomej.binding.dmx/pom.xml +++ b/bundles/org.smarthomej.binding.dmx/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.http/pom.xml b/bundles/org.smarthomej.binding.http/pom.xml index 3507a66964..ebe4dec85f 100644 --- a/bundles/org.smarthomej.binding.http/pom.xml +++ b/bundles/org.smarthomej.binding.http/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.knx/pom.xml b/bundles/org.smarthomej.binding.knx/pom.xml index 8de7b8ea4c..4c138b5c6d 100644 --- a/bundles/org.smarthomej.binding.knx/pom.xml +++ b/bundles/org.smarthomej.binding.knx/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.mail/pom.xml b/bundles/org.smarthomej.binding.mail/pom.xml index ee68e66ee7..e1a431e739 100644 --- a/bundles/org.smarthomej.binding.mail/pom.xml +++ b/bundles/org.smarthomej.binding.mail/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.notificationsforfiretv/pom.xml b/bundles/org.smarthomej.binding.notificationsforfiretv/pom.xml index 91899f546d..a028257616 100644 --- a/bundles/org.smarthomej.binding.notificationsforfiretv/pom.xml +++ b/bundles/org.smarthomej.binding.notificationsforfiretv/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.onewire/pom.xml b/bundles/org.smarthomej.binding.onewire/pom.xml index 427d5446dc..982a79ab0c 100644 --- a/bundles/org.smarthomej.binding.onewire/pom.xml +++ b/bundles/org.smarthomej.binding.onewire/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.snmp/pom.xml b/bundles/org.smarthomej.binding.snmp/pom.xml index ebdb822c65..46a29229f7 100644 --- a/bundles/org.smarthomej.binding.snmp/pom.xml +++ b/bundles/org.smarthomej.binding.snmp/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.tcpudp/pom.xml b/bundles/org.smarthomej.binding.tcpudp/pom.xml index 467f62e552..9a1a59dfdd 100644 --- a/bundles/org.smarthomej.binding.tcpudp/pom.xml +++ b/bundles/org.smarthomej.binding.tcpudp/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.telenot/pom.xml b/bundles/org.smarthomej.binding.telenot/pom.xml index dcd4ccf4c3..dab4cab871 100644 --- a/bundles/org.smarthomej.binding.telenot/pom.xml +++ b/bundles/org.smarthomej.binding.telenot/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.tr064/pom.xml b/bundles/org.smarthomej.binding.tr064/pom.xml index 524162bc43..0917c9ae60 100644 --- a/bundles/org.smarthomej.binding.tr064/pom.xml +++ b/bundles/org.smarthomej.binding.tr064/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.tuya/pom.xml b/bundles/org.smarthomej.binding.tuya/pom.xml index 127628279c..05980555d2 100644 --- a/bundles/org.smarthomej.binding.tuya/pom.xml +++ b/bundles/org.smarthomej.binding.tuya/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.binding.viessmann/pom.xml b/bundles/org.smarthomej.binding.viessmann/pom.xml index 11aa5dabdc..d0f3b7ca41 100644 --- a/bundles/org.smarthomej.binding.viessmann/pom.xml +++ b/bundles/org.smarthomej.binding.viessmann/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.commons/pom.xml b/bundles/org.smarthomej.commons/pom.xml index b3e38076f0..f24d3b8c6e 100644 --- a/bundles/org.smarthomej.commons/pom.xml +++ b/bundles/org.smarthomej.commons/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.persistence.influxdb/pom.xml b/bundles/org.smarthomej.persistence.influxdb/pom.xml index e5afdcb378..68b6b5d50e 100644 --- a/bundles/org.smarthomej.persistence.influxdb/pom.xml +++ b/bundles/org.smarthomej.persistence.influxdb/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.transform.basicprofiles/pom.xml b/bundles/org.smarthomej.transform.basicprofiles/pom.xml index 3031b6edaa..f1b0e9b1a5 100644 --- a/bundles/org.smarthomej.transform.basicprofiles/pom.xml +++ b/bundles/org.smarthomej.transform.basicprofiles/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.transform.chain/pom.xml b/bundles/org.smarthomej.transform.chain/pom.xml index be77a6ba5a..7fadf23422 100644 --- a/bundles/org.smarthomej.transform.chain/pom.xml +++ b/bundles/org.smarthomej.transform.chain/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.transform.format/pom.xml b/bundles/org.smarthomej.transform.format/pom.xml index d8f38a9b8f..8aa4f9e9ca 100644 --- a/bundles/org.smarthomej.transform.format/pom.xml +++ b/bundles/org.smarthomej.transform.format/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/org.smarthomej.transform.math/pom.xml b/bundles/org.smarthomej.transform.math/pom.xml index c5e8c0cc20..96b80fc3b3 100644 --- a/bundles/org.smarthomej.transform.math/pom.xml +++ b/bundles/org.smarthomej.transform.math/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/bundles/pom.xml b/bundles/pom.xml index f6288e5214..569427fe7c 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -46,7 +47,7 @@ target/dependency - + @@ -161,7 +162,7 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karaf.version} + 4.3.9 true 80 diff --git a/features/pom.xml b/features/pom.xml index 2e7b3701c1..583a5d2c98 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -54,7 +55,7 @@ org.apache.karaf.tooling karaf-maven-plugin - ${karaf.version} + 4.3.9 true 80 diff --git a/features/smarthomej-addons-external/pom.xml b/features/smarthomej-addons-external/pom.xml index 3a2b687e3a..0e22cce29d 100644 --- a/features/smarthomej-addons-external/pom.xml +++ b/features/smarthomej-addons-external/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 diff --git a/features/smarthomej-addons/pom.xml b/features/smarthomej-addons/pom.xml index fa952016fd..ef54ec51a0 100644 --- a/features/smarthomej-addons/pom.xml +++ b/features/smarthomej-addons/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -57,16 +58,17 @@ -
+
- + - + -