Merge pull request #15 from csowada/develop

Next Release 4.0.20

.github/workflows/maven-publish.yml

@@ -12,29 +12,33 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
 
       - name: Set up Java
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: 17
+          distribution: temurin
+          cache: maven
 
       - name: Package maven project
         run: mvn --batch-mode --update-snapshots -Dspotless.check.skip=true -DskipChecks install
 
       - name: Upload Maven build artifact (JAR)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: artifact-jar
           path: bundles/org.openhab.binding.ebus/target/*.jar
@@ -46,7 +50,7 @@ jobs:
         run: mvn --batch-mode -Dspotless.check.skip=true -DskipChecks karaf:kar -pl :org.openhab.binding.ebus
 
       - name: Upload Maven build artifact (KAR)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: artifact-kar
           path: bundles/org.openhab.binding.ebus/target/*.kar

.github/workflows/maven.yml

@@ -15,54 +15,45 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
     - name: Cache Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
-
-    - name: Cache SonarCloud packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.sonar/cache
-        key: ${{ runner.os }}-sonar
-        restore-keys: ${{ runner.os }}-sonar
 
     - name: Set up Java
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 17
+        distribution: temurin
+        cache: maven
 
     - name: Package maven project
       run: mvn --batch-mode --update-snapshots -Dspotless.check.skip=true -DskipChecks install
 
-    # - name: Build and analyze
-    #   env:
-    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-    #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-    #   run: mvn --batch-mode -Dspotless.check.skip=true -DskipChecks clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-
     - name: Upload Maven build artifact (JAR)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: artifact-jar
         path: bundles/org.openhab.binding.ebus/target/*.jar
 
     - name: Remove classes folder to not include it into KAR
-      run: rm -rf bundles/org.openhab.binding.ebus/target/classes
+      run: rm -rfv bundles/org.openhab.binding.ebus/target/classes
 
     - name: Build Karaf KAR file embedded with all dependencies
       run: mvn --batch-mode -Dspotless.check.skip=true -DskipChecks karaf:kar -pl :org.openhab.binding.ebus
 
     - name: Upload Maven build artifact (KAR)
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: artifact-kar
         path: bundles/org.openhab.binding.ebus/target/*.kar

BUILD-INFO.md

@@ -1,8 +1,13 @@
+__WARNING: DO NOT USE PowerShell to execute commands__
+
 ```bash
 mvn package -Dspotless.check.skip=true -pl :org.openhab.binding.ebus
-mvn clean package -Dspotless.check.skip=true -pl :org.openhab.binding.ebus
+mvn clean package -Dspotless.check.skip=true -pl :org.openhab.binding.ebus -DskipChecks
 mvn verify -Dspotless.check.skip=true -pl :org.openhab.binding.ebus
 mvn karaf:kar -Dspotless.check.skip=true -pl :org.openhab.binding.ebus -DskipChecks
-mvn install -Dspotless.check.skip=true -pl :org.openhab.binding.ebus
+mvn install -Dspotless.check.skip=true -pl :org.openhab.binding.ebus -DskipChecks
 mvn clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dspotless.check.skip=true
+
+mvn clean install karaf:kar -DskipChecks=true -DskipTests -Dcheckstyle.skip -pl :org.openhab.binding.ebus -DskipChecks=true -DskipTests -Dcheckstyle.skip
+mvn license:format
 ```

CHANGELOG.md

@@ -3,7 +3,21 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
-## [4.0.18] - 2023-09-11 (only snapshot release)
+## [4.0.20] - 2025-01-31
+### Changed
+- Update eBUS core to version 1.1.13
+  - Revert change from v1.1.9 to encode master data again
+  - Update project dependencies
+- Update eBUS configuration to version 1.1.9
+  - Fix Wolf CWL 300/400 issue for setter fan_stepX
+  - Add Cooling State to controller.d_values_rc2
+- Update project pipelines, license header to 2025
+
+## [4.0.19] - 2023-09-14
+### Fixed
+- Fix KAR builds for openHAB 4.0.3
+
+## [4.0.18] - 2023-09-11
 ### Fixed
 - Update binding feature to openHAB 4.0.2
 - Remove version dependency in feature.xml

bundles/org.openhab.binding.ebus/pom.xml

@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.openhab.addons.bundles</groupId>
     <artifactId>org.openhab.addons.reactor.bundles</artifactId>
-    <version>4.0.18</version>
+    <version>4.0.20</version>
   </parent>
 
   <properties>
-    <ebus.core.version>1.1.11</ebus.core.version>
-    <ebus.config.version>1.1.8</ebus.config.version>
+    <ebus.core.version>1.1.13</ebus.core.version>
+    <ebus.config.version>1.1.9</ebus.config.version>
   </properties>
 
   <artifactId>org.openhab.binding.ebus</artifactId>

bundles/org.openhab.binding.ebus/src/main/feature/feature.xml

@@ -3,7 +3,11 @@
 
 	<!-- <repository>mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features</repository> -->
 
-	<feature name="openhab-binding-ebus" description="eBUS Binding" version="${project.version}">
+	<!-- The feature name DOES NOT start with openhab, despite the coding rules. It is OK ! There is a weird behavior in the way openHAB handles KAR file
+		(there is an autodeletion feature if the KAR file is not registered in the addon file). 
+		To avoid this we change the name. You have to build the project without the name check. 
+		Use -Dspotless.check.skip=true -DskipChecks=true -DskipTests -Dcheckstyle.skip  -->
+	<feature name="marketplace-openhab-binding-ebus" description="eBUS Binding" version="${project.version}">
 		<feature>openhab-runtime-base</feature>
 		<feature>openhab-transport-serial</feature>
 		<bundle>mvn:de.cs-dev.ebus/ebus-core/${ebus.core.version}</bundle>

bundles/org.openhab.binding.ebus/src/main/java/org/openhab/binding/ebus/action/EBusActions.java

@@ -1,14 +1,10 @@
 /**
- * Copyright (c) 2010-2019 Contributors to the openHAB project
+ * Copyright (c) 2017-2025 by the respective copyright holders.
  *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.openhab.binding.ebus.action;
 

bundles/org.openhab.binding.ebus/src/main/java/org/openhab/binding/ebus/internal/EBusBindingConfiguration.java

@@ -1,14 +1,10 @@
 /**
- * Copyright (c) 2010-2019 Contributors to the openHAB project
+ * Copyright (c) 2017-2025 by the respective copyright holders.
  *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.openhab.binding.ebus.internal;
 

bundles/org.openhab.binding.ebus/src/main/java/org/openhab/binding/ebus/internal/EBusBindingConstants.java

@@ -1,14 +1,10 @@
 /**
- * Copyright (c) 2010-2019 Contributors to the openHAB project
+ * Copyright (c) 2017-2025 by the respective copyright holders.
  *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.openhab.binding.ebus.internal;
 

bundles/org.openhab.binding.ebus/src/main/java/org/openhab/binding/ebus/internal/EBusBridgeHandlerConfiguration.java

@@ -1,14 +1,10 @@
 /**
- * Copyright (c) 2010-2019 Contributors to the openHAB project
+ * Copyright (c) 2017-2025 by the respective copyright holders.
  *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.openhab.binding.ebus.internal;
 

bundles/org.openhab.binding.ebus/src/main/java/org/openhab/binding/ebus/internal/EBusHandlerConfiguration.java

@@ -1,14 +1,10 @@
 /**
- * Copyright (c) 2010-2019 Contributors to the openHAB project
+ * Copyright (c) 2017-2025 by the respective copyright holders.
  *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.openhab.binding.ebus.internal;
 

bundles/org.openhab.binding.ebus/src/main/java/org/openhab/binding/ebus/internal/EBusHandlerFactory.java

@@ -1,14 +1,10 @@
 /**
- * Copyright (c) 2010-2019 Contributors to the openHAB project
+ * Copyright (c) 2017-2025 by the respective copyright holders.
  *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.openhab.binding.ebus.internal;
 

bundles/org.openhab.binding.ebus/src/main/java/org/openhab/binding/ebus/internal/EbusBindingVersion.java

@@ -1,14 +1,10 @@
 /**
- * Copyright (c) 2010-2019 Contributors to the openHAB project
+ * Copyright (c) 2017-2025 by the respective copyright holders.
  *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.openhab.binding.ebus.internal;
 

bundles/org.openhab.binding.ebus/src/main/java/org/openhab/binding/ebus/internal/handler/EBusBaseBridgeHandler.java

@@ -1,14 +1,10 @@
 /**
- * Copyright (c) 2010-2019 Contributors to the openHAB project
+ * Copyright (c) 2017-2025 by the respective copyright holders.
  *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.openhab.binding.ebus.internal.handler;
 

bundles/org.openhab.binding.ebus/src/main/java/org/openhab/binding/ebus/internal/handler/EBusBridgeHandler.java

@@ -1,14 +1,10 @@
 /**
- * Copyright (c) 2010-2019 Contributors to the openHAB project
+ * Copyright (c) 2017-2025 by the respective copyright holders.
  *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.openhab.binding.ebus.internal.handler;
 

bundles/org.openhab.binding.ebus/src/main/java/org/openhab/binding/ebus/internal/handler/EBusHandler.java

@@ -1,14 +1,10 @@
 /**
- * Copyright (c) 2010-2019 Contributors to the openHAB project
+ * Copyright (c) 2017-2025 by the respective copyright holders.
  *
- * See the NOTICE file(s) distributed with this work for additional
- * information.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0
- *
- * SPDX-License-Identifier: EPL-2.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  */
 package org.openhab.binding.ebus.internal.handler;