Merge remote-tracking branch 'eclipse/develop' into NetworkModule_SPI

Conflicts:
	org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/MqttConnectOptionsTest.java
	org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttAsyncClient.java

Author: Maik Scheibler

.gitattributes

@@ -0,0 +1,15 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+#* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.java text
+*.xml text
+*.md text
+*.html text
+*.yml text
+*.sh text
+
+*.class binary
+*.jar binary
+*.png binary

.gitignore

@@ -59,3 +59,6 @@ Icon
 # Maven
 log/
 target/
+
+
+*.log.*

.travis.yml

@@ -1,6 +1,6 @@
 sudo: true
 language: java
-
+install: true
 matrix:
   include:
     - os: linux
@@ -14,13 +14,13 @@ before_install:
   - ./start-broker.sh
 
 script:
-  - mvn clean
-  - mvn --projects org.eclipse.paho.client.mqttv3,org.eclipse.paho.client.mqttv3.test test
-  - mvn --projects org.eclipse.paho.mqttv5.common,org.eclipse.paho.mqttv5.client test
+  - 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 test -q
 
-addons:
-  apt:
-    sources:
-      - sourceline: 'ppa:mosquitto-dev/mosquitto-ppa'
-    packages:
-      - mosquitto
+#addons:
+#  apt:
+#    sources:
+#      - sourceline: 'ppa:mosquitto-dev/mosquitto-ppa'
+#    packages:
+#      - mosquitto

CONTRIBUTING.md

@@ -1,66 +1,66 @@
-# Contributing to Paho
-
-Thanks for your interest in this project!
-
-You can contribute bugfixes and new features by sending pull requests through GitHub.
-
-## Legal
-
-In order for your contribution to be accepted, it must comply with the Eclipse Foundation IP policy.
-
-Please read the [Eclipse Foundation policy on accepting contributions via Git](http://wiki.eclipse.org/Development_Resources/Contributing_via_Git).
-
-1. Sign the [Eclipse CLA](http://www.eclipse.org/legal/CLA.php)
-  1. Register for an Eclipse Foundation User ID. You can register [here](https://dev.eclipse.org/site_login/createaccount.php).
-  2. Log into the [Projects Portal](https://projects.eclipse.org/), and click on the '[Eclipse CLA](https://projects.eclipse.org/user/sign/cla)' link.
-2. Go to your [account settings](https://dev.eclipse.org/site_login/myaccount.php#open_tab_accountsettings) and add your GitHub username to your account.
-3. Make sure that you _sign-off_ your Git commits in the following format:
-  ``` Signed-off-by: John Smith <johnsmith@nowhere.com> ``` This is usually at the bottom of the commit message. You can automate this by adding the '-s' flag when you make the commits. e.g.   ```git commit -s -m "Adding a cool feature"```
-4. Ensure that the email address that you make your commits with is the same one you used to sign up to the Eclipse Foundation website with.
-
-## 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```
-4. Make your changes
-5. If developing a new feature, make sure to include JUnit tests.
-6. Ensure that all new and existing tests pass.
-7. Commit the changes into the branch: ``` git commit -s ``` Make sure that your commit message is meaningful and describes your changes correctly.
-8. If you have a lot of commits for the change, squash them into a single / few commits.
-9. Push the changes in your branch to your forked repository.
-10. Finally, go to [https://github.com/eclipse/paho.mqtt.java](https://github.com/eclipse/paho.mqtt.java) and create a pull request from your "YOUR_BRANCH_NAME" branch to the ```develop``` one to request review and merge of the commits in your pushed branch.
-
-
-What happens next depends on the content of the patch. If it is 100% authored
-by the contributor and is less than 1000 lines (and meets the needs of the
-project), then it can be pulled into the main repository. If not, more steps
-are required. These are detailed in the
-[legal process poster](http://www.eclipse.org/legal/EclipseLegalProcessPoster.pdf).
-
-
-
-## Developer resources:
-
-
-Information regarding source code management, builds, coding standards, and more.
-
-- [https://projects.eclipse.org/projects/iot.paho/developer](https://projects.eclipse.org/projects/iot.paho/developer)
-
-Contact:
---------
-
-Contact the project developers via the project's development
-[mailing list](https://dev.eclipse.org/mailman/listinfo/paho-dev).
-
-Search for bugs:
-----------------
-
-This project uses GitHub Issues here: [github.com/eclipse/paho.mqtt.java/issues](https://github.com/eclipse/paho.mqtt.java/issues) to track ongoing development and issues.
-
-Create a new bug:
------------------
-
-Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
-
-- [Create new Paho bug](https://github.com/eclipse/paho.mqtt.java/issues/new)
+# Contributing to Paho
+
+Thanks for your interest in this project!
+
+You can contribute bugfixes and new features by sending pull requests through GitHub.
+
+## Legal
+
+In order for your contribution to be accepted, it must comply with the Eclipse Foundation IP policy.
+
+Please read the [Eclipse Foundation policy on accepting contributions via Git](http://wiki.eclipse.org/Development_Resources/Contributing_via_Git).
+
+1. Sign the [Eclipse CLA](http://www.eclipse.org/legal/CLA.php)
+  1. Register for an Eclipse Foundation User ID. You can register [here](https://dev.eclipse.org/site_login/createaccount.php).
+  2. Log into the [Projects Portal](https://projects.eclipse.org/), and click on the '[Eclipse CLA](https://projects.eclipse.org/user/sign/cla)' link.
+2. Go to your [account settings](https://dev.eclipse.org/site_login/myaccount.php#open_tab_accountsettings) and add your GitHub username to your account.
+3. Make sure that you _sign-off_ your Git commits in the following format:
+  ``` Signed-off-by: John Smith <johnsmith@nowhere.com> ``` This is usually at the bottom of the commit message. You can automate this by adding the '-s' flag when you make the commits. e.g.   ```git commit -s -m "Adding a cool feature"```
+4. Ensure that the email address that you make your commits with is the same one you used to sign up to the Eclipse Foundation website with.
+
+## 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```
+4. Make your changes
+5. If developing a new feature, make sure to include JUnit tests.
+6. Ensure that all new and existing tests pass.
+7. Commit the changes into the branch: ``` git commit -s ``` Make sure that your commit message is meaningful and describes your changes correctly.
+8. If you have a lot of commits for the change, squash them into a single / few commits.
+9. Push the changes in your branch to your forked repository.
+10. Finally, go to [https://github.com/eclipse/paho.mqtt.java](https://github.com/eclipse/paho.mqtt.java) and create a pull request from your "YOUR_BRANCH_NAME" branch to the ```develop``` one to request review and merge of the commits in your pushed branch.
+
+
+What happens next depends on the content of the patch. If it is 100% authored
+by the contributor and is less than 1000 lines (and meets the needs of the
+project), then it can be pulled into the main repository. If not, more steps
+are required. These are detailed in the
+[legal process poster](http://www.eclipse.org/legal/EclipseLegalProcessPoster.pdf).
+
+
+
+## Developer resources:
+
+
+Information regarding source code management, builds, coding standards, and more.
+
+- [https://projects.eclipse.org/projects/iot.paho/developer](https://projects.eclipse.org/projects/iot.paho/developer)
+
+Contact:
+--------
+
+Contact the project developers via the project's development
+[mailing list](https://dev.eclipse.org/mailman/listinfo/paho-dev).
+
+Search for bugs:
+----------------
+
+This project uses GitHub Issues here: [github.com/eclipse/paho.mqtt.java/issues](https://github.com/eclipse/paho.mqtt.java/issues) to track ongoing development and issues.
+
+Create a new bug:
+-----------------
+
+Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
+
+- [Create new Paho bug](https://github.com/eclipse/paho.mqtt.java/issues/new)

java_client_testing.conf

@@ -0,0 +1,56 @@
+log_type error
+log_type warning
+log_type notice
+log_type information
+#loglevel debug
+
+#log_dest file /var/log/mosquitto/tls-testing.log
+
+# Allow large Packets
+maximum_packet_size 100000
+
+allow_anonymous true
+password_file test/tls-testing/mosquitto.pw
+
+#message_size_limit 5000000
+
+# non-SSL listeners
+listener 1883
+listener 18883
+
+# listener for mutual authentication
+listener 18884
+cafile tls_testing/keys/all-ca.crt
+certfile tls_testing/keys/server/server.crt
+keyfile tls_testing/keys/server/server.key
+require_certificate true
+use_identity_as_username false
+#tls_version tlsv1
+
+# server authentication - no client authentication
+listener 18885
+cafile tls_testing/keys/all-ca.crt
+certfile tls_testing/keys/server/server.crt
+keyfile tls_testing/keys/server/server.key
+require_certificate false
+#tls_version tlsv1
+
+listener 18886
+cafile tls_testing/keys/all-ca.crt
+certfile tls_testing/keys/server/server.crt
+keyfile tls_testing/keys/server/server.key
+require_certificate false
+#ciphers ADH-DES-CBC-SHA
+#tls_version tlsv1
+
+# server authentication - no client authentication - uses fake hostname to
+# simulate mitm attack. Clients should refuse to connect to this listener.
+listener 18887
+#cafile test/tls-testing/keys/all-ca.crt
+cafile tls_testing/keys/server/server.crt
+certfile tls_testing/keys/server/server-mitm.crt
+keyfile tls_testing/keys/server/server-mitm.key
+require_certificate true
+#tls_version tlsv1
+
+