Merge branch '1.1.1'

Signed-off-by: James Sutton <[email protected]>

Author: jpwsutton

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 Please fill out the form below before submitting, thank you!
 
-- [ ] Bug exists Release Version 1.1.0 ( Master Branch)
-- [ ] Bug exists in Snapshot Version 1.1.1-SNAPSHOT (Develop Branch)
+- [ ] Bug exists Release Version 1.1.1 ( Master Branch)
+- [ ] Bug exists in Snapshot Version 1.1.2-SNAPSHOT (Develop Branch)
 
 If this is a bug regarding the Android Service, please raise the bug here instead: https://github.com/eclipse/paho.mqtt.android/issues/new

README.md

@@ -31,7 +31,9 @@ Eclipse hosts a Nexus repository for those who want to use Maven to manage their
 Add the repository definition and the dependency definition shown below to your pom.xml.
 
 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.0``` and the current snapshot version is ```1.1.1-SNAPSHOT```.
+
+The latest release version is ```1.1.1``` and the current snapshot version is ```1.1.2-SNAPSHOT```.
+
 
 ```
 <project ...>

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

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

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

@@ -1,12 +1,12 @@
 <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">
 	<modelVersion>4.0.0</modelVersion>
-	
+
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.1</version>
 	</parent>
-	
+
 	<artifactId>org.eclipse.paho.client.eclipse.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
 

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.0
+Bundle-Version: 1.1.1
 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,19 +4,19 @@
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.1</version>
 	</parent>
-	
+
 	<artifactId>org.eclipse.paho.client.eclipse.view</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	
+
 	<build>
 		<plugins>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-compiler-plugin</artifactId>
@@ -27,7 +27,7 @@
 					<target>${java.version}</target>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -56,5 +56,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project> 
-
+</project>

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

@@ -7,9 +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.0" />
-	<property name="bundleVersion" value="1.1.0" />
+	<property name="client.release.version" value="1.1.1" />
+	<property name="bundleVersion" value="1.1.1" />
 	<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.0">
+	<bundle id="org.eclipse.paho.client.mqttv3" version="1.1.1">
 		<category name="Paho MQTT Java"/>
 	</bundle>
-	<bundle id="org.eclipse.paho.client.eclipse.view" version="1.1.0">
+	<bundle id="org.eclipse.paho.client.eclipse.view" version="1.1.1">
 		<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,14 +3,14 @@
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.1</version>
 	</parent>
-	
+
 	<artifactId>org.eclipse.paho.client.mqttv3.repository</artifactId>
 	<packaging>eclipse-repository</packaging>
-	
+
 	<name>Paho P2 Repository</name>
-	
+
 	<build>
 		<plugins>
 			<plugin>
@@ -60,7 +60,7 @@
 							<sourceLocation>${project.build.directory}/repository</sourceLocation>
 						</configuration>
 					</execution>
-				</executions> 
+				</executions>
 			</plugin> -->
 		</plugins>
 	</build>

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.0</version>
+		<version>1.1.1</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.mqttv3.test</artifactId>
@@ -47,13 +47,14 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.15</version>
 				<configuration>
+					<reuseForks>false</reuseForks>
+        			<forkCount>1</forkCount>
 					<systemPropertyVariables>
 						<SERVER_URI>${test.server_uri}</SERVER_URI>
 					</systemPropertyVariables>
 					<excludes>
 						<exclude>${test.exclude}</exclude>
 					</excludes>
-					<excludedGroups>org.eclipse.paho.client.mqttv3.test.ManualTest</excludedGroups>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -63,7 +64,7 @@
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
 			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-			<version>1.1.0</version>
+			<version>1.1.1</version>
 		</dependency>
 
 		<dependency>

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

@@ -15,15 +15,11 @@
 
 import java.io.File;
 import java.net.URI;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.eclipse.paho.client.mqttv3.IMqttClient;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.eclipse.paho.client.mqttv3.MqttTopic;
 import org.eclipse.paho.client.mqttv3.test.client.MqttClientFactoryPaho;
 import org.eclipse.paho.client.mqttv3.test.logging.LoggingUtilities;
@@ -51,6 +47,8 @@ public class BasicSSLTest {
   private static MqttClientFactoryPaho clientFactory;
   private static File keystorePath;
   private static int messageSize = 100000;
+  private static String topicPrefix;
+
 
   /**
    * @throws Exception 
@@ -66,6 +64,8 @@ public static void setUpBeforeClass() throws Exception {
       serverHost = serverURI.getHost();
       clientFactory = new MqttClientFactoryPaho();
       clientFactory.open();
+      topicPrefix = "BasicSSLTest-" + UUID.randomUUID().toString() + "-";
+
     }
     catch (Exception exception) {
       log.log(Level.SEVERE, "caught exception:", exception);
@@ -97,7 +97,7 @@ public static void tearDownAfterClass() throws Exception {
    * An ssl connection with server cert authentication, simple pub/sub
    * @throws Exception
    */
-  @Test
+  @Test(timeout=10000)
   public void testSSL() throws Exception {
     URI serverURI = new URI("ssl://" + serverHost + ":" + TestProperties.getServerSSLPort());
     String methodName = Utility.getMethodName();
@@ -118,7 +118,7 @@ public void testSSL() throws Exception {
       log.info("Connecting...(serverURI:" + serverURI + ", ClientId:" + methodName);
       mqttClient.connect();
 
-      String[] topicNames = new String[]{methodName + "/Topic"};
+      String[] topicNames = new String[]{topicPrefix + methodName + "/Topic"};
       int[] topicQos = {2};
       log.info("Subscribing to..." + topicNames[0]);
       mqttClient.subscribe(topicNames, topicQos);
@@ -160,7 +160,7 @@ public void testSSL() throws Exception {
    * An ssl connection with server cert authentication, small workload with multiple clients
    * @throws Exception
    */
-  @Test
+  @Test(timeout=60000)
   public void testSSLWorkload() throws Exception {
     URI serverURI = new URI("ssl://" + serverHost + ":" + TestProperties.getServerSSLPort());
     String methodName = Utility.getMethodName();
@@ -170,7 +170,7 @@ public void testSSLWorkload() throws Exception {
     IMqttClient[] mqttPublisher = new IMqttClient[4];
     IMqttClient[] mqttSubscriber = new IMqttClient[20];
     try {
-      String[] topicNames = new String[]{methodName + "/Topic"};
+      String[] topicNames = new String[]{topicPrefix + methodName + "/Topic"};
       int[] topicQos = {0};
 
       MqttTopic[] mqttTopic = new MqttTopic[mqttPublisher.length];
@@ -256,7 +256,7 @@ public void testSSLWorkload() throws Exception {
    * 'messageSize' defined at start of test, change it to meet your requirements
    * @throws Exception
    */
-  @Test
+  @Test(timeout=10000)
   public void testSSLLargeMessage() throws Exception {
     URI serverURI = new URI("ssl://" + serverHost + ":" + TestProperties.getServerSSLPort());
     String methodName = Utility.getMethodName();
@@ -278,7 +278,7 @@ public void testSSLLargeMessage() throws Exception {
       log.info("Connecting...(serverURI:" + serverURI + ", ClientId:" + methodName);
       mqttClient.connect();
 
-      String[] topicNames = new String[]{methodName + "/Topic"};
+      String[] topicNames = new String[]{topicPrefix + methodName + "/Topic"};
       int[] topicQos = {2};
       log.info("Subscribing to..." + topicNames[0]);
       mqttClient.subscribe(topicNames, topicQos);
@@ -322,7 +322,7 @@ public void testSSLLargeMessage() throws Exception {
    * A non ssl connection to an ssl channel
    * @throws Exception
    */
-  @Test
+  @Test(timeout=10000)
   public void testNonSSLtoSSLChannel() 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/BasicTest.java

@@ -15,6 +15,7 @@
 
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -47,6 +48,8 @@ public class BasicTest {
 
   private static URI serverURI;
   private static MqttClientFactoryPaho clientFactory;
+  private static String topicPrefix;
+
 
   /**
    * @throws Exception 
@@ -61,6 +64,8 @@ public static void setUpBeforeClass() throws Exception {
       serverURI = TestProperties.getServerURI();
       clientFactory = new MqttClientFactoryPaho();
       clientFactory.open();
+      topicPrefix = "BasicTest-" + UUID.randomUUID().toString() + "-";
+
     }
     catch (Exception exception) {
       log.log(Level.SEVERE, "caught exception:", exception);
@@ -90,7 +95,7 @@ public static void tearDownAfterClass() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test
+  @Test(timeout=10000)
   public void testConnect() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);
@@ -136,7 +141,7 @@ public void testConnect() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test
+  @Test(timeout=10000)
   public void testHAConnect() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);
@@ -186,14 +191,14 @@ public void testHAConnect() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test
+  @Test(timeout=10000)
   public void testPubSub() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);
 
     IMqttClient client = null;
     try {
-      String topicStr = "topic" + "_02";
+      String topicStr = topicPrefix + "topic" + "_02";
       String clientId = methodName;
       client = clientFactory.createMqttClient(serverURI, clientId);
 
@@ -236,7 +241,7 @@ public void testPubSub() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test
+  @Test(timeout=10000)
   public void testMsgProperties() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);
@@ -304,7 +309,7 @@ public void testMsgProperties() throws Exception {
   /**
    * @throws Exception 
    */
-  @Test
+  @Test(timeout=10000)
   public void testConnOptDefaults() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);