From fef128af43b04ce2f4607c50c26c57ac45346300 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Tue, 7 Jan 2025 08:26:59 -0800 Subject: [PATCH] chore: bump base image for jpy 1.1.0 (#6526) Cherry-pick of #6525 --- docker/registry/server-base/gradle.properties | 2 +- docker/server-jetty/src/main/server-jetty/requirements.txt | 4 ++-- docker/server/src/main/server-netty/requirements.txt | 4 ++-- gradle/libs.versions.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/registry/server-base/gradle.properties b/docker/registry/server-base/gradle.properties index 7a11547386c..7ea66725aa2 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:57096a26bb621a4eaf630ac555a4c08836820e029aa90c266765142c524419a4 +deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:a904aba9cd5f91b6e2f19c4e024702700dfa37f549b73d24e9821f8f02061b45 diff --git a/docker/server-jetty/src/main/server-jetty/requirements.txt b/docker/server-jetty/src/main/server-jetty/requirements.txt index 7eb0af1edf0..763f86295a3 100644 --- a/docker/server-jetty/src/main/server-jetty/requirements.txt +++ b/docker/server-jetty/src/main/server-jetty/requirements.txt @@ -3,10 +3,10 @@ adbc-driver-postgresql==1.3.0 connectorx==0.4.0; platform.machine == 'x86_64' deephaven-plugin==0.6.0 docstring_parser==0.16 -importlib_resources==6.4.5 +importlib_resources==6.5.2 java-utilities==0.3.0 jedi==0.19.1 -jpy==1.0.0 +jpy==1.1.0 llvmlite==0.43.0 numba==0.60.0 numpy==2.0.2 diff --git a/docker/server/src/main/server-netty/requirements.txt b/docker/server/src/main/server-netty/requirements.txt index 7eb0af1edf0..763f86295a3 100644 --- a/docker/server/src/main/server-netty/requirements.txt +++ b/docker/server/src/main/server-netty/requirements.txt @@ -3,10 +3,10 @@ adbc-driver-postgresql==1.3.0 connectorx==0.4.0; platform.machine == 'x86_64' deephaven-plugin==0.6.0 docstring_parser==0.16 -importlib_resources==6.4.5 +importlib_resources==6.5.2 java-utilities==0.3.0 jedi==0.19.1 -jpy==1.0.0 +jpy==1.1.0 llvmlite==0.43.0 numba==0.60.0 numpy==2.0.2 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a9635e0fb10..e4aae8ac722 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 = "1.0.0" +jpy = "1.1.0" jsinterop = "2.0.2" # google is annoying, and have different versions released for the same groupId jsinterop-base = "1.0.1"