diff --git a/RELEASE_NOTES b/RELEASE_NOTES index f325eb02..4261ebaf 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 -------- diff --git a/binary-release/LICENSE b/binary-release/LICENSE index b6c6f3de..39e4bcd2 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 diff --git a/build.gradle b/build.gradle index 4aab6050..5be458d8 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', diff --git a/connectors/.classpath b/connectors/.classpath index b8ba495c..b9abe617 100644 --- a/connectors/.classpath +++ b/connectors/.classpath @@ -48,7 +48,7 @@ - + diff --git a/connectors/mqtt/build.gradle b/connectors/mqtt/build.gradle index 9af84d37..2d1d32ef 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 diff --git a/connectors/mqtt/build.xml b/connectors/mqtt/build.xml index d7dd2c1d..37de4ff2 100644 --- a/connectors/mqtt/build.xml +++ b/connectors/mqtt/build.xml @@ -30,7 +30,7 @@ - + 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 6555a44e..00000000 --- a/licenses/binary-release/mqttv3-1.0.2.EDL-1.0 +++ /dev/null @@ -1,28 +0,0 @@ - - - -About - - -

About This Content

- -

December 9, 2013

-

License

- -

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 -http://www.eclipse.org/legal/epl-v10.html -and a copy of the EDL is available at -http://www.eclipse.org/org/documents/edl-v10.php. -For purposes of the EPL, "Program" will mean the Content.

- -

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 http://www.eclipse.org.

- - diff --git a/scripts/connectors/iotp/runiotpquickstart.sh b/scripts/connectors/iotp/runiotpquickstart.sh index f6c98149..c2c9ebbf 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. # diff --git a/scripts/connectors/iotp/runiotpquickstart2.sh b/scripts/connectors/iotp/runiotpquickstart2.sh index fe3ace19..4a1ff9fc 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.