Move to OH 4.2 (#543)

Signed-off-by: Jan N. Klug <[email protected]>
smarthomej · Dec 23, 2023 · 85493fd · 85493fd
1 parent 919de71
commit 85493fd
Show file tree

Hide file tree

Showing 26 changed files with 121 additions and 26 deletions.
diff --git a/.github/workflows/ci-build-42.yml b/.github/workflows/ci-build-42.yml
@@ -0,0 +1,95 @@
+name: CI 4.2.x
+
+on:
+  push:
+    branches:
+      - '4.2.x'
+    paths-ignore:
+      - '.github/**/*.md'
+  pull_request:
+    branches:
+      - '4.2.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/[email protected]
+        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
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bom</groupId>
     <artifactId>org.smarthomej.addons.reactor.bom</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.addons.bom.openhab-core-index</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons</groupId>
     <artifactId>org.smarthomej.addons.reactor</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.smarthomej.addons.bom</groupId>

diff --git a/bom/runtime-index/pom.xml b/bom/runtime-index/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bom</groupId>
     <artifactId>org.smarthomej.addons.reactor.bom</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.addons.bom.runtime-index</artifactId>

diff --git a/bom/smarthomej-addons/pom.xml b/bom/smarthomej-addons/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bom</groupId>
     <artifactId>org.smarthomej.addons.reactor.bom</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.addons.bom.smarthomej-addons</artifactId>

diff --git a/bom/test-index/pom.xml b/bom/test-index/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bom</groupId>
     <artifactId>org.smarthomej.addons.reactor.bom</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.addons.bom.test-index</artifactId>

diff --git a/bundles/org.smarthomej.automation.javarule/pom.xml b/bundles/org.smarthomej.automation.javarule/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.automation.javarule</artifactId>

diff --git a/bundles/org.smarthomej.binding.amazonechocontrol/pom.xml b/bundles/org.smarthomej.binding.amazonechocontrol/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.binding.amazonechocontrol</artifactId>

diff --git a/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml b/bundles/org.smarthomej.binding.androiddebugbridge/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.binding.androiddebugbridge</artifactId>

diff --git a/bundles/org.smarthomej.binding.http/pom.xml b/bundles/org.smarthomej.binding.http/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.binding.http</artifactId>

diff --git a/bundles/org.smarthomej.binding.notificationsforfiretv/pom.xml b/bundles/org.smarthomej.binding.notificationsforfiretv/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.binding.notificationsforfiretv</artifactId>

diff --git a/bundles/org.smarthomej.binding.tcpudp/pom.xml b/bundles/org.smarthomej.binding.tcpudp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.binding.tcpudp</artifactId>

diff --git a/bundles/org.smarthomej.binding.telenot/pom.xml b/bundles/org.smarthomej.binding.telenot/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.binding.telenot</artifactId>

diff --git a/bundles/org.smarthomej.binding.tuya/pom.xml b/bundles/org.smarthomej.binding.tuya/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.binding.tuya</artifactId>

diff --git a/bundles/org.smarthomej.binding.viessmann/pom.xml b/bundles/org.smarthomej.binding.viessmann/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.binding.viessmann</artifactId>

diff --git a/bundles/org.smarthomej.commons/pom.xml b/bundles/org.smarthomej.commons/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.commons</artifactId>

diff --git a/bundles/org.smarthomej.transform.basicprofiles/pom.xml b/bundles/org.smarthomej.transform.basicprofiles/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.transform.basicprofiles</artifactId>

diff --git a/bundles/org.smarthomej.transform.chain/pom.xml b/bundles/org.smarthomej.transform.chain/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.transform.chain</artifactId>

diff --git a/bundles/org.smarthomej.transform.format/pom.xml b/bundles/org.smarthomej.transform.format/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.transform.format</artifactId>

diff --git a/bundles/org.smarthomej.transform.math/pom.xml b/bundles/org.smarthomej.transform.math/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.bundles</groupId>
     <artifactId>org.smarthomej.addons.reactor.bundles</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.transform.math</artifactId>

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons</groupId>
     <artifactId>org.smarthomej.addons.reactor</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.smarthomej.addons.bundles</groupId>

diff --git a/features/pom.xml b/features/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons</groupId>
     <artifactId>org.smarthomej.addons.reactor</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.smarthomej.addons.features.karaf</groupId>

diff --git a/features/smarthomej-addons-external/pom.xml b/features/smarthomej-addons-external/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.features.karaf</groupId>
     <artifactId>org.smarthomej.addons.reactor.features.karaf</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.addons.features.karaf.smarthomej-addons-external</artifactId>

diff --git a/features/smarthomej-addons/pom.xml b/features/smarthomej-addons/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons.features.karaf</groupId>
     <artifactId>org.smarthomej.addons.reactor.features.karaf</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.addons.features.karaf.smarthomej-addons</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.smarthomej.addons</groupId>
   <artifactId>org.smarthomej.addons.reactor</artifactId>
-  <version>4.1.0-SNAPSHOT</version>
+  <version>4.2.0-SNAPSHOT</version>
 
   <packaging>pom</packaging>
 
@@ -78,7 +78,7 @@
     <maven.compiler.target>${oh.java.version}</maven.compiler.target>
     <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
 
-    <ohc.version>4.1.0-SNAPSHOT</ohc.version>
+    <ohc.version>4.2.0-SNAPSHOT</ohc.version>
     <bnd.version>7.0.0</bnd.version>
     <commons.net.version>3.7.2</commons.net.version>
     <eea.version>2.4.0</eea.version>

diff --git a/site/pom.xml b/site/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.smarthomej.addons</groupId>
     <artifactId>org.smarthomej.addons.reactor</artifactId>
-    <version>4.1.0-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.smarthomej.addons.site</artifactId>