Merging in Version 1.2.0

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>

.travis.yml

@@ -1 +1,23 @@
+sudo: true
 language: java
+
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+#    - os: osx
+
+sudo: required
+
+before_install:
+  - ./travis-install.sh
+
+script: mvn --projects org.eclipse.paho.client.mqttv3,org.eclipse.paho.client.mqttv3.test test -Dtest.server_ssl_port=18885 -Dtest.server_uri=tcp://localhost:1883 -Dtest.server_websocket_uri=ws://localhost:8080 -B
+
+addons:
+  apt:
+    sources:
+      - sourceline: 'ppa:mosquitto-dev/mosquitto-ppa'
+    packages:
+      - mosquitto

CONTRIBUTING.md

@@ -20,8 +20,6 @@ Please read the [Eclipse Foundation policy on accepting contributions via Git](h
 
 ## Contributing a change
 
-## Contributing a change
-
 1. [Fork the repository on GitHub](https://github.com/eclipse/paho.mqtt.java/fork)
 2. Clone the forked repository onto your computer: ``` git clone https://github.com/<your username>/paho.mqtt.java.git ```
 3. Create a new branch from the latest ```develop``` branch with ```git checkout -b YOUR_BRANCH_NAME origin/develop```

README.md

@@ -32,7 +32,7 @@ Add the repository definition and the dependency definition shown below to your
 
 Replace %REPOURL% with either ``` https://repo.eclipse.org/content/repositories/paho-releases/ ``` for the official releases, or ``` https://repo.eclipse.org/content/repositories/paho-snapshots/  ``` for the nightly snapshots. Replace %VERSION% with the level required .
 
-The latest release version is ```1.1.1``` and the current snapshot version is ```1.1.2-SNAPSHOT```.
+The latest release version is ```1.2.0``` and the current snapshot version is ```1.2.1-SNAPSHOT```.
 
 
 ```

org.eclipse.paho.client.eclipse.feature/feature.xml

@@ -3,8 +3,7 @@
 	id="org.eclipse.paho.client.eclipse.feature"
 	label="%featureName"
 	provider-name="%providerName"
-	version="1.1.1">
-
+	version="1.2.0">
 
 	<description url="http://www.eclipse.org/paho/">
 		%description

org.eclipse.paho.client.eclipse.feature/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.1.1</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.eclipse.feature</artifactId>

org.eclipse.paho.client.eclipse.view/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.paho.client.eclipse.view;singleton:=true
-Bundle-Version: 1.1.1
+Bundle-Version: 1.2.0
 Bundle-Activator: org.eclipse.paho.client.eclipse.view.Activator
 Bundle-Vendor: %bundle.provider
 Bundle-Localization: plugin

org.eclipse.paho.client.eclipse.view/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.1.1</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.eclipse.view</artifactId>

org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/Activator.java

@@ -1,10 +1,14 @@
-/*
+/*******************************************************************************
  * Copyright (c) 2012 Eurotech Inc. All rights reserved.
  *
  * 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
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
  *
  * Contributors:
  *    Chad Kienle

org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/ClientConstants.java

@@ -1,10 +1,14 @@
-/*
+/*******************************************************************************
  * Copyright (c) 2012 Eurotech Inc. All rights reserved.
  *
  * 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
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
  *
  * Contributors:
  *    Chad Kienle

org.eclipse.paho.client.eclipse.view/src/org/eclipse/paho/client/eclipse/view/MqttClientView.java

@@ -1,10 +1,14 @@
-/*
+/*******************************************************************************
  * Copyright (c) 2012 Eurotech Inc. All rights reserved.
  *
  * 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
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
  *
  * Contributors:
  *    Chad Kienle

org.eclipse.paho.client.mqttv3.internal.traceformat/build.xml

@@ -7,8 +7,8 @@
 	<property name="ship.folder" value="./target/ship" />
 	<!-- classpath.folder = ship.folder of org.eclipse.paho.client.mqttv3 build.xml -->
 	<property name="classpath.folder" value="../org.eclipse.paho.client.mqttv3/target/ship" />
-	<property name="client.release.version" value="1.1.1" />
-	<property name="bundleVersion" value="1.1.1" />
+	<property name="client.release.version" value="1.2.0" />
+	<property name="bundleVersion" value="1.2.0" />
 	<property name="bundleVendor" value="Eclipse.org" />
 	<property name="build.level" value="LYYMMDD" />
 	<property name="paho-client-v3-trace-jar" value="org.eclipse.paho.client.mqttv3.trace.jar" />

org.eclipse.paho.client.mqttv3.repository/category.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<bundle id="org.eclipse.paho.client.mqttv3" version="1.1.1">
+	<bundle id="org.eclipse.paho.client.mqttv3" version="1.2.0">
 		<category name="Paho MQTT Java"/>
 	</bundle>
-	<bundle id="org.eclipse.paho.client.eclipse.view" version="1.1.1">
+	<bundle id="org.eclipse.paho.client.eclipse.view" version="1.2.0">
 		<category name="Paho MQTT Java"/>
 	</bundle>
 	<category-def name="Paho MQTT Java" label="Paho MQTT Java">

org.eclipse.paho.client.mqttv3.repository/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.1.1</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.mqttv3.repository</artifactId>

org.eclipse.paho.client.mqttv3.test/.classpath

@@ -1,29 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.paho.client.mqttv3"/>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.paho.client.mqttv3"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

org.eclipse.paho.client.mqttv3.test/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7

org.eclipse.paho.client.mqttv3.test/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.1.1</version>
+		<version>1.2.0</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.mqttv3.test</artifactId>
@@ -47,14 +47,15 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.15</version>
 				<configuration>
-					<reuseForks>false</reuseForks>
-        			<forkCount>1</forkCount>
 					<systemPropertyVariables>
 						<SERVER_URI>${test.server_uri}</SERVER_URI>
+						<SERVER_SSL_PORT>${test.server_ssl_port}</SERVER_SSL_PORT>
+						<SERVER_WEBSOCKET_URI>${test.server_websocket_uri}</SERVER_WEBSOCKET_URI>
 					</systemPropertyVariables>
 					<excludes>
 						<exclude>${test.exclude}</exclude>
 					</excludes>
+					<runOrder>alphabetical</runOrder>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -64,7 +65,7 @@
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
 			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-			<version>1.1.1</version>
+			<version>1.2.0</version>
 		</dependency>
 
 		<dependency>

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/BasicTest.java

@@ -95,7 +95,7 @@ public static void tearDownAfterClass() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test(timeout=10000)
+  @Test
   public void testConnect() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);
@@ -141,7 +141,7 @@ public void testConnect() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test(timeout=10000)
+  @Test
   public void testHAConnect() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);
@@ -191,7 +191,7 @@ public void testHAConnect() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test(timeout=10000)
+  @Test
   public void testPubSub() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);
@@ -241,7 +241,7 @@ public void testPubSub() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test(timeout=10000)
+  @Test
   public void testMsgProperties() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);
@@ -309,7 +309,7 @@ public void testMsgProperties() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test(timeout=10000)
+  @Test
   public void testConnOptDefaults() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/Issue370Test.java

@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Red Hat Inc.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *     Red Hat Inc - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.paho.client.mqttv3.test;
+
+import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
+import org.eclipse.paho.client.mqttv3.MqttException;
+import org.junit.Test;
+
+/**
+ * This is a reproducer for issue #370
+ */
+public class Issue370Test {
+    @Test
+    public void noOpenClose() throws MqttException {
+        final MqttAsyncClient client = new MqttAsyncClient("tcp://localhost", "foo-bar");
+        client.close();
+    }
+}

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/LiveTakeOverTest.java

@@ -257,7 +257,7 @@ void repeatedlyPub() {
           }
           byte[] payload = ("Message payload " + getClass().getName() + ".publish" + (i++)).getBytes();
           MqttTopic mqttTopic = mqttClient.getTopic(FirstSubTopicString);
-          log.info("Publishing to..." + FirstSubTopicString);
+          log.fine("Publishing to..." + FirstSubTopicString);
           mqttTopic.publish(payload, 1, false);
 
         }
@@ -267,6 +267,7 @@ void repeatedlyPub() {
           // Its likely the publish rate is too high i.e. inflight window is full
         }
       }
+      log.info("Sent at least " + i + " messages.");
     }
 
     public void run() {

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/ModelTestCase.java

@@ -167,7 +167,7 @@ public static void tearDownAfterClass() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test(timeout=150000)
+  //@Test(timeout=150000)
   public void testRunModel() throws Exception {
     log.info("Test core operations and parameters by random selection");
     log.info("See file: " + logFilename + " for details of selected test sequence");