Merge commit '4d3b70adb9e6564ccd0048d00311a7313f3b4456'

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased 
 
+## [1.1.6] - 2021-12-29
+### Changed
+- Update maven dependencies
+
 ## [1.1.5] - 2021-06-26
 ### Changed
 - Update maven dependencies

build.properties

@@ -0,0 +1,10 @@
+source.. = src/main/java,\
+           src/main/resources/,\
+           src/test/resources/,\
+		   src/test/java
+output.. = target/classes/
+bin.includes = META-INF/,\
+               .,\
+               src/main/resources/
+bin.excludes = src/test/
+jre.compilation.profile = J2SE-1.6

pom.xml

@@ -7,7 +7,7 @@
 	<description>eBUS library configuration</description>
 	<groupId>de.cs-dev.ebus</groupId>
 	<artifactId>ebus-configuration</artifactId>
-	<version>1.1.6</version>
+	<version>1.1.7</version>
 	<url>https://github.com/csowada/ebus-configuration</url>
 	<packaging>bundle</packaging>
 
@@ -17,13 +17,13 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven.compiler.release>8</maven.compiler.release>
-		<license.year>2020</license.year>
+		<license.year>2023</license.year>
 		<bundle.version>${project.version}</bundle.version>
 		<sonar.projectKey>csowada_ebus-configuration</sonar.projectKey>
 		<sonar.organization>csowada</sonar.organization>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
-		<ebus.core.version>1.1.8</ebus.core.version>
+		<ebus.core.version>1.1.9</ebus.core.version>
 	</properties>
 
 	<organization>
@@ -33,7 +33,8 @@
 
 	<licenses>
 		<license>
-			<name>EPL License</name>
+			<name>Eclipse Public License</name>
+			<url>http://www.eclipse.org/legal/epl-v10.html</url>
 		</license>
 	</licenses>
 
@@ -102,7 +103,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>1.4.0</version>
+				<version>3.0.1</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
@@ -217,6 +218,9 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
 						<version>3.0.0</version>
+						<configuration>
+							<doclint>none</doclint>
+						</configuration>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>

src/main/java/de/csdev/ebus/configuration/EBusConfigurationReaderExt.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/main/java/de/csdev/ebus/configuration/EBusConfigurationVersion.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/StaticTestTelegrams.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/TestUtils.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/cfg/EBusCommonTelegramTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/cfg/EBusCommonVaillantDateTimeTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/cfg/EBusVaillantTelegramTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/cfg/EBusVaillantVRC430TelegramTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/cfg/EBusWolfBM2Test.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -68,7 +68,7 @@ public void testGetDHWProgram() {
 
         try {
             ByteBuffer buffer = EBusCommandUtils.buildMasterTelegram(commandMethod, (byte) 0x00, (byte) 0x35, params);
-            assertEquals(EBusUtils.toHexDumpString(buffer).toString(), "00 35 50 22 03 A3 75 27 79");
+            assertEquals("00 35 50 22 03 A3 75 27 79", EBusUtils.toHexDumpString(buffer).toString());
 
         } catch (EBusTypeException e) {
             e.printStackTrace();
@@ -94,7 +94,7 @@ public void testSetDHWProgram() {
 
         try {
             ByteBuffer buffer = EBusCommandUtils.buildMasterTelegram(commandMethod, (byte) 0x00, (byte) 0x30, params);
-            assertEquals(EBusUtils.toHexDumpString(buffer).toString(), "00 30 50 23 09 D8 75 27 01 00 5D 01 00 00 BF");
+            assertEquals("00 30 50 23 09 D8 75 27 01 00 5D 01 00 00 BF", EBusUtils.toHexDumpString(buffer).toString());
 
         } catch (EBusTypeException e) {
             e.printStackTrace();

src/test/java/de/csdev/ebus/cfg/EBusWolfCWLTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/cfg/EBusWolfMMTelegramTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/cfg/EBusWolfSM1TelegramTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/cfg/KW_CRC_Test.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -45,6 +45,6 @@ public void testKWCrc() throws EBusTypeException, EBusCommandException {
 
         ByteBuffer buffer = EBusCommandUtils.buildMasterTelegram(commandMethod, (byte) 0x00, (byte) 0x04, null);
 
-        assertEquals("KW CRC Invalid", buffer.get(5), 0x77);
+        assertEquals("KW CRC Invalid", 0x77, buffer.get(5));
     }
 }

src/test/java/de/csdev/ebus/wip/EBusCommonTelegramTest2.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

src/test/java/de/csdev/ebus/wip/EBusdControllerTest.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016-2020 by the respective copyright holders.
+ * Copyright (c) 2016-2023 by the respective copyright holders.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0