From 22ae8766731ca314702e791cd2ec5ab22cbf6322 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 20 May 2024 09:19:36 -0700
Subject: [PATCH] Update to Java 17 (#90)

---
 pom.xml                                                       | 3 ---
 .../test/acceptance/docker/fixtures/JavaContainer/Dockerfile  | 4 ++--
 .../test/acceptance/docker/fixtures/SshdContainer/Dockerfile  | 2 +-
 .../test/acceptance/docker/fixtures/JavaContainerTest.java    | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9ebab6b..2ecfff3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,8 +53,6 @@
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/docker-fixtures</gitHubRepo>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spotbugs.failOnError>false</spotbugs.failOnError> <!-- TODO -->
         <!-- TODO triage violations -->
         <spotbugs.threshold>High</spotbugs.threshold>
     </properties>
@@ -99,7 +97,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.12.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile
index 24892e5..a05c292 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainer/Dockerfile
@@ -3,12 +3,12 @@
 #
 
 # sha1sum ../SshdContainer/Dockerfile | cut -c 1-12
-FROM jenkins/sshd:32edfdd58111
+FROM jenkins/sshd:23e678bc2c56
 
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
         software-properties-common \
-        openjdk-11-jdk-headless \
+        openjdk-17-jdk-headless \
         curl \
         ant \
         maven
diff --git a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshdContainer/Dockerfile b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshdContainer/Dockerfile
index 1a12401..87841b6 100644
--- a/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshdContainer/Dockerfile
+++ b/src/main/resources/org/jenkinsci/test/acceptance/docker/fixtures/SshdContainer/Dockerfile
@@ -2,7 +2,7 @@
 # Runs sshd and allow the 'test' user to login
 #
 
-FROM ubuntu:bionic
+FROM ubuntu:noble
 
 # install SSHD
 RUN apt-get update -y && \
diff --git a/src/test/java/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainerTest.java b/src/test/java/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainerTest.java
index 249fe17..4828088 100644
--- a/src/test/java/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainerTest.java
+++ b/src/test/java/org/jenkinsci/test/acceptance/docker/fixtures/JavaContainerTest.java
@@ -85,7 +85,7 @@ public static void backToCache() {
     @Test
     public void smokes() throws Exception {
         JavaContainer c = rule.get();
-        assertThat(c.popen(new CommandBuilder("java", "-version")).verifyOrDieWith("could not launch Java"), containsString("openjdk version \"11"));
+        assertThat(c.popen(new CommandBuilder("java", "-version")).verifyOrDieWith("could not launch Java"), containsString("openjdk version \"17"));
         c.sshWithPublicKey(new CommandBuilder("id"));
     }