Merge remote-tracking branch 'origin/master'

pom.xml

@@ -394,12 +394,17 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/io.joynr.java.messaging.mqtt/paho-mqtt-client -->
-        <dependency>
-            <groupId>io.joynr.java.messaging.mqtt</groupId>
-            <artifactId>paho-mqtt-client</artifactId>
-            <version>1.14.2</version>
-        </dependency>
+<!--        &lt;!&ndash; https://mvnrepository.com/artifact/io.joynr.java.messaging.mqtt/paho-mqtt-client &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>io.joynr.java.messaging.mqtt</groupId>-->
+<!--            <artifactId>paho-mqtt-client</artifactId>-->
+<!--            <version>1.14.2</version>-->
+<!--        </dependency>-->
+		<dependency>
+			<groupId>org.eclipse.paho</groupId>
+			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+			<version>1.2.5</version>
+		</dependency>
         <!-- JSON等格式的转义和反转义 -->
         <dependency>
             <groupId>org.apache.commons</groupId>