From a4af6879dec442f5dbed854ff1a65f9459202582 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Thu, 16 Jan 2020 20:51:09 +0000
Subject: [PATCH 1/2] chore(deps): update jetty.version to v9.4.25.v20191220

---
 appengine-java8/websocket-jetty/pom.xml  | 2 +-
 appengine-java8/websocket-jsr356/pom.xml | 2 +-
 session-handling/pom.xml                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/appengine-java8/websocket-jetty/pom.xml b/appengine-java8/websocket-jetty/pom.xml
index 20f63875c50..1e5b34f5360 100644
--- a/appengine-java8/websocket-jetty/pom.xml
+++ b/appengine-java8/websocket-jetty/pom.xml
@@ -38,7 +38,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
     <appengine.maven.plugin>2.2.0</appengine.maven.plugin>
-    <jetty.version>9.4.4.v20180619</jetty.version>
+    <jetty.version>9.4.25.v20191220</jetty.version>
   </properties>
 
   <dependencies>
diff --git a/appengine-java8/websocket-jsr356/pom.xml b/appengine-java8/websocket-jsr356/pom.xml
index 81efb3b30c2..655e9685c18 100644
--- a/appengine-java8/websocket-jsr356/pom.xml
+++ b/appengine-java8/websocket-jsr356/pom.xml
@@ -35,7 +35,7 @@ limitations under the License.
     <maven.compiler.source>1.8</maven.compiler.source>
     <failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
     <appengine.maven.plugin>2.2.0</appengine.maven.plugin>
-    <jetty.version>9.4.4.v20170414</jetty.version>
+    <jetty.version>9.4.25.v20191220</jetty.version>
   </properties>
 
   <dependencies>
diff --git a/session-handling/pom.xml b/session-handling/pom.xml
index 94174d26ab8..7559d5bb228 100644
--- a/session-handling/pom.xml
+++ b/session-handling/pom.xml
@@ -39,7 +39,7 @@ Copyright 2019 Google LLC
     <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
     <maven.compiler.failOnWarning>false</maven.compiler.failOnWarning>
     <maven.war.filteringDeploymentDescriptors>false</maven.war.filteringDeploymentDescriptors>
-    <jetty.version>9.4.21.v20190926</jetty.version>
+    <jetty.version>9.4.25.v20191220</jetty.version>
   </properties>
 
   <dependencies>

From 46782a96d3f9c9c22a55a6074ab21c91f5d5ec41 Mon Sep 17 00:00:00 2001
From: averikitsch <akitsch@google.com>
Date: Thu, 16 Jan 2020 16:48:27 -0800
Subject: [PATCH 2/2] Add needed dep

---
 appengine-java8/websocket-jsr356/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/appengine-java8/websocket-jsr356/pom.xml b/appengine-java8/websocket-jsr356/pom.xml
index 655e9685c18..b34a35c8fb2 100644
--- a/appengine-java8/websocket-jsr356/pom.xml
+++ b/appengine-java8/websocket-jsr356/pom.xml
@@ -52,6 +52,11 @@ limitations under the License.
       <artifactId>javax-websocket-client-impl</artifactId>
       <version>${jetty.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax</groupId>
+      <artifactId>javaee-api</artifactId>
+      <version>8.0.1</version>
+    </dependency>
     <!--Optional dependency for SettableFuture, see com.example.flexible.websocket.jsr356.ServerSocket -->
     <dependency>
       <groupId>com.google.guava</groupId>