Merge pull request #228 from jglick/bumps

POM bumps
jenkinsci · Aug 24, 2022 · 7179387 · 7179387
2 parents 9a0873f + 6f05e68
commit 7179387
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.40</version>
+        <version>4.46</version>
         <relativePath />
     </parent>
     <artifactId>mercurial</artifactId>
@@ -160,7 +160,7 @@
         <dependency>
             <groupId>org.jenkins-ci.test</groupId>
             <artifactId>docker-fixtures</artifactId>
-            <version>1.11</version>
+            <version>1.12</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

diff --git a/src/test/java/hudson/plugins/mercurial/Security2478Test.java b/src/test/java/hudson/plugins/mercurial/Security2478Test.java
@@ -66,7 +66,8 @@ public void checkoutShouldAbortWhenSourceIsNonRemoteAndBuildOnController() throw
     public void checkoutOnAgentShouldNotAbortWhenSourceIsNonRemoteAndBuildOnAgent() throws Exception {
         assertFalse("Non Remote checkout should be disallowed", MercurialSCM.ALLOW_LOCAL_CHECKOUT);
         DumbSlave agent = rule.createOnlineSlave();
-        FilePath workspace = agent.getRootPath().createTempDir("t", "");
+        FilePath workspace = agent.getRootPath().child("testws");
+        workspace.mkdirs();
         m.hg(workspace, "init");
         m.touchAndCommit(workspace, "a");
         WorkflowJob p = rule.jenkins.createProject(WorkflowJob.class, "pipeline");

diff --git a/src/test/resources/hudson/plugins/mercurial/MercurialContainer/Dockerfile b/src/test/resources/hudson/plugins/mercurial/MercurialContainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/java:d93654cc6239
+FROM jenkins/java:387404da3ce7
 RUN apt-get update -y && \
     apt-get install --no-install-recommends -y \
         python2.7 \