Pull in s2n shutdown fix via crt; add resource waits on samples (#148)

* Pull in s2n shutdown fix via crt; add resource waits on samples
* Add long operation timeout to support tls shutdown delay for device advisor

Author: bretambrose

README.md

@@ -50,7 +50,7 @@ mvn clean install
 ``` sh
 # NOTE: use the latest version of the CRT here
 
-git clone --branch v0.11.3 https://github.com/awslabs/aws-crt-java.git
+git clone --branch v0.11.5 https://github.com/awslabs/aws-crt-java.git
 
 git clone https://github.com/awslabs/aws-iot-device-sdk-java-v2.git
 cd aws-crt-java
@@ -65,7 +65,7 @@ Supports API 26 or newer.
 NOTE: The shadow sample does not currently complete on android due to its dependence on stdin keyboard input.
 
 ``` sh
-git clone --recursive --branch v0.11.3 https://github.com/awslabs/aws-crt-java.git
+git clone --recursive --branch v0.11.5 https://github.com/awslabs/aws-crt-java.git
 git clone https://github.com/awslabs/aws-iot-device-sdk-java-v2.git
 cd aws-crt-java/android
 ./gradlew connectedCheck # optional, will run the unit tests on any connected devices/emulators
@@ -86,7 +86,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'software.amazon.awssdk.crt:android:0.11.3'
+    implementation 'software.amazon.awssdk.crt:android:0.11.5'
 }
 ```
 

android/app/build.gradle

@@ -50,7 +50,7 @@ repositories {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(":iotdevicesdk")
-    implementation 'software.amazon.awssdk.crt:android:0.11.3'
+    implementation 'software.amazon.awssdk.crt:android:0.11.5'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core:1.2.0'

android/iotdevicesdk/build.gradle

@@ -87,7 +87,7 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'software.amazon.awssdk.crt:android:0.11.3'
+    implementation 'software.amazon.awssdk.crt:android:0.11.5'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     testImplementation 'junit:junit:4.12'

pom.xml

@@ -9,6 +9,7 @@
     <modules>
         <module>sdk</module>
         <module>samples/BasicPubSub</module>
+        <module>samples/Greengrass</module>
         <module>samples/Jobs</module>
         <module>samples/PubSubStress</module>
         <module>samples/RawPubSub</module>

samples/BasicPubSub/src/main/java/pubsub/PubSub.java

@@ -6,6 +6,7 @@
 package pubsub;
 
 import software.amazon.awssdk.crt.CRT;
+import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.crt.CrtRuntimeException;
 import software.amazon.awssdk.crt.auth.credentials.X509CredentialsProvider;
 import software.amazon.awssdk.crt.http.HttpProxyOptions;
@@ -246,7 +247,9 @@ public void onConnectionResumed(boolean sessionPresent) {
                 .withConnectionEventCallbacks(callbacks)
                 .withClientId(clientId)
                 .withEndpoint(endpoint)
-                .withCleanSession(true);
+                .withPort((short)port)
+                .withCleanSession(true)
+                .withProtocolOperationTimeoutMs(60000);
 
             if (useWebsockets) {
                 builder.withWebsockets(true);
@@ -319,6 +322,8 @@ public void onConnectionResumed(boolean sessionPresent) {
             System.out.println("Exception encountered: " + ex.toString());
         }
 
+        CrtResource.waitForNoResources();
+
         System.out.println("Complete!");
     }
 }

samples/Identity/src/main/java/identity/FleetProvisioningSample.java

@@ -264,6 +264,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             System.out.println("Exception encountered: " + ex.toString());
         }
 
+        CrtResource.waitForNoResources();
         System.out.println("Complete!");
     }
 

samples/Jobs/src/main/java/jobs/JobsSample.java

@@ -6,6 +6,7 @@
 package jobs;
 
 import software.amazon.awssdk.crt.CRT;
+import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.crt.CrtRuntimeException;
 import software.amazon.awssdk.crt.io.ClientBootstrap;
 import software.amazon.awssdk.crt.io.EventLoopGroup;
@@ -356,6 +357,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             System.out.println("Exception encountered: " + ex.toString());
         }
 
+        CrtResource.waitForNoResources();
         System.out.println("Complete!");
     }
 }

samples/RawPubSub/src/main/java/rawpubsub/RawPubSub.java

@@ -6,6 +6,7 @@
 package rawpubsub;
 
 import software.amazon.awssdk.crt.CRT;
+import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.crt.CrtRuntimeException;
 import software.amazon.awssdk.crt.io.ClientBootstrap;
 import software.amazon.awssdk.crt.io.EventLoopGroup;
@@ -245,6 +246,7 @@ public void onConnectionResumed(boolean sessionPresent) {
             System.out.println("Exception encountered: " + ex.toString());
         }
 
+        CrtResource.waitForNoResources();
         System.out.println("Complete!");
     }
 }

sdk/pom.xml

@@ -42,7 +42,7 @@
     <dependency>
       <groupId>software.amazon.awssdk.crt</groupId>
       <artifactId>aws-crt</artifactId>
-      <version>0.11.3</version>
+      <version>0.11.5</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>