From 18ee2016028f456f95d2c2149fe84a4f20af423d Mon Sep 17 00:00:00 2001
From: Colin Alworth <colinalworth@deephaven.io>
Date: Fri, 6 Sep 2024 20:28:45 -0500
Subject: [PATCH] Artifacts should use jetty12 builds

---
 docker/server-jetty/build.gradle                          | 2 +-
 py/embedded-server/java-runtime/build.gradle              | 2 +-
 py/embedded-server/java-runtime/gradle.properties         | 5 +++++
 .../java/io/deephaven/python/server/EmbeddedServer.java   | 8 ++++----
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docker/server-jetty/build.gradle b/docker/server-jetty/build.gradle
index ce7a6b8a209..e498b50987c 100644
--- a/docker/server-jetty/build.gradle
+++ b/docker/server-jetty/build.gradle
@@ -28,7 +28,7 @@ configurations {
 }
 
 dependencies {
-    serverApplicationDist project(path: ':server-jetty-app-11', configuration: 'applicationDist')//revert me
+    serverApplicationDist project(path: ':server-jetty-app', configuration: 'applicationDist')
 
     pythonWheel project(':py-server')
 }
diff --git a/py/embedded-server/java-runtime/build.gradle b/py/embedded-server/java-runtime/build.gradle
index 84b95a99276..1fadd12b881 100644
--- a/py/embedded-server/java-runtime/build.gradle
+++ b/py/embedded-server/java-runtime/build.gradle
@@ -9,7 +9,7 @@ configurations {
 }
 
 dependencies {
-    implementation project(':server-jetty-11')//revert me
+    implementation project(':server-jetty')
 
     implementation libs.dagger
     annotationProcessor libs.dagger.compiler
diff --git a/py/embedded-server/java-runtime/gradle.properties b/py/embedded-server/java-runtime/gradle.properties
index eeac3e65888..41626ddd8f0 100644
--- a/py/embedded-server/java-runtime/gradle.properties
+++ b/py/embedded-server/java-runtime/gradle.properties
@@ -1 +1,6 @@
 io.deephaven.project.ProjectType=JAVA_LOCAL
+compilerVersion=17
+runtimeVersion=17
+languageLevel=17
+testRuntimeVersion=17
+testLanguageLevel=17
diff --git a/py/embedded-server/java-runtime/src/main/java/io/deephaven/python/server/EmbeddedServer.java b/py/embedded-server/java-runtime/src/main/java/io/deephaven/python/server/EmbeddedServer.java
index 5e5b7e779fb..3bc427f8904 100644
--- a/py/embedded-server/java-runtime/src/main/java/io/deephaven/python/server/EmbeddedServer.java
+++ b/py/embedded-server/java-runtime/src/main/java/io/deephaven/python/server/EmbeddedServer.java
@@ -22,10 +22,10 @@
 import io.deephaven.server.console.python.PythonConsoleSessionModule;
 import io.deephaven.server.console.python.PythonGlobalScopeModule;
 import io.deephaven.server.healthcheck.HealthCheckModule;
-import io.deephaven.server.jetty11.JettyConfig;
-import io.deephaven.server.jetty11.JettyConfig.Builder;
-import io.deephaven.server.jetty11.JettyServerComponent;
-import io.deephaven.server.jetty11.JettyServerModule;
+import io.deephaven.server.jetty.JettyConfig;
+import io.deephaven.server.jetty.JettyConfig.Builder;
+import io.deephaven.server.jetty.JettyServerComponent;
+import io.deephaven.server.jetty.JettyServerModule;
 import io.deephaven.server.plugin.python.PythonPluginsRegistration;
 import io.deephaven.server.runner.DeephavenApiConfigModule;
 import io.deephaven.server.runner.DeephavenApiServer;