Merge branch 'develop' into feature/bug-634-file-persistence-npe-2

Author: msqr

.github/ISSUE_TEMPLATE.md

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,7 @@
+Please make sure that the following boxes are checked before submitting your Pull Request, thank you!
+
+- [ ] This change is against the develop branch, **not** master.
+- [ ] You have signed the [Eclipse ECA](https://wiki.eclipse.org/ECA)
+- [ ] All of your commits have been signed-off with the correct email address (The same one that you used to sign the CLA) _Hint: use the -s argument when committing_.
+- [ ] If This PR fixes an issue, that you reference the issue below. OR if this is a new issue that you are fixing straight away that you add some Description about the bug and how this will fix it.
+- [ ] If this is new functionality, You have added the appropriate Unit tests.

.travis.yml

@@ -21,7 +21,7 @@ before_install:
 script:
   - mvn -B clean -q
   - mvn -B --projects org.eclipse.paho.client.mqttv3,org.eclipse.paho.client.mqttv3.test test -q
-  - mvn -B --projects org.eclipse.paho.mqttv5.common,org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
+# - mvn -B --projects org.eclipse.paho.mqttv5.common,org.eclipse.paho.mqttv5.client,org.eclipse.paho.mqttv5.client.test test -q
 
 #addons:
 #  apt:

LICENSE

@@ -0,0 +1,13 @@
+Eclipse Public License - v 2.0
+
+This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+  https://www.eclipse.org/legal/epl-2.0/
+and the Eclipse Distribution License is available at
+  https://www.eclipse.org/org/documents/edl-v10.php
+
+For an explanation of what dual-licensing means to you, see:
+https://www.eclipse.org/legal/eplfaq.php#DUALLIC

MQTTv3.md

@@ -11,7 +11,7 @@ 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.0``` and the current snapshot version is ```1.2.1-SNAPSHOT```.
+The latest release version is ```1.2.1``` and the current snapshot version is ```1.2.2-SNAPSHOT```.
 
 ```
 <project ...>
@@ -114,4 +114,4 @@ connectOptions.setCustomWebSocketHeaders(properties);
 
 client.connect(connectOptions);
 
-```
+```

NOTICE

@@ -0,0 +1,48 @@
+# Notices for Paho
+
+This content is produced and maintained by the Eclipse Paho project.
+
+ * Project home: https://projects.eclipse.org/projects/iot.paho
+
+## Trademarks
+
+Eclipse Paho is a trademark of the Eclipse Foundation. 
+Eclipse, and the Eclipse Logo are registered trademarks of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers.
+For more information regarding authorship of content, please consult the
+listed source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    https://www.eclipse.org/legal/epl-2.0/
+ * and the Eclipse Distribution License is available at 
+ *   https://www.eclipse.org/org/documents/edl-v10.php
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+Some of the project maintains the following relevant source code repositories:
+
+ * https://github.com/eclipse/paho.mqtt.java
+ * https://github.com/eclipse/paho.mqtt.testing
+
+## Third-party Content
+
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.

README.md

@@ -3,7 +3,7 @@
 
 The Paho Java Client is an MQTT client library written in Java for developing applications that run on the JVM or other Java compatible platforms such as Android
 
-The Paho Java Client provides two APIs: MqttAsyncClient provides a fully asychronous API where completion of activities is notified via registered callbacks. MqttClient is a synchronous wrapper around MqttAsyncClient where functions appear synchronous to the application.
+The Paho Java Client provides two APIs: MqttAsyncClient provides a fully asynchronous API where completion of activities is notified via registered callbacks. MqttClient is a synchronous wrapper around MqttAsyncClient where functions appear synchronous to the application.
 
 
 ## Project description:
@@ -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.2.0``` and the current snapshot version is ```1.2.1-SNAPSHOT```.
+The latest release version is ```1.2.1``` and the current snapshot version is ```1.2.2-SNAPSHOT```.
 
 
 ```

about.html

@@ -6,16 +6,16 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
 
-<p><em>December 9, 2013</em></p>	
+<p><em>September 23, 2019</em></p>	
 <h3>License</h3>
 
 <p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
+Eclipse Public License Version 2.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
 A copy of the EPL is available at 
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> 
+<a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a> 
 and a copy of the EDL is available at 
-<a href="http://www.eclipse.org/org/documents/edl-v10.php">http://www.eclipse.org/org/documents/edl-v10.php</a>. 
+<a href="https://www.eclipse.org/org/documents/edl-v10.php">https://www.eclipse.org/org/documents/edl-v10.php</a>. 
 For purposes of the EPL, "Program" will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is