diff --git a/pom.xml b/pom.xml index 0d62f53..8c1a045 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,7 @@ 2.479 ${jenkins.baseline}.3 jenkinsci/${project.artifactId}-plugin + false diff --git a/src/test/java/hudson/tasks/AntTest.java b/src/test/java/hudson/tasks/AntTest.java index 53bcd38..5238a8a 100644 --- a/src/test/java/hudson/tasks/AntTest.java +++ b/src/test/java/hudson/tasks/AntTest.java @@ -73,7 +73,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import org.junit.rules.TemporaryFolder; + import org.jvnet.hudson.test.ExtractResourceSCM; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; @@ -244,7 +244,7 @@ void testParameterExpansion() throws Exception { } private AntInstallation configureDefaultAnt() throws Exception { - TemporaryFolder temporaryFolder = new TemporaryFolder(tmp); + org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp); temporaryFolder.create(); return ToolInstallations.configureDefaultAnt(temporaryFolder); } diff --git a/src/test/java/hudson/tasks/AntWrapperTest.java b/src/test/java/hudson/tasks/AntWrapperTest.java index b1116b2..3d5827c 100644 --- a/src/test/java/hudson/tasks/AntWrapperTest.java +++ b/src/test/java/hudson/tasks/AntWrapperTest.java @@ -41,7 +41,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.io.TempDir; -import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.*; import org.jvnet.hudson.test.junit.jupiter.BuildWatcherExtension; import org.jvnet.hudson.test.junit.jupiter.JenkinsSessionExtension; @@ -59,7 +58,7 @@ class AntWrapperTest { @Test void configRoundTrip() throws Throwable { r.then(j -> { - TemporaryFolder temporaryFolder = new TemporaryFolder(tmp); + org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp); temporaryFolder.create(); Ant.AntInstallation installation = ToolInstallations.configureDefaultAnt(temporaryFolder); FreeStyleProject p = j.createFreeStyleProject(); // no configRoundTrip(BuildWrapper) it seems @@ -79,7 +78,7 @@ void configRoundTrip() throws Throwable { @Test void smokes() throws Throwable { r.then(j -> { - TemporaryFolder temporaryFolder = new TemporaryFolder(tmp); + org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp); temporaryFolder.create(); ToolInstallations.configureDefaultAnt(temporaryFolder); // TODO could instead use DockerRule to run against a specified JDK location DumbSlave s = j.createOnlineSlave(); @@ -101,7 +100,7 @@ void smokes() throws Throwable { @Test void durability() throws Throwable { r.then(j -> { - TemporaryFolder temporaryFolder = new TemporaryFolder(tmp); + org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp); temporaryFolder.create(); ToolInstallations.configureDefaultAnt(temporaryFolder); WorkflowJob p = j.createProject(WorkflowJob.class, "p"); diff --git a/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java b/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java index f1f1307..db9e418 100644 --- a/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java +++ b/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java @@ -15,7 +15,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.ExtractResourceSCM; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.ToolInstallations; @@ -47,7 +46,7 @@ void setUp(JenkinsRule rule) throws Exception { j.jenkins.getJDKs().add(varJDK); // Ant with a variable in its path - TemporaryFolder temporaryFolder = new TemporaryFolder(tmp); + org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp); temporaryFolder.create(); AntInstallation ant = ToolInstallations.configureDefaultAnt(temporaryFolder); AntInstallation antInstallation = diff --git a/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java b/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java index e50523e..0075b17 100644 --- a/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java +++ b/src/test/java/hudson/tasks/_ant/AntTargetAnnotationTest.java @@ -10,7 +10,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.SingleFileSCM; @@ -48,7 +47,7 @@ void tearDown() { @Test void test1() throws Exception { FreeStyleProject p = r.createFreeStyleProject(); - TemporaryFolder temporaryFolder = new TemporaryFolder(tmp); + org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp); temporaryFolder.create(); Ant.AntInstallation ant = ToolInstallations.configureDefaultAnt(temporaryFolder); p.getBuildersList().add(new Ant("foo",ant.getName(),null,null,null)); diff --git a/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java b/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java index 4403c99..c30a8da 100644 --- a/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java +++ b/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java @@ -38,7 +38,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import org.junit.rules.TemporaryFolder; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.SingleFileSCM; import org.jvnet.hudson.test.ToolInstallations; @@ -83,7 +82,7 @@ private void configureDumpEnvBuilder() { @Test void ant() throws Exception { - TemporaryFolder temporaryFolder = new TemporaryFolder(tmp); + org.junit.rules.TemporaryFolder temporaryFolder = new org.junit.rules.TemporaryFolder(tmp); temporaryFolder.create(); AntInstallation ant = ToolInstallations.configureDefaultAnt(temporaryFolder); String antPath = ant.getHome();