fix: Make Java, Python wheel artifacts have same dependencies

Fixes deephaven#5848
niloc132 · Jul 26, 2024 · 6815e0f · 6815e0f
1 parent 45bf00b
commit 6815e0f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/py/embedded-server/java-runtime/build.gradle b/py/embedded-server/java-runtime/build.gradle
@@ -27,6 +27,10 @@ dependencies {
         runtimeOnly project(':hotspot-impl')
     }
 
+    if (!hasProperty('excludeClockImpl')) {
+        runtimeOnly project(':clock-impl')
+    }
+
     if (!hasProperty('excludeSql')) {
         runtimeOnly project(':engine-sql')
     }
@@ -35,6 +39,12 @@ dependencies {
         runtimeOnly project(':extensions-s3')
         runtimeOnly project(':extensions-iceberg-s3')
     }
+
+    if (!hasProperty('excludeJson')) {
+        dependencies {
+            runtimeOnly project(':extensions-json-jackson')
+        }
+    }
 }
 
 // making a dir here isn't optimal, but without it we need to make py-embedded-server be a java and a python

diff --git a/server/jetty-app/build.gradle b/server/jetty-app/build.gradle
@@ -64,6 +64,8 @@ if (!hasProperty('excludeJson')) {
     }
 }
 
+// When you add a new dependency here, be sure to include it in server-netty-app and py-embedded-server
+
 def authHandlers = []
 def authConfigs = ['AuthHandlers']
 if (hasProperty('anonymous')) {

diff --git a/server/netty-app/build.gradle b/server/netty-app/build.gradle
@@ -58,6 +58,12 @@ if (!hasProperty('excludeS3')) {
     }
 }
 
+if (!hasProperty('excludeJson')) {
+    dependencies {
+        runtimeOnly project(':extensions-json-jackson')
+    }
+}
+
 def authHandlers = []
 def authConfigs = ['AuthHandlers']
 if (hasProperty('anonymous')) {