From 15811a9fc3448aa7048ca7c8342927478b116c41 Mon Sep 17 00:00:00 2001
From: Chip Kent <chipkent@deephaven.io>
Date: Thu, 25 Apr 2024 14:57:22 -0600
Subject: [PATCH] DH version to 0.33.3 Java version to 17

---
 .github/workflows/Dockerfile.pip        | 4 ++--
 .github/workflows/build-and-publish.yml | 6 +++---
 docker/dev/Dockerfile                   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/Dockerfile.pip b/.github/workflows/Dockerfile.pip
index 5eb27210..e0de4e5e 100644
--- a/.github/workflows/Dockerfile.pip
+++ b/.github/workflows/Dockerfile.pip
@@ -2,10 +2,10 @@
 FROM ubuntu:22.04
 
 RUN apt update && \
-    apt install -y openjdk-11-jdk python3-pip python3-venv curl zip && \
+    apt install -y openjdk-17-jdk python3-pip python3-venv curl zip && \
     pip3 install --upgrade pip setuptools wheel
 
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
 
 COPY ./wheels /wheels
 COPY ./ib-wheels /ib-wheels
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index c6d7318e..af5b3345 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -13,7 +13,7 @@ on:
 
 env:
   IB_VERSION: 10.19.01
-  DH_VERSION: 0.28.1
+  DH_VERSION: 0.33.3
 
 jobs:
   build-ib-whl:
@@ -114,7 +114,7 @@ jobs:
     - name: Apt installs
       run: |
         sudo apt update
-        sudo apt install -y openjdk-11-jdk
+        sudo apt install -y openjdk-17-jdk
     - name: Pip installs
       run:  pip3 install --upgrade sphinx==4.2.0 sphinx-autodoc-typehints furo==2021.10.9
     - name: Download IB wheels
@@ -132,7 +132,7 @@ jobs:
     - name: Run Sphinx
       working-directory: ./sphinx
       env:
-        JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+        JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
       run: |
         make html
         touch build/html/.nojekyll
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index 18351e1f..4b0fa0d4 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -11,12 +11,12 @@ ARG DH_VERSION
 # Install requirements
 
 RUN apt update && \
-    apt install -y openjdk-11-jdk && \
-    ln -s /usr/lib/jvm/java-11-openjdk-*/ /usr/lib/jvm/java-11-openjdk && \
+    apt install -y openjdk-17-jdk && \
+    ln -s /usr/lib/jvm/java-17-openjdk-*/ /usr/lib/jvm/java-17-openjdk && \
     apt install --yes git python3-venv python3-pip curl unzip && \
     pip3 install --upgrade pip setuptools wheel build
 
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk
 
 # Build and install ibapi