From f2a165bea2abd1b5eb26911874dcccb8ebbaf2b4 Mon Sep 17 00:00:00 2001 From: J-N-K Date: Tue, 26 Dec 2023 18:22:08 +0100 Subject: [PATCH] Remove 3.x from documentation and build (#548) Signed-off-by: Jan N. Klug (cherry picked from commit b7d7d9afadd203d678671e7dc81804c4d408ef09) --- .github/workflows/ci-build-32.yml | 95 ------------------------------- README.md | 14 ++--- 2 files changed, 7 insertions(+), 102 deletions(-) delete mode 100644 .github/workflows/ci-build-32.yml diff --git a/.github/workflows/ci-build-32.yml b/.github/workflows/ci-build-32.yml deleted file mode 100644 index 88526e58d1..0000000000 --- a/.github/workflows/ci-build-32.yml +++ /dev/null @@ -1,95 +0,0 @@ -name: CI 3.2.x - -on: - push: - branches: - - '3.2.x' - paths-ignore: - - '.github/**/*.md' - pull_request: - branches: - - '3.2.x' - paths-ignore: - - '.github/**/*.md' - workflow_dispatch: - -jobs: - build: - strategy: - fail-fast: false - matrix: - java: [ '11', '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 == '11' }} - 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 == '11' && 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/README.md b/README.md index a3e8a992eb..61afc809c8 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ # Smarthome/J Add-ons [![EPL-2.0](https://img.shields.io/badge/license-EPL%202-green.svg)](https://opensource.org/licenses/EPL-2.0) -[![Build Status 3.2.x](https://github.com/smarthomej/addons/actions/workflows/ci-build-32.yml/badge.svg?branch=3.2.x)](https://github.com/smarthomej/addons/actions/workflows/ci-build-32.yml) [![Build Status 4.0.x](https://github.com/smarthomej/addons/actions/workflows/ci-build-40.yml/badge.svg?branch=4.0.x)](https://github.com/smarthomej/addons/actions/workflows/ci-build-40.yml) +[![Build Status 4.1.x](https://github.com/smarthomej/addons/actions/workflows/ci-build-41.yml/badge.svg?branch=4.1.x)](https://github.com/smarthomej/addons/actions/workflows/ci-build-41.yml) +[![Build Status 4.2.x](https://github.com/smarthomej/addons/actions/workflows/ci-build-42.yml/badge.svg?branch=4.2.x)](https://github.com/smarthomej/addons/actions/workflows/ci-build-42.yml) This repository contains the add-ons that are implemented on top of [openHAB Core APIs](https://github.com/openhab/openhab-core). Some parts of this repository are forked from [openHAB Addons](https://github.com/openhab/openhab-addons). @@ -11,18 +12,17 @@ Some parts of this repository are forked from [openHAB Addons](https://github.co It is recommended to add `https://download.smarthomej.org/addons.json` as JSON 3rd Party Addon Service in the settings. Afterwards all addons can be installed from the UI. +Due to limitations openHAB Core, please make sure to disable "Show incompatible add-ons" on the "Add-on Management" page (NOT the "JSON 3rd Party Addon Service" page). ### Compatibility Due to a breaking changes in openHAB, older and newer versions of bundles are not compatible in every combination. -We'll continue to support 3.0 compatible addons until the release of openHAB 3.2.0 (which is expected end of 2021) and provide the same set of addons for newer versions. -Please check the table to see which versions of SmartHome/J are compatible with which openHAB version: +Currently the last two stable releases of openHAB (4.0 and 4.1) as well as the current development version (4.2, only latest snapshots) are supported. -| | openHAB 3.2.0 - 3.4.0 (release) | openHAB 4.0.0 (release) | -|-----------------------------------------|:-------------------------------:|:-----------------------:| -| SmartHome/J 3.2.x (snapshots, releases) | yes | no | -| SmartHome/J 4.0.x (snapshots, releases) | no | yes | +The downloads for openHAB 3.2-3.4 are still available, but these versions will no longer receive updates. +Please consider upgrading your openHAB installation. +Starting with 4.0, the version numbers between openHAB Core and SmartHome/J are the same, i.e. SmartHome/J 4.0.x is compatible with openHAB 4.0.x. ### Upgrading SmartHome/J bindings installed from the JSON 3rd Party Add-on service