chore(deps): Update Spark dependency to 2.9.4

Author: deki

aws-serverless-java-container-spark/pom.xml

@@ -16,22 +16,9 @@
     </parent>
 
     <properties>
-        <spark.version>2.9.3</spark.version>
+        <spark.version>2.9.4</spark.version>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- outdated transitive dependency in spark-core (CVE-2020-27216, CVE-2020-27218, CVE-2020-27223, CVE-2021-28165, CVE-2021-28169, CVE-2021-34428) -->
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-bom</artifactId>
-                <version>9.4.48.v20220622</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <!-- Core interfaces for the aws-serverless-java-container project -->
         <dependency>
@@ -45,13 +32,6 @@
             <groupId>com.sparkjava</groupId>
             <artifactId>spark-core</artifactId>
             <version>${spark.version}</version>
-            <!-- excluding slf4j from spark because it includes 1.7.13, the framework already pulls in 1.7.25 -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 

aws-serverless-java-container-spark/src/main/java/com/amazonaws/serverless/proxy/spark/embeddedserver/LambdaEmbeddedServer.java

@@ -80,7 +80,7 @@ public int ignite(String host, int port, SslStores sslStores, int maxThreads, in
 
 
     public void configureWebSockets(Map<String, WebSocketHandlerWrapper> webSocketHandlers,
-                                    Optional<Integer> webSocketIdleTimeoutMillis) {
+                                    Optional<Long> webSocketIdleTimeoutMillis) {
         // Swallowing this exception to prevent Spark from getting stuck
         // throw new UnsupportedOperationException();
         log.info("Spark called configureWebSockets. However, web sockets are not supported");

aws-serverless-java-container-spark/src/test/java/com/amazonaws/serverless/proxy/spark/embeddedserver/LambdaEmbeddedServerTest.java

@@ -14,7 +14,7 @@ public class LambdaEmbeddedServerTest {
     @Test
     public void webSocket_configureWebSocket_noException() {
         try {
-            server.configureWebSockets(null, Optional.of(0));
+            server.configureWebSockets(null, Optional.of(0L));
         } catch (Exception e) {
             e.printStackTrace();
             fail();

aws-serverless-spark-archetype/src/main/resources/archetype-resources/build.gradle

@@ -7,7 +7,7 @@ repositories {
 
 dependencies {
   implementation (
-          'com.sparkjava:spark-core:2.9.3',
+          'com.sparkjava:spark-core:2.9.4',
           'com.amazonaws.serverless:aws-serverless-java-container-spark:[1.0,)',
           'com.fasterxml.jackson.core:jackson-databind:2.13.3',
           'io.symphonia:lambda-logging:1.0.3'

samples/spark/pet-store/build.gradle

@@ -7,7 +7,7 @@ repositories {
 
 dependencies {
   implementation (
-          'com.sparkjava:spark-core:2.9.3',
+          'com.sparkjava:spark-core:2.9.4',
           'com.amazonaws.serverless:aws-serverless-java-container-spark:[1.0,)',
           'com.fasterxml.jackson.core:jackson-databind:2.13.3',
           'io.symphonia:lambda-logging:1.0.3'