try to fix build

jenkinsci · Jul 12, 2022 · ac046a5 · ac046a5
1 parent f39e978
commit ac046a5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...lugin/src/test/java/org/jenkinsci/plugins/pipeline/maven/docker/JavaGitContainerTest.java b/...lugin/src/test/java/org/jenkinsci/plugins/pipeline/maven/docker/JavaGitContainerTest.java
@@ -39,7 +39,7 @@ public class JavaGitContainerTest {
 
     @Test
     public void smokes() throws Exception {
-        assertThat(rule.get().popen(new CommandBuilder("java", "-version")).verifyOrDieWith("could not launch Java"), containsString("openjdk version \"1.8.0_"));
+        assertThat(rule.get().popen(new CommandBuilder("java", "-version")).verifyOrDieWith("could not launch Java"), containsString("openjdk version \"11"));
         assertThat(rule.get().popen(new CommandBuilder("git", "version")).verifyOrDieWith("could not launch git"), containsString("git version 2."));
     }
 

diff --git a/...rc/test/resources/org/jenkinsci/plugins/pipeline/maven/docker/JavaGitContainer/Dockerfile b/...rc/test/resources/org/jenkinsci/plugins/pipeline/maven/docker/JavaGitContainer/Dockerfile
@@ -3,7 +3,7 @@
 #
 
 # cf. JavaContainer/Dockerfile
-FROM jenkins/java:d93654cc6239
+FROM jenkins/java:387404da3ce7
 
 RUN apt-get update
 RUN apt-get install --no-install-recommends -y git
diff --git a/...es/org/jenkinsci/plugins/pipeline/maven/docker/MavenWithMavenHomeJavaContainer/Dockerfile b/...es/org/jenkinsci/plugins/pipeline/maven/docker/MavenWithMavenHomeJavaContainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/java:d93654cc6239
+FROM jenkins/java:387404da3ce7
 
 ENV MAVEN_HOME="/usr/share/maven"
 

diff --git a/...st/resources/org/jenkinsci/plugins/pipeline/maven/docker/NonMavenJavaContainer/Dockerfile b/...st/resources/org/jenkinsci/plugins/pipeline/maven/docker/NonMavenJavaContainer/Dockerfile
@@ -1,3 +1,3 @@
-FROM jenkins/java:d93654cc6239
+FROM jenkins/java:387404da3ce7
 
 RUN apt-get remove maven -y