Merge branch 'master' into develop

Author: Ranjan Dasgupta

.github/ISSUE_TEMPLATE.md

@@ -2,6 +2,7 @@ Please fill out the form below before submitting, thank you!
 
 - [ ] Bug exists Release Version 1.2.3 ( Master Branch)
 - [ ] Bug exists in MQTTv3 Client on Snapshot Version 1.2.4-SNAPSHOT (Develop Branch)
-- [ ] Bug exists in MQTTv5 Client on Snapshot Version 1.2.4-SNAPSHOT (Develop Branch)
+- [ ] Bug exists in MQTTv5 Client on Snapshot Version 1.2.3-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

MQTTv3.md

@@ -11,8 +11,10 @@ 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.2.3``` and the current snapshot version is ```1.2.4-SNAPSHOT```.
 
+
 ```
 <project ...>
 <repositories>

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

@@ -8,8 +8,8 @@
 	<!-- 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.2.2.qualifier" />
-	<property name="bundleVersion" value="1.2.2.qualifier" />
+	<property name="client.release.version" value="1.2.2" />
+	<property name="bundleVersion" value="1.2.2" />
 
 	<property name="bundleVendor" value="Eclipse.org" />
 	<property name="build.level" value="LYYMMDD" />

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-	<bundle id="org.eclipse.paho.client.mqttv3" version="1.2.2.qualifier">
+	<bundle id="org.eclipse.paho.client.mqttv3" version="1.2.2">
 		<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.2.2-SNAPSHOT</version>
+		<version>1.2.2</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.mqttv3.repository</artifactId>

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.2</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.mqttv3.test</artifactId>
@@ -86,7 +86,7 @@
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
 			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.2.2</version>
 		</dependency>
 
 		<dependency>

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

@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundle.name
 Bundle-SymbolicName: org.eclipse.paho.client.mqttv3
-Bundle-Version: 1.2.2.qualifier
+Bundle-Version: 1.2.2
 Bundle-Localization: bundle
-Export-Package: org.eclipse.paho.client.mqttv3;version="1.2.2.qualifier",
- org.eclipse.paho.client.mqttv3.logging;version="1.2.2.qualifier",
- org.eclipse.paho.client.mqttv3.persist;version="1.2.2.qualifier",
- org.eclipse.paho.client.mqttv3.util;version="1.2.2.qualifier"
+Export-Package: org.eclipse.paho.client.mqttv3;version="1.2.2",
+ org.eclipse.paho.client.mqttv3.logging;version="1.2.2",
+ org.eclipse.paho.client.mqttv3.persist;version="1.2.2",
+ org.eclipse.paho.client.mqttv3.util;version="1.2.2"
 Bundle-Vendor: %bundle.provider
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

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

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.2</version>
 	</parent>
 
 	<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
@@ -133,5 +133,5 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-<version>1.2.2-SNAPSHOT</version>
+<version>1.2.2</version>
 </project>

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

@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.paho</groupId>
     <artifactId>java-parent</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
   </parent>
   <groupId>org.eclipse.paho.mqttv5.client.test</groupId>
   <artifactId>org.eclipse.paho.mqttv5.client.test</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
   <name>org.eclipse.paho.mqttv5.client.test</name>
   <url>http://maven.apache.org</url>
   <properties>
@@ -50,12 +50,12 @@
     <dependency>
     	<groupId>org.eclipse.paho</groupId>
     	<artifactId>org.eclipse.paho.mqttv5.common</artifactId>
-    	<version>1.2.2-SNAPSHOT</version>
+    	<version>1.2.2</version>
     </dependency>
     <dependency>
     	<groupId>org.eclipse.paho</groupId>
     	<artifactId>org.eclipse.paho.mqttv5.client</artifactId>
-    	<version>1.2.2-SNAPSHOT</version>
+    	<version>1.2.2</version>
     </dependency>
   </dependencies>
 

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

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.paho</groupId>
 		<artifactId>java-parent</artifactId>
-		<version>1.2.2-SNAPSHOT</version>
+		<version>1.2.2</version>
 	</parent>
 	<artifactId>org.eclipse.paho.mqttv5.client</artifactId>
 	<name>org.eclipse.paho.mqttv5.client</name>
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
 			<artifactId>org.eclipse.paho.mqttv5.common</artifactId>
-			<version>1.2.2-SNAPSHOT</version>
+			<version>1.2.2</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>