Repository: incubator-edgent Updated Branches: refs/heads/master 64ef707c6 -> a2a29a9d7
[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 Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/04ee1f6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/04ee1f6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/04ee1f6a Branch: refs/heads/master Commit: 04ee1f6aae7794fef5ce7900e1b92fb9b057c79a Parents: 261c7ee Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Mon Feb 20 10:12:29 2017 -0500 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Mon Feb 20 13:13:00 2017 -0500 ---------------------------------------------------------------------- RELEASE_NOTES | 11 +++++---- binary-release/LICENSE | 4 ++-- build.gradle | 2 +- connectors/.classpath | 2 +- connectors/mqtt/build.gradle | 2 +- connectors/mqtt/build.xml | 2 +- licenses/binary-release/mqttv3-1.0.2.EDL-1.0 | 28 ---------------------- scripts/connectors/iotp/runiotpquickstart.sh | 11 --------- scripts/connectors/iotp/runiotpquickstart2.sh | 9 +------ 9 files changed, 14 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/04ee1f6a/RELEASE_NOTES ---------------------------------------------------------------------- diff --git a/RELEASE_NOTES b/RELEASE_NOTES index f325eb0..4261eba 100644 --- a/RELEASE_NOTES +++ b/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,7 +17,7 @@ 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. @@ -23,7 +25,8 @@ EDGENT-379 - upgrade to the WIoTP 0.2.2 Java client API 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 -------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/04ee1f6a/binary-release/LICENSE ---------------------------------------------------------------------- diff --git a/binary-release/LICENSE b/binary-release/LICENSE index b6c6f3d..39e4bcd 100644 --- a/binary-release/LICENSE +++ b/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 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/04ee1f6a/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 4aab605..5be458d 100644 --- a/build.gradle +++ b/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', http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/04ee1f6a/connectors/.classpath ---------------------------------------------------------------------- diff --git a/connectors/.classpath b/connectors/.classpath index b8ba495..b9abe61 100644 --- a/connectors/.classpath +++ b/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"/> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/04ee1f6a/connectors/mqtt/build.gradle ---------------------------------------------------------------------- diff --git a/connectors/mqtt/build.gradle b/connectors/mqtt/build.gradle index 9af84d3..2d1d32e 100644 --- a/connectors/mqtt/build.gradle +++ b/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 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/04ee1f6a/connectors/mqtt/build.xml ---------------------------------------------------------------------- diff --git a/connectors/mqtt/build.xml b/connectors/mqtt/build.xml index d7dd2c1..37de4ff 100644 --- a/connectors/mqtt/build.xml +++ b/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"> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/04ee1f6a/licenses/binary-release/mqttv3-1.0.2.EDL-1.0 ---------------------------------------------------------------------- diff --git a/licenses/binary-release/mqttv3-1.0.2.EDL-1.0 b/licenses/binary-release/mqttv3-1.0.2.EDL-1.0 deleted file mode 100644 index 6555a44..0000000 --- a/licenses/binary-release/mqttv3-1.0.2.EDL-1.0 +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> -<html xmlns="http://www.w3.org/1999/xhtml";><head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>About</title> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p><em>December 9, 2013</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"). -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> -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>. -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 -being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was -provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at <a href="http://www.eclipse.org/";>http://www.eclipse.org</a>.</p> - -</body></html> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/04ee1f6a/scripts/connectors/iotp/runiotpquickstart.sh ---------------------------------------------------------------------- diff --git a/scripts/connectors/iotp/runiotpquickstart.sh b/scripts/connectors/iotp/runiotpquickstart.sh index f6c9814..c2c9ebb 100755 --- a/scripts/connectors/iotp/runiotpquickstart.sh +++ b/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. # http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/04ee1f6a/scripts/connectors/iotp/runiotpquickstart2.sh ---------------------------------------------------------------------- diff --git a/scripts/connectors/iotp/runiotpquickstart2.sh b/scripts/connectors/iotp/runiotpquickstart2.sh index fe3ace1..4a1ff9f 100755 --- a/scripts/connectors/iotp/runiotpquickstart2.sh +++ b/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.
