Change Java version

project-chip · Jan 9, 2025 · a542473 · a542473
1 parent 53a0a12
commit a542473
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -78,7 +78,7 @@ RUN set -x \
     make \
     net-tools \
     ninja-build \
-    openjdk-8-jdk \
+    openjdk-11-jdk \
     pkg-config \
     python3 \
     python3-dev \
@@ -302,7 +302,7 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing/requir
 RUN pip install --break-system-packages -r /tmp/requirements.txt && rm /tmp/requirements.txt
 
 # PIP requires MASON package compilation, which seems to require a JDK
-RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get update; apt-get install -fy openjdk-8-jdk
+RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get update; apt-get install -fy openjdk-11-jdk
 
 RUN pip install --break-system-packages --no-cache-dir \
     python_lib/obj/src/python_testing/matter_testing_infrastructure/chip-testing._build_wheel/chip_testing-*.whl \

diff --git a/integrations/docker/images/stage-2/chip-build-java/Dockerfile b/integrations/docker/images/stage-2/chip-build-java/Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
 RUN set -x \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -fy \
-    openjdk-8-jdk \
+    openjdk-11-jdk \
     && rm -rf /var/lib/apt/lists/ \
     && : # last line
 

diff --git a/integrations/docker/images/stage-3/chip-build-android/Dockerfile b/integrations/docker/images/stage-3/chip-build-android/Dockerfile
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
 RUN set -x \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -fy \
-    openjdk-8-jdk \
+    openjdk-11-jdk \
     rsync \
     swig \
     && rm -rf /var/lib/apt/lists/ \

diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
@@ -91,15 +91,15 @@ RUN set -x \
 #   - telnet
 #   - srecord
 # For java builds:
-#   - openjdk-8-jdk
+#   - openjdk-11-jdk
 RUN set -x \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
     zip \
     expect \
     telnet \
     srecord \
-    openjdk-8-jdk \
+    openjdk-11-jdk \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/ \
     && : # last line