Merge branch 'develop'

csowada · Dec 27, 2020 · 101042c · 101042c
2 parents 0cafc13 + 0ff063a
commit 101042c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -63,16 +63,15 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Create GitGub Release
-      id: create_release
-      uses: actions/create-release@v1
+    - name: Create a new GitHub Release
+      uses: docker://antonyurchenko/git-release:latest
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DRAFT_RELEASE: "true"
+        PRE_RELEASE: "false"
+        CHANGELOG_FILE: "CHANGELOG.md"
+        ALLOW_EMPTY_CHANGELOG: "true"
+        ALLOW_TAG_PREFIX: "true"
       with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ github.ref }}
-        body: |
-          Changes in this Release
-          
-        draft: true
-        prerelease: false
+        args: |
+          target/*.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,9 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## Unreleased 
+
+## [1.1.4] - 2020-12-27
+### Changed
+- Update to ebus core lib v1.1.4
+- Fix sonarlint issue on test ``EBusCommonTelegramTest``
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 	<description>eBUS library configuration</description>
 	<groupId>de.cs-dev.ebus</groupId>
 	<artifactId>ebus-configuration</artifactId>
-	<version>1.1.3</version>
+	<version>1.1.4</version>
 	<url>https://github.com/csowada/ebus-configuration</url>
 	<packaging>bundle</packaging>
 
@@ -23,7 +23,7 @@
 		<sonar.organization>csowada</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
-		<ebus.core.version>1.1.3</ebus.core.version>
+		<ebus.core.version>1.1.4</ebus.core.version>
 	</properties>
 
 	<organization>
@@ -39,7 +39,7 @@
 
 	<developers>
 		<developer>
-			<email>git@cs-dev.de</email>
+			<email>opensource@cs-dev.de</email>
 			<name>Christian Sowada</name>
 			<url>https://github.com/csowada</url>
 			<id>csowada</id>

diff --git a/src/test/java/de/csdev/ebus/cfg/EBusCommonTelegramTest.java b/src/test/java/de/csdev/ebus/cfg/EBusCommonTelegramTest.java
@@ -9,6 +9,7 @@
 package de.csdev.ebus.cfg;
 
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -103,7 +104,7 @@ public void testTelegram1() {
          * 2014-10-23 16:10:31 - >>> common.time_hour 16 Zeit Stunde
          */
         byte[] bs = EBusUtils.toByteArray("30 FE 07 00 09 00 80 10 08 16 23 10 04 14 A2 AA");
-        TestUtils.canResolve(commandRegistry, bs);
+        assertTrue(TestUtils.canResolve(commandRegistry, bs));
     }
 
     @Test
@@ -127,7 +128,7 @@ public void testTelegram2() {
          */
 
         byte[] bs = EBusUtils.toByteArray("03 FE 05 03 08 01 00 40 FF 2D 17 30 0E C8 AA");
-        TestUtils.canResolve(commandRegistry, bs);
+        assertTrue(TestUtils.canResolve(commandRegistry, bs));
     }
 
     @Test
@@ -142,7 +143,7 @@ public void testTelegram3() {
          * 2014-10-23 16:10:33 - >>> controller2.temp_t_boiler 5.0 Brauchwassersoll
          */
         byte[] bs = EBusUtils.toByteArray("03 F1 08 00 08 00 80 99 0E 80 02 00 05 94 AA");
-        TestUtils.canResolve(commandRegistry, bs);
+        assertTrue(TestUtils.canResolve(commandRegistry, bs));
     }
 
     @Test
@@ -158,7 +159,7 @@ public void testTelegram4() {
          * 2014-10-23 16:10:39 - >>> controller.temp_t_boiler 50.0 Brauchwassersollwert
          */
         byte[] bs = EBusUtils.toByteArray("30 03 05 07 09 BB 03 61 01 00 80 FF 64 FF D5 00 AA");
-        TestUtils.canResolve(commandRegistry, bs);
+        assertTrue(TestUtils.canResolve(commandRegistry, bs));
     }
 
     @Test
@@ -177,16 +178,16 @@ public void testTelegram5() {
          * 2014-10-23 16:11:18 - >>> common._device_id1 0 Geräte ID 1
          */
         byte[] bs = EBusUtils.toByteArray("30 08 07 04 00 5E 00 0A 19 01 21 00 5A 40 60 01 00 00 48 00 AA");
-        TestUtils.canResolve(commandRegistry, bs);
+        assertTrue(TestUtils.canResolve(commandRegistry, bs));
 
         bs = EBusUtils.toByteArray("FF 76 07 04 00 43 00 0A 50 01 15 00 00 80 02 27 FF FF 81 00 AA");
-        TestUtils.canResolve(commandRegistry, bs);
+        assertTrue(TestUtils.canResolve(commandRegistry, bs));
     }
 
     @Test
     public void testDecodeBroadcast() {
         byte[] bs = EBusUtils.toByteArray("30 FE 07 00 09 00 80 10 54 21 16 08 03 17 02 AA");
-        TestUtils.canResolve(commandRegistry, bs);
+        assertTrue(TestUtils.canResolve(commandRegistry, bs));
 
     }