Complete shared sdk classes for SessionStore.

Moved build to JDK21 GA and newer json library (due to a cve). PiperOrigin-RevId: 573642257 Change-Id: Ide77d0dd663d0dd366aa1cf29977dba552b84852
GoogleCloudPlatform · Oct 15, 2023 · 88603d0 · 88603d0
1 parent d766774
commit 88603d0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [17, 21-ea]
+        java: [17, 21]
         jdk: [temurin]
       fail-fast: false
 

diff --git a/pom.xml b/pom.xml
@@ -712,7 +712,7 @@
       <dependency>
         <groupId>org.json</groupId>
         <artifactId>json</artifactId>
-        <version>20230618</version>
+        <version>20231013</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>

diff --git a/runtime/local_jetty12/pom.xml b/runtime/local_jetty12/pom.xml
@@ -298,6 +298,7 @@
                   <include>com.google.appengine:appengine-tools-sdk</include>
                   <include>com.google.appengine:appengine-utils</include>
                   <include>com.google.appengine:sessiondata</include>
+                  <include>com.google.appengine:shared-sdk</include>
                   <include>com.google.appengine:shared-sdk-jetty12</include>
                   <include>com.google.flogger:google-extensions</include>
                   <include>com.google.flogger:flogger-system-backend</include>

diff --git a/runtime/local_jetty9/pom.xml b/runtime/local_jetty9/pom.xml
@@ -247,6 +247,7 @@
                   <include>com.google.appengine:appengine-tools-sdk</include>
                   <include>com.google.appengine:appengine-utils</include>
                   <include>com.google.appengine:sessiondata</include>
+                  <include>com.google.appengine:shared-sdk</include>
                   <include>com.google.appengine:shared-sdk-jetty9</include>
                   <include>com.google.flogger:google-extensions</include>
                   <include>com.google.flogger:flogger-system-backend</include>