[Edgent-380] update MQTT connector to include paho-mqtt 1.1.0

- update RELEASE-NOTES
- update build.gradle and .classpath files
- update LICENSE and binary license files

RELEASE_NOTES

@@ -1,9 +1,11 @@
-Apache Edgent (incubating) 1.?.?
+Apache Edgent (incubating) 1.1.0
 ==================
-This release blah blah blah...
+
+This release includes a number of minor bugfixes and enhancements listed below.
 
 See EDGENT-379 below for important information related to the 
 Edgent connector for the IBM Watson IoT Platform.
+See EDGENT-380 below for information about the MQTT connector.
 
 New Features
 --------------------
@@ -15,15 +17,16 @@ TODO
 
 Miscellaneous changes
 ---------------------
-EDGENT-379 - upgrade to the WIoTP 0.2.2 Java client API
+EDGENT-379  Upgrade to the WIoTP 0.2.2 Java client API
    Upgrade the Edgent connector for the IBM Watson IoT Platform to use
    the WIoTP 0.2.2 Java client API.
    Note: the WIoTP API changed the way it publishes device events.
    See the "Migration from release 0.1.5 to 0.2.1" information at
    https://github.com/ibm-watson-iot/iot-java/tree/master#migration-from-release-015-to-021
    for details including how to revert the behavior if needed.
    See https://github.com/ibm-watson-iot/iot-java/releases
-   for general release information about the WIoTP Java client API.  
+   for general release information about the WIoTP Java client API.
+EDGENT-380  Upgrade the MQTT connector to use paho-mqtt 1.1.0
 
 Known Issues
 --------

binary-release/LICENSE

@@ -305,8 +305,8 @@ connectors/kafka/ext
 
 --------------------------------
 connectors/mqtt/ext
-  org.eclipse.paho.client.mqttv3-1.0.2.jar  org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2
-        LICENSE: EDL-1.0            For details, see licenses/binary-release/mqttv3-1.0.2.EDL-1.0
+  org.eclipse.paho.client.mqttv3-1.1.0.jar  org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0
+        LICENSE: EDL-1.0            For details, see licenses/binary-release/mqttv3-1.1.0.EDL-1.0
 
 --------------------------------
 connectors/edgent.javax.websocket/ext

build.gradle

@@ -76,7 +76,7 @@ rat {
     'licenses/d3.BSD',                        // OK, BSD 3-clause
     'licenses/binary-release/javax.servlet-api-3.1.0.CDDL-1.0',  // OK, only binary form content
     'licenses/binary-release/javax.websocket-api-1.0.CDDL-1.1',  // OK, only binary form content
-    'licenses/binary-release/mqttv3-1.0.2.EDL-1.0',  // OK, EDL-1.0
+    'licenses/binary-release/mqttv3-1.1.0.EDL-1.0',  // OK, EDL-1.0
     'licenses/binary-release/mqttv3-1.1.0.EDL-1.0',  // OK, EDL-1.0
     'licenses/binary-release/watson-iot-0.2.2.EPL-1.0',  // OK, only binary form content
     'samples/**/*.properties',

connectors/.classpath

@@ -48,7 +48,7 @@
 	<classpathentry kind="lib" path="../externalJars/java8/connectors/kafka/ext/scala-library-2.10.4.jar"/>
 	<classpathentry kind="lib" path="../externalJars/java8/connectors/kafka/ext/zkclient-0.3.jar"/>
 	<classpathentry kind="lib" path="../externalJars/java8/connectors/kafka/ext/zookeeper-3.4.6.jar"/>
-	<classpathentry kind="lib" path="../externalJars/java8/connectors/mqtt/ext/org.eclipse.paho.client.mqttv3-1.0.2.jar"/>
+	<classpathentry kind="lib" path="../externalJars/java8/connectors/mqtt/ext/org.eclipse.paho.client.mqttv3-1.1.0.jar"/>
 	<classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-client/ext/javax-websocket-client-impl-9.3.6.v20151106.jar"/>
 	<classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-client/ext/javax.websocket-api-1.0.jar"/>
 	<classpathentry kind="lib" path="../externalJars/java8/connectors/javax.websocket-client/ext/jetty-util-9.3.6.v20151106.jar"/>

connectors/mqtt/build.gradle

@@ -20,7 +20,7 @@ dependencies {
   addTargetDirProjectJarDependency 'compile', ':api:topology'
   addTargetDirProjectJarDependency 'compile', ':connectors:iot'
   addTargetDirProjectJarDependency 'compile', ':connectors:common'
-  addProjectExtDependency 'compile', 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2'
+  addProjectExtDependency 'compile', 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
 
   addTargetDirProjectJarDependency 'testCompile', ':providers:direct'
   // N.B. root project adds test common dependencies

connectors/mqtt/build.xml

@@ -30,7 +30,7 @@
     <pathelement location="${edgent.lib}/edgent.api.topology.jar" />
     <pathelement location="${edgent.connectors}/common/lib/edgent.connectors.common.jar" />
     <pathelement location="${edgent.connectors}/iot/lib/edgent.connectors.iot.jar" />
-    <pathelement location="${component.ext}/org.eclipse.paho.client.mqttv3-1.0.2.jar"/>
+    <pathelement location="${component.ext}/org.eclipse.paho.client.mqttv3-1.1.0.jar"/>
   </path>
 
   <path id="test.compile.classpath">

scripts/connectors/iotp/runiotpquickstart.sh

@@ -31,17 +31,6 @@ edgent=../../..
 
 export CLASSPATH=${edgent}/samples/lib/edgent.samples.connectors.jar
 
-java org.apache.edgent.samples.connectors.iotp.IotpQuickstart
-
-# Avoid a paho mqtt class security exception.
-# The connector samples jar has dependencies on both the iotp and mqtt connectors
-# and those have dependencies on different versions of the paho mqtt jar.
-# Ensure the right one is used for this sample.
-#
-#export CLASSPATH=${edgent}/samples/lib/edgent.samples.connectors.jar
-IOTP_MQTT_JAR=`ls ${edgent}/connectors/iotp/ext/org.eclipse.paho.client.mqtt*.jar`
-export CLASSPATH=${IOTP_MQTT_JAR}:${edgent}/samples/lib/edgent.samples.connectors.jar
-
 # https://github.com/ibm-watson-iot/iot-java/tree/master#migration-from-release-015-to-021
 # Uncomment the following to use the pre-0.2.1 WIoTP client behavior.
 #

scripts/connectors/iotp/runiotpquickstart2.sh

@@ -29,14 +29,7 @@ edgent=../../..
 # to see the data being sent from this sample to
 # IBM Watson IoT Platform Quickstart sample.
 
-# Avoid a paho mqtt class security exception.
-# The connector samples jar has dependencies on both the iotp and mqtt connectors
-# and those have dependencies on different versions of the paho mqtt jar.
-# Ensure the right one is used for this sample.
-#
-#export CLASSPATH=${edgent}/samples/lib/edgent.samples.connectors.jar
-IOTP_MQTT_JAR=`ls ${edgent}/connectors/iotp/ext/org.eclipse.paho.client.mqtt*.jar`
-export CLASSPATH=${IOTP_MQTT_JAR}:${edgent}/samples/lib/edgent.samples.connectors.jar
+export CLASSPATH=${edgent}/samples/lib/edgent.samples.connectors.jar
 
 # https://github.com/ibm-watson-iot/iot-java/tree/master#migration-from-release-015-to-021
 # Uncomment the following to use the pre-0.2.1 WIoTP client behavior.