Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to OH 4.2 #543

Merged
merged 1 commit into from
Dec 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 95 additions & 0 deletions .github/workflows/ci-build-42.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion bom/openhab-core-index/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bom/runtime-index/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bom/smarthomej-addons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bom/test-index/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.automation.javarule/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.binding.amazonechocontrol/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.binding.androiddebugbridge/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.binding.http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.binding.tcpudp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.binding.telenot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.binding.tuya/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.binding.viessmann/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.transform.basicprofiles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.transform.chain/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.transform.format/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.smarthomej.transform.math/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/smarthomej-addons-external/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion features/smarthomej-addons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading