From 5b9a32e8ea9e17f8eda07fe1c3e7da62e5a206d7 Mon Sep 17 00:00:00 2001 From: J-N-K Date: Tue, 10 Oct 2023 13:50:20 +0200 Subject: [PATCH] Move to OH 4.1 (#528) Signed-off-by: Jan N. Klug --- .github/workflows/ci-build-41.yml | 95 +++++++++++++++++++ bom/openhab-core-index/pom.xml | 2 +- bom/pom.xml | 2 +- bom/runtime-index/pom.xml | 2 +- bom/smarthomej-addons/pom.xml | 2 +- bom/test-index/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- bundles/org.smarthomej.binding.http/pom.xml | 2 +- .../pom.xml | 2 +- bundles/org.smarthomej.binding.tcpudp/pom.xml | 2 +- .../org.smarthomej.binding.telenot/pom.xml | 2 +- bundles/org.smarthomej.binding.tuya/pom.xml | 4 +- .../org.smarthomej.binding.viessmann/pom.xml | 2 +- bundles/org.smarthomej.commons/pom.xml | 2 +- .../pom.xml | 2 +- .../org.smarthomej.transform.chain/pom.xml | 2 +- .../org.smarthomej.transform.format/pom.xml | 2 +- bundles/org.smarthomej.transform.math/pom.xml | 2 +- bundles/pom.xml | 3 +- features/pom.xml | 3 +- features/smarthomej-addons-external/pom.xml | 2 +- features/smarthomej-addons/pom.xml | 2 +- pom.xml | 12 +-- site/pom.xml | 2 +- 26 files changed, 128 insertions(+), 31 deletions(-) create mode 100644 .github/workflows/ci-build-41.yml diff --git a/.github/workflows/ci-build-41.yml b/.github/workflows/ci-build-41.yml new file mode 100644 index 0000000000..2b4e791234 --- /dev/null +++ b/.github/workflows/ci-build-41.yml @@ -0,0 +1,95 @@ +name: CI 4.0.x + +on: + push: + branches: + - '4.1.x' + paths-ignore: + - '.github/**/*.md' + pull_request: + branches: + - '4.1.x' + paths-ignore: + - '.github/**/*.md' + workflow_dispatch: + +jobs: + build: + strategy: + fail-fast: false + matrix: + java: [ '17' ] + 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@v3 + + - name: Checkout merge + if: github.head_ref != '' + uses: actions/checkout@v3 + with: + ref: refs/pull/${{github.event.pull_request.number}}/merge + + - name: Set up Cache + uses: actions/cache@v3 + with: + path: | + ~/.m2/repository + !~/.m2/repository/org/openhab + !~/.m2/repository/org/smarthomej + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + - name: Set up Java ${{ matrix.java }} + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + java-version: ${{ matrix.java }} + + - name: Set up Maven ${{ matrix.maven }} + uses: stCarolas/setup-maven@v4.5 + with: + maven-version: ${{ matrix.maven }} + + - name: Register Problem Matchers + if: ${{ matrix.java == '17' }} + id: problem_matchers + run: | + echo "::add-matcher::.github/smarthomej-compile-problems.json" + + - name: Build + id: build + run: './.github/scripts/maven-build' + env: + MAVEN_OPTS: >- + -Xmx2g + -Dmaven.wagon.http.retryHandler.count=5 + -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + + - name: Upload Build Log + if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }} + uses: actions/upload-artifact@v2 + with: + name: build-log-java-${{ matrix.java }}-${{ matrix.os }} + path: build.log + + - name: Upload SAT Summary Report + if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }} + uses: actions/upload-artifact@v2 + with: + name: sat-summary-report + path: target/summary_report.html + + - name: Report SAT Errors as Annotations + if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }} + uses: ghys/checkstyle-github-action@main + with: + title: CheckStyle Violations + path: '**/checkstyle-result.xml' + mode: inline diff --git a/bom/openhab-core-index/pom.xml b/bom/openhab-core-index/pom.xml index 3140852669..b1b7c65ae6 100644 --- a/bom/openhab-core-index/pom.xml +++ b/bom/openhab-core-index/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bom org.smarthomej.addons.reactor.bom - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.addons.bom.openhab-core-index diff --git a/bom/pom.xml b/bom/pom.xml index 8b75d6854f..f6e11eab4c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons org.smarthomej.addons.reactor - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.addons.bom diff --git a/bom/runtime-index/pom.xml b/bom/runtime-index/pom.xml index 73919d82cb..aaf9932d08 100644 --- a/bom/runtime-index/pom.xml +++ b/bom/runtime-index/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bom org.smarthomej.addons.reactor.bom - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.addons.bom.runtime-index diff --git a/bom/smarthomej-addons/pom.xml b/bom/smarthomej-addons/pom.xml index 2f06ba2506..5238aa061d 100644 --- a/bom/smarthomej-addons/pom.xml +++ b/bom/smarthomej-addons/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bom org.smarthomej.addons.reactor.bom - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.addons.bom.smarthomej-addons diff --git a/bom/test-index/pom.xml b/bom/test-index/pom.xml index 7f956ba423..e55fc06f74 100644 --- a/bom/test-index/pom.xml +++ b/bom/test-index/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bom org.smarthomej.addons.reactor.bom - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.addons.bom.test-index diff --git a/bundles/org.smarthomej.automation.javarule/pom.xml b/bundles/org.smarthomej.automation.javarule/pom.xml index 0328c23b31..1e8ed84dca 100644 --- a/bundles/org.smarthomej.automation.javarule/pom.xml +++ b/bundles/org.smarthomej.automation.javarule/pom.xml @@ -6,7 +6,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.automation.javarule diff --git a/bundles/org.smarthomej.binding.amazonechocontrol/pom.xml b/bundles/org.smarthomej.binding.amazonechocontrol/pom.xml index b660751aa2..ab2c9bea47 100644 --- a/bundles/org.smarthomej.binding.amazonechocontrol/pom.xml +++ b/bundles/org.smarthomej.binding.amazonechocontrol/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.binding.amazonechocontrol diff --git a/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml b/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml index 29580afcdc..e924321f4e 100644 --- a/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml +++ b/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.binding.androiddebugbridge diff --git a/bundles/org.smarthomej.binding.http/pom.xml b/bundles/org.smarthomej.binding.http/pom.xml index 06cfa36e8f..56f5e051be 100644 --- a/bundles/org.smarthomej.binding.http/pom.xml +++ b/bundles/org.smarthomej.binding.http/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.binding.http diff --git a/bundles/org.smarthomej.binding.notificationsforfiretv/pom.xml b/bundles/org.smarthomej.binding.notificationsforfiretv/pom.xml index 9cb3979892..a55db0f2ae 100644 --- a/bundles/org.smarthomej.binding.notificationsforfiretv/pom.xml +++ b/bundles/org.smarthomej.binding.notificationsforfiretv/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.binding.notificationsforfiretv diff --git a/bundles/org.smarthomej.binding.tcpudp/pom.xml b/bundles/org.smarthomej.binding.tcpudp/pom.xml index 2630c39df7..d435507c69 100644 --- a/bundles/org.smarthomej.binding.tcpudp/pom.xml +++ b/bundles/org.smarthomej.binding.tcpudp/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.binding.tcpudp diff --git a/bundles/org.smarthomej.binding.telenot/pom.xml b/bundles/org.smarthomej.binding.telenot/pom.xml index f71832ec65..624b89bcf9 100644 --- a/bundles/org.smarthomej.binding.telenot/pom.xml +++ b/bundles/org.smarthomej.binding.telenot/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.binding.telenot diff --git a/bundles/org.smarthomej.binding.tuya/pom.xml b/bundles/org.smarthomej.binding.tuya/pom.xml index e93989b90a..3853abd037 100644 --- a/bundles/org.smarthomej.binding.tuya/pom.xml +++ b/bundles/org.smarthomej.binding.tuya/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.binding.tuya @@ -24,7 +24,7 @@ io.netty netty-common - 4.1.53.Final + 4.1.99.Final provided diff --git a/bundles/org.smarthomej.binding.viessmann/pom.xml b/bundles/org.smarthomej.binding.viessmann/pom.xml index a7db7563eb..cfd46b5a6d 100644 --- a/bundles/org.smarthomej.binding.viessmann/pom.xml +++ b/bundles/org.smarthomej.binding.viessmann/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.binding.viessmann diff --git a/bundles/org.smarthomej.commons/pom.xml b/bundles/org.smarthomej.commons/pom.xml index aeb5df1cbb..7de8a905b2 100644 --- a/bundles/org.smarthomej.commons/pom.xml +++ b/bundles/org.smarthomej.commons/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.commons diff --git a/bundles/org.smarthomej.transform.basicprofiles/pom.xml b/bundles/org.smarthomej.transform.basicprofiles/pom.xml index 60edac7794..c9e3140e54 100644 --- a/bundles/org.smarthomej.transform.basicprofiles/pom.xml +++ b/bundles/org.smarthomej.transform.basicprofiles/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.transform.basicprofiles diff --git a/bundles/org.smarthomej.transform.chain/pom.xml b/bundles/org.smarthomej.transform.chain/pom.xml index c6ce45100c..9e63253732 100644 --- a/bundles/org.smarthomej.transform.chain/pom.xml +++ b/bundles/org.smarthomej.transform.chain/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.transform.chain diff --git a/bundles/org.smarthomej.transform.format/pom.xml b/bundles/org.smarthomej.transform.format/pom.xml index 09b71b8a8d..5e6bf435a5 100644 --- a/bundles/org.smarthomej.transform.format/pom.xml +++ b/bundles/org.smarthomej.transform.format/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.transform.format diff --git a/bundles/org.smarthomej.transform.math/pom.xml b/bundles/org.smarthomej.transform.math/pom.xml index e23b435a63..034677dece 100644 --- a/bundles/org.smarthomej.transform.math/pom.xml +++ b/bundles/org.smarthomej.transform.math/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.bundles org.smarthomej.addons.reactor.bundles - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.transform.math diff --git a/bundles/pom.xml b/bundles/pom.xml index 1b7c6b096c..be57c8c33c 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons org.smarthomej.addons.reactor - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.addons.bundles @@ -293,6 +293,7 @@ mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features + mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features diff --git a/features/pom.xml b/features/pom.xml index 90f732b01b..ee2e51f281 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons org.smarthomej.addons.reactor - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.addons.features.karaf @@ -84,6 +84,7 @@ mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features + mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features file:${project.build.directory}/feature/feature.xml diff --git a/features/smarthomej-addons-external/pom.xml b/features/smarthomej-addons-external/pom.xml index e5d3342dea..171c68014f 100644 --- a/features/smarthomej-addons-external/pom.xml +++ b/features/smarthomej-addons-external/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.features.karaf org.smarthomej.addons.reactor.features.karaf - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.addons.features.karaf.smarthomej-addons-external diff --git a/features/smarthomej-addons/pom.xml b/features/smarthomej-addons/pom.xml index 1e3d83b15a..12afee12d7 100644 --- a/features/smarthomej-addons/pom.xml +++ b/features/smarthomej-addons/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons.features.karaf org.smarthomej.addons.reactor.features.karaf - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.addons.features.karaf.smarthomej-addons diff --git a/pom.xml b/pom.xml index 8b0576863b..cac65adb2b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.smarthomej.addons org.smarthomej.addons.reactor - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT pom @@ -78,14 +78,14 @@ ${oh.java.version} ${oh.java.version} - 4.0.0 - 6.4.0 + 4.1.0-SNAPSHOT + 7.0.0 3.7.2 2.4.0 - 4.4.3 + 4.4.4 0.15.0 - 1.7.32 - 2.37.0 + 2.0.6 + 2.38.0 4.25 4.21.0 diff --git a/site/pom.xml b/site/pom.xml index 8069c44465..6075115647 100644 --- a/site/pom.xml +++ b/site/pom.xml @@ -7,7 +7,7 @@ org.smarthomej.addons org.smarthomej.addons.reactor - 4.0.1-SNAPSHOT + 4.1.0-SNAPSHOT org.smarthomej.addons.site