From f2dedd50b2088462962cc85f56552abea7035e34 Mon Sep 17 00:00:00 2001
From: Devin Smith <devinsmith@deephaven.io>
Date: Fri, 6 Dec 2024 10:55:10 -0800
Subject: [PATCH] chore: Bump to jpy 1.0.0

See https://github.com/jpy-consortium/jpy/releases/tag/v1.0.0
---
 docker/registry/server-base/gradle.properties              | 2 +-
 docker/server-jetty/src/main/server-jetty/requirements.txt | 6 +++---
 docker/server/src/main/server-netty/requirements.txt       | 6 +++---
 gradle/libs.versions.toml                                  | 2 +-
 py/embedded-server/setup.py                                | 2 +-
 py/server/setup.py                                         | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/registry/server-base/gradle.properties b/docker/registry/server-base/gradle.properties
index ee1fdef9f3b..7a11547386c 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:6885027cbb05b7739a78be26393b1e22085ee1667640c0d9d05a95f8f561d819
+deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:57096a26bb621a4eaf630ac555a4c08836820e029aa90c266765142c524419a4
diff --git a/docker/server-jetty/src/main/server-jetty/requirements.txt b/docker/server-jetty/src/main/server-jetty/requirements.txt
index 36c7e02a054..7eb0af1edf0 100644
--- a/docker/server-jetty/src/main/server-jetty/requirements.txt
+++ b/docker/server-jetty/src/main/server-jetty/requirements.txt
@@ -6,15 +6,15 @@ docstring_parser==0.16
 importlib_resources==6.4.5
 java-utilities==0.3.0
 jedi==0.19.1
-jpy==0.19.0
+jpy==1.0.0
 llvmlite==0.43.0
 numba==0.60.0
 numpy==2.0.2
 pandas==2.2.3
 parso==0.8.4
-pyarrow==18.0.0
+pyarrow==18.1.0
 python-dateutil==2.9.0.post0
 pytz==2024.2
-six==1.16.0
+six==1.17.0
 typing_extensions==4.12.2
 tzdata==2024.2
diff --git a/docker/server/src/main/server-netty/requirements.txt b/docker/server/src/main/server-netty/requirements.txt
index 36c7e02a054..7eb0af1edf0 100644
--- a/docker/server/src/main/server-netty/requirements.txt
+++ b/docker/server/src/main/server-netty/requirements.txt
@@ -6,15 +6,15 @@ docstring_parser==0.16
 importlib_resources==6.4.5
 java-utilities==0.3.0
 jedi==0.19.1
-jpy==0.19.0
+jpy==1.0.0
 llvmlite==0.43.0
 numba==0.60.0
 numpy==2.0.2
 pandas==2.2.3
 parso==0.8.4
-pyarrow==18.0.0
+pyarrow==18.1.0
 python-dateutil==2.9.0.post0
 pytz==2024.2
-six==1.16.0
+six==1.17.0
 typing_extensions==4.12.2
 tzdata==2024.2
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0677e22c289..0a96159dd48 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -51,7 +51,7 @@ javax-validation = "2.0.1.Final"
 jdom2 = "2.0.6.1"
 jetbrains = "26.0.1"
 jetty = "11.0.20"
-jpy = "0.19.0"
+jpy = "1.0.0"
 jsinterop = "2.0.2"
 # google is annoying, and have different versions released for the same groupId
 jsinterop-base = "1.0.3"
diff --git a/py/embedded-server/setup.py b/py/embedded-server/setup.py
index 30162cfaf9b..4063f11bc46 100644
--- a/py/embedded-server/setup.py
+++ b/py/embedded-server/setup.py
@@ -64,7 +64,7 @@ def _compute_version():
     keywords='Deephaven Development',
     python_requires='>=3.8',
     install_requires=[
-        'jpy>=0.19.0',
+        'jpy>=1.0.0',
         'java-utilities',
         f"deephaven-core[autocomplete]=={_version}",
         'click>=8.1.7',
diff --git a/py/server/setup.py b/py/server/setup.py
index e08153ac8ab..0ac1bcc9b08 100644
--- a/py/server/setup.py
+++ b/py/server/setup.py
@@ -57,7 +57,7 @@ def _compute_version():
     keywords='Deephaven Development',
     python_requires='>=3.8',
     install_requires=[
-        'jpy>=0.19.0',
+        'jpy>=1.0.0',
         'deephaven-plugin>=0.6.0',
         'numpy',
         'pandas>=1.5.0',