Staging release 2.3.1 (aws#416)

smirnoal · web-flow · commit 96ceea13c914 · 2023-03-16T16:37:14.000Z
diff --git a/aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md b/aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md
@@ -1,6 +1,7 @@
-### March 15, 2023
+### March 16, 2023
 `2.3.1`
-- ignore module-info for CDS preparation purposes   
+- ignore module-info for CDS preparation purposes
+- clear thread interrupted flag instead of exiting Lambda Runtime
 
 ### March 14, 2023
 `2.3.0`
diff --git a/aws-lambda-java-runtime-interface-client/pom.xml b/aws-lambda-java-runtime-interface-client/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-lambda-java-runtime-interface-client</artifactId>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
     <packaging>jar</packaging>
 
     <name>AWS Lambda Java Runtime Interface Client</name>
diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java
@@ -238,9 +238,7 @@ private static void startRuntime(String handler, LambdaLogger lambdaLogger) thro
             try {
                 payload = requestHandler.call(request);
                 runtimeClient.postInvocationResponse(request.getId(), payload.toByteArray());
-                if (Thread.currentThread().isInterrupted()) {
-                    shouldExit = true;
-                }
+                boolean ignored = Thread.interrupted(); // clear interrupted flag in case if it was set by user's code
             } catch (UserFault f) {
                 userFault = f;
                 UserFault.filterStackTrace(f);
diff --git a/aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh b/aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 SRC_DIR=$(dirname "$0")
 DST_DIR=${1}
 MULTI_ARCH=${2}
-CURL_VERSION=7.86.0
+CURL_VERSION=7.83.1
 
 # Not using associative arrays to maintain bash 3 compatibility with building on MacOS
 # MacOS ships with bash 3 and associative arrays require bash 4+
diff --git a/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.83.1.tar.gz b/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.83.1.tar.gz
diff --git a/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.86.0.tar.gz b/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.86.0.tar.gz
diff --git a/aws-lambda-java-runtime-interface-client/test/integration/test-handler/pom.xml b/aws-lambda-java-runtime-interface-client/test/integration/test-handler/pom.xml
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-runtime-interface-client</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.1</version>
         </dependency>
     </dependencies>
 
diff --git a/aws-lambda-java-serialization/pom.xml b/aws-lambda-java-serialization/pom.xml
@@ -216,10 +216,6 @@
                                     <pattern>com.google.gson</pattern>
                                     <shadedPattern>${relocation.prefix}.com.google.gson</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>org.joda.time</pattern>
-                                    <shadedPattern>${relocation.prefix}.org.joda.time</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>org.json</pattern>
                                     <shadedPattern>${relocation.prefix}.org.json</shadedPattern>
