Merging in Version 1.2.0

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

Author: jpwsutton

.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