diff --git a/pom.xml b/pom.xml index dda46576..c2687931 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 3.55 + 3.56 config-file-provider @@ -74,7 +74,7 @@ org.jenkins-ci.plugins ssh-credentials - 1.12 + 1.13 org.jenkins-ci.plugins @@ -193,11 +193,17 @@ maven-plugin 3.1 test + + + org.jsoup + jsoup + + org.jenkins-ci.main jenkins-test-harness-tools - 2.0 + 2.2 test @@ -218,24 +224,17 @@ 1.16 test - - com.google.code.findbugs - annotations - 3.0.0 - provided - io.jenkins configuration-as-code - 1.29 + 1.35 test - io.jenkins - configuration-as-code - 1.29 + io.jenkins.configuration-as-code + test-harness + 1.35 test - tests commons-net @@ -243,6 +242,12 @@ 3.6 test + + org.apache.commons + commons-lang3 + 3.9 + test + diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/buildwrapper/ConfigFileBuildWrapperTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/buildwrapper/ConfigFileBuildWrapperTest.java index 0c6b5d5d..ab058c1f 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/buildwrapper/ConfigFileBuildWrapperTest.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/buildwrapper/ConfigFileBuildWrapperTest.java @@ -64,7 +64,7 @@ public void envVariableMustBeAvailableInMavenModuleSetBuild() throws Exception { final MavenModuleSet p = j.createProject(MavenModuleSet.class); // p.getBuildWrappersList().add(new ConfigFileBuildWrapper(managedFiles)) - p.setMaven(ToolInstallations.configureMaven3().getName()); + p.setMaven(ToolInstallations.configureMaven35().getName()); p.setScm(new ExtractResourceSCM(getClass().getResource("/maven3-project.zip"))); p.setGoals("initialize"); // -s ${MVN_SETTING} diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsCredentialsTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsCredentialsTest.java index cdf038e2..b81df451 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsCredentialsTest.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsCredentialsTest.java @@ -48,7 +48,7 @@ public void serverCredentialsMustBeInSettingsXmlAtRuntime() throws Exception { final MavenModuleSet p = j.createProject(MavenModuleSet.class); - p.setMaven(ToolInstallations.configureMaven3().getName()); + p.setMaven(ToolInstallations.configureMaven35().getName()); p.setScm(new ExtractResourceSCM(getClass().getResource("/maven3-project.zip"))); p.setGoals("initialize"); diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java index 79ba8bb0..5217e88d 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java @@ -130,7 +130,7 @@ public void mavenSettingsMustBeFoundInFreestyleProject() throws Exception { final FreeStyleProject p = jenkins.createFreeStyleProject(); - String mvnName = ToolInstallations.configureMaven3().getName(); + String mvnName = ToolInstallations.configureMaven35().getName(); Config c1 = createSetting(mavenSettingProvider); Config c2 = createSetting(globalMavenSettingsConfigProvider); @@ -151,7 +151,7 @@ public void notFoundMavenSettingsMustCauseBuildToFail() throws Exception { final FreeStyleProject p = jenkins.createFreeStyleProject(); - String mvnName = ToolInstallations.configureMaven3().getName(); + String mvnName = ToolInstallations.configureMaven35().getName(); MvnSettingsProvider s1 = new MvnSettingsProvider("dummyId"); MvnGlobalSettingsProvider s2 = new MvnGlobalSettingsProvider("dummyGlobalId"); diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/SettingsEnvVarTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/SettingsEnvVarTest.java index 2d50a169..f6375492 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/SettingsEnvVarTest.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/SettingsEnvVarTest.java @@ -41,7 +41,7 @@ public void serverCredentialsMustBeInSettingsXmlAtRuntime() throws Exception { final MavenModuleSet p = j.createProject(MavenModuleSet.class); - p.setMaven(ToolInstallations.configureMaven3().getName()); + p.setMaven(ToolInstallations.configureMaven35().getName()); p.setScm(new ExtractResourceSCM(getClass().getResource("/maven3-project.zip"))); p.setGoals("initialize");