Artifacts should use jetty12 builds

deephaven · Oct 11, 2024 · 18ee201 · 18ee201
1 parent 499dd19
commit 18ee201
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;