From 5ac5d00ec72076b2adc30db4aad7be2aeb7fa8d6 Mon Sep 17 00:00:00 2001
From: Devin Smith <devinsmith@deephaven.io>
Date: Thu, 23 May 2024 16:17:10 -0700
Subject: [PATCH] Bump base server image, pick up jpy==0.17.0 (#5527)

---
 docker/registry/server-base/gradle.properties             | 2 +-
 .../server-jetty/src/main/server-jetty/requirements.txt   | 8 ++++----
 docker/server/src/main/server-netty/requirements.txt      | 8 ++++----
 py/embedded-server/setup.py                               | 2 +-
 py/jpy-ext/build.gradle                                   | 2 +-
 py/server/setup.py                                        | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker/registry/server-base/gradle.properties b/docker/registry/server-base/gradle.properties
index ae4b9f99d18..8475adc997f 100644
--- a/docker/registry/server-base/gradle.properties
+++ b/docker/registry/server-base/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/server-base:edge
-deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:4804def66fce711bb912480c43346caaa8ca401ccf6699c8dca28978605b5cb4
+deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:db3394f147d4dc216f213d2884ff5cabf2ed23233274900af6ef93c8699d81e5
diff --git a/docker/server-jetty/src/main/server-jetty/requirements.txt b/docker/server-jetty/src/main/server-jetty/requirements.txt
index a61acd95765..c285b896552 100644
--- a/docker/server-jetty/src/main/server-jetty/requirements.txt
+++ b/docker/server-jetty/src/main/server-jetty/requirements.txt
@@ -1,11 +1,11 @@
-adbc-driver-manager==0.11.0
-adbc-driver-postgresql==0.11.0
-connectorx==0.3.2; platform.machine == 'x86_64'
+adbc-driver-manager==1.0.0
+adbc-driver-postgresql==1.0.0
+connectorx==0.3.3; platform.machine == 'x86_64'
 deephaven-plugin==0.6.0
 importlib_resources==6.4.0
 java-utilities==0.3.0
 jedi==0.18.2
-jpy==0.16.0
+jpy==0.17.0
 llvmlite==0.42.0
 numba==0.59.1
 numpy==1.26.4
diff --git a/docker/server/src/main/server-netty/requirements.txt b/docker/server/src/main/server-netty/requirements.txt
index a61acd95765..c285b896552 100644
--- a/docker/server/src/main/server-netty/requirements.txt
+++ b/docker/server/src/main/server-netty/requirements.txt
@@ -1,11 +1,11 @@
-adbc-driver-manager==0.11.0
-adbc-driver-postgresql==0.11.0
-connectorx==0.3.2; platform.machine == 'x86_64'
+adbc-driver-manager==1.0.0
+adbc-driver-postgresql==1.0.0
+connectorx==0.3.3; platform.machine == 'x86_64'
 deephaven-plugin==0.6.0
 importlib_resources==6.4.0
 java-utilities==0.3.0
 jedi==0.18.2
-jpy==0.16.0
+jpy==0.17.0
 llvmlite==0.42.0
 numba==0.59.1
 numpy==1.26.4
diff --git a/py/embedded-server/setup.py b/py/embedded-server/setup.py
index ca339b183b8..a0157843d55 100644
--- a/py/embedded-server/setup.py
+++ b/py/embedded-server/setup.py
@@ -58,7 +58,7 @@ def _compute_version():
     keywords='Deephaven Development',
     python_requires='>=3.8',
     install_requires=[
-        'jpy>=0.16.0',
+        'jpy>=0.17.0',
         'java-utilities',
         f"deephaven-core[autocomplete]=={_version}",
         'click>=8.1.7',
diff --git a/py/jpy-ext/build.gradle b/py/jpy-ext/build.gradle
index 803641435d7..b72f627e6d0 100644
--- a/py/jpy-ext/build.gradle
+++ b/py/jpy-ext/build.gradle
@@ -16,6 +16,6 @@ plugins {
 }
 
 dependencies {
-  api 'org.jpyconsortium:jpy:0.16.0'
+  api 'org.jpyconsortium:jpy:0.17.0'
   api project(':deephaven-jpy-config')
 }
diff --git a/py/server/setup.py b/py/server/setup.py
index 165fcf023e5..a3dad12b909 100644
--- a/py/server/setup.py
+++ b/py/server/setup.py
@@ -56,7 +56,7 @@ def _compute_version():
     keywords='Deephaven Development',
     python_requires='>=3.8',
     install_requires=[
-        'jpy>=0.16.0',
+        'jpy>=0.17.0',
         'deephaven-plugin>=0.6.0',
         'numpy',
         'pandas>=1.5.0',