From 7fcf6890fdf7084843f3d5a2dcc83d33d07dafe8 Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Wed, 13 Dec 2023 09:59:37 -0800 Subject: [PATCH 1/3] remove mqtt5 dev preview disclaimer --- documents/MQTT5_Userguide.md | 7 ------- samples/Mqtt5/PubSub/README.md | 2 -- samples/Mqtt5/SharedSubscription/README.md | 2 -- .../amazon/awssdk/iot/AwsIotMqtt5ClientBuilder.java | 4 ---- 4 files changed, 15 deletions(-) diff --git a/documents/MQTT5_Userguide.md b/documents/MQTT5_Userguide.md index 471ac8efb..2964998aa 100644 --- a/documents/MQTT5_Userguide.md +++ b/documents/MQTT5_Userguide.md @@ -1,6 +1,5 @@ # Table of Contents -* [Developer Preview Disclaimer](#developer-preview-disclaimer) * [Introduction](#introduction) * [MQTT5 differences relative to MQTT311 implementation](#mqtt5-differences-relative-to-mqtt311-implementation) * [Major Changes](#major-changes) @@ -24,12 +23,6 @@ * [How to Subscribe and Unsubscribe](#how-to-subscribe-and-unsubscribe) * [MQTT5 Best Practices](#mqtt5-best-practices) -# Developer Preview Disclaimer - -MQTT5 support is currently in **developer preview**. We encourage feedback at all times, but feedback during the preview window is especially valuable in shaping the final product. During the preview period we may make backwards-incompatible changes to the public API, but in general, this is something we will try our best to avoid. - -The MQTT5 client cannot yet be used with the AWS IoT MQTT services (Shadow, Jobs, Fleet-Provisioning/Identity). We plan to address this in the near future. - # Introduction This user guide is designed to act as a reference and guide for how to use MQTT5 with the Java SDK. This guide includes code snippets for how to make a MQTT5 client with proper configuration, how to connect to AWS IoT Core, how to perform operations and interact with AWS IoT Core through MQTT5, and some best practices for MQTT5. diff --git a/samples/Mqtt5/PubSub/README.md b/samples/Mqtt5/PubSub/README.md index 56f1ce7ac..209f8e49d 100644 --- a/samples/Mqtt5/PubSub/README.md +++ b/samples/Mqtt5/PubSub/README.md @@ -8,8 +8,6 @@ for AWS IoT to send and receive messages through an MQTT connection using MQTT5. MQTT5 introduces additional features and enhancements that improve the development experience with MQTT. You can read more about MQTT5 in the Java V2 SDK by checking out the [MQTT5 user guide](../../../documents/MQTT5_Userguide.md). -Note: MQTT5 support is currently in **developer preview**. We encourage feedback at all times, but feedback during the preview window is especially valuable in shaping the final product. During the preview period we may make backwards-incompatible changes to the public API, but in general, this is something we will try our best to avoid. - Your IoT Core Thing's [Policy](https://docs.aws.amazon.com/iot/latest/developerguide/iot-policies.html) must provide privileges for this sample to connect, subscribe, publish, and receive. Below is a sample policy that can be used on your IoT Core Thing that will allow this sample to run as intended.
diff --git a/samples/Mqtt5/SharedSubscription/README.md b/samples/Mqtt5/SharedSubscription/README.md index f5e2ff14c..8b8cf8a65 100644 --- a/samples/Mqtt5/SharedSubscription/README.md +++ b/samples/Mqtt5/SharedSubscription/README.md @@ -8,8 +8,6 @@ for AWS IoT to send and receive messages over a MQTT5 connection using a shared MQTT5 introduces additional features and enhancements that improve the development experience with MQTT. You can read more about MQTT5 in the Java V2 SDK by checking out the [MQTT5 user guide](../../../documents/MQTT5_Userguide.md). -Note: MQTT5 support is currently in **developer preview**. We encourage feedback at all times, but feedback during the preview window is especially valuable in shaping the final product. During the preview period we may make backwards-incompatible changes to the public API, but in general, this is something we will try our best to avoid. - [Shared Subscriptions](https://docs.aws.amazon.com/iot/latest/developerguide/mqtt.html#mqtt5-shared-subscription) allow IoT devices to connect to a group where messages sent to a topic are then relayed to the group in a round-robin-like fashion. This is useful for distributing message load across multiple subscribing MQTT5 clients automatically. This is helpful for load balancing when you have many messages that need to be processed. Shared Subscriptions rely on a group name/identifier, which tells the MQTT5 broker/server which IoT devices to treat as a group for message distribution. This is done when subscribing by formatting the subscription topic like the following: `$share//`. diff --git a/sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqtt5ClientBuilder.java b/sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqtt5ClientBuilder.java index 0f7b4e2bd..657ab5df5 100644 --- a/sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqtt5ClientBuilder.java +++ b/sdk/src/main/java/software/amazon/awssdk/iot/AwsIotMqtt5ClientBuilder.java @@ -34,10 +34,6 @@ /** * Builders for making MQTT5 clients with different connection methods for AWS IoT Core. - * - * MQTT5 support is currently in developer preview. We encourage feedback at all times, but feedback during the - * preview window is especially valuable in shaping the final product. During the preview period we may make - * backwards-incompatible changes to the public API, but in general, this is something we will try our best to avoid. */ public class AwsIotMqtt5ClientBuilder extends software.amazon.awssdk.crt.CrtResource { private static Long DEFAULT_WEBSOCKET_MQTT_PORT = 443L; From e8928ac53bd3172f4e9b99f7bd3dbacd00f83f30 Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Wed, 13 Dec 2023 15:06:40 -0800 Subject: [PATCH 2/3] update crt-java version --- android/iotdevicesdk/build.gradle | 2 +- sdk/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/iotdevicesdk/build.gradle b/android/iotdevicesdk/build.gradle index dce7d0132..d3ff1ca68 100644 --- a/android/iotdevicesdk/build.gradle +++ b/android/iotdevicesdk/build.gradle @@ -92,7 +92,7 @@ repositories { } dependencies { - api 'software.amazon.awssdk.crt:aws-crt-android:0.28.11' + api 'software.amazon.awssdk.crt:aws-crt-android:0.29.0' implementation 'org.slf4j:slf4j-api:1.7.30' implementation 'com.google.code.gson:gson:2.9.0' implementation 'androidx.appcompat:appcompat:1.1.0' diff --git a/sdk/pom.xml b/sdk/pom.xml index 9d8fc7761..56d6c4dae 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -42,7 +42,7 @@ software.amazon.awssdk.crt aws-crt - 0.28.11 + 0.29.0 org.slf4j From 77a74e7bb22a739682bb7c77a8e8b7e84a744549 Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Wed, 13 Dec 2023 16:32:12 -0800 Subject: [PATCH 3/3] kick ci