Merge branch 'master' into develop

Author: guFalcon

pom.xml

@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<parent>
 		<groupId>info.unterrainer.commons</groupId>
@@ -17,7 +15,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>mqtt-client</artifactId>
-	<version>0.1.5</version>
+	<version>0.1.7</version>
 	<name>MqttClient</name>
 	<packaging>jar</packaging>
 
@@ -30,7 +28,7 @@
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>serialization</artifactId>
-			<version>0.2.1</version>
+			<version>0.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
@@ -39,4 +37,4 @@
 		</dependency>
 	</dependencies>
 
-</project>
+</project>

src/main/java/info/unterrainer/commons/mqttclient/MqttClient.java

@@ -8,7 +8,7 @@
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.eclipse.paho.client.mqttv3.MqttPersistenceException;
 
-import info.unterrainer.commons.serialization.JsonMapper;
+import info.unterrainer.commons.serialization.jsonmapper.JsonMapper;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;