From a3201985b458c7bca47e39461c1522bd14c8ea22 Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Mon, 13 Jan 2020 22:10:57 +0100 Subject: [PATCH 1/7] bump jcasc and fix jcasc test harness dependency --- pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index dda46576..3f66efba 100644 --- a/pom.xml +++ b/pom.xml @@ -227,15 +227,14 @@ 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 From c01d63a2208f73fc2d92941e5ca01451566a1e82 Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Tue, 14 Jan 2020 11:02:39 +0100 Subject: [PATCH 2/7] exclude jsoup from maven plugin --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 3f66efba..3ee3b6d9 100644 --- a/pom.xml +++ b/pom.xml @@ -193,6 +193,12 @@ maven-plugin 3.1 test + + + org.jsoup + jsoup + + org.jenkins-ci.main From ea51ade3d86b0caee96438940a08c6927f7dee42 Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Tue, 14 Jan 2020 11:04:26 +0100 Subject: [PATCH 3/7] bump ssh credentials --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ee3b6d9..db5500c9 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ org.jenkins-ci.plugins ssh-credentials - 1.12 + 1.13 org.jenkins-ci.plugins From b23692b926f8010105ff81a1316db78a8afbfc98 Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Tue, 14 Jan 2020 11:08:11 +0100 Subject: [PATCH 4/7] snip com.google.code.findbugs.annotations --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index db5500c9..e5c04d54 100644 --- a/pom.xml +++ b/pom.xml @@ -224,12 +224,6 @@ 1.16 test - - com.google.code.findbugs - annotations - 3.0.0 - provided - io.jenkins configuration-as-code From b49a02f6c436c60d7420131d491c85ba1c1186d9 Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Sun, 19 Jan 2020 10:26:06 +0100 Subject: [PATCH 5/7] bump parent pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5c04d54..96f14feb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 3.55 + 3.56 config-file-provider From 63bb6d712cb86c89c730b6542d022aae9a2bf9ee Mon Sep 17 00:00:00 2001 From: Joseph Petersen Date: Sun, 19 Jan 2020 10:26:44 +0100 Subject: [PATCH 6/7] manage commons-lang3 --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 96f14feb..8def5bda 100644 --- a/pom.xml +++ b/pom.xml @@ -242,6 +242,12 @@ 3.6 test + + org.apache.commons + commons-lang3 + 3.9 + test + From c1ba14af628fe684460be06e769b29f1ccd9b44c Mon Sep 17 00:00:00 2001 From: imod Date: Mon, 20 Jan 2020 10:54:18 +0100 Subject: [PATCH 7/7] fix testcases which trigger a maven build (old bundled maven version used http instead of https) --- pom.xml | 2 +- .../configfiles/buildwrapper/ConfigFileBuildWrapperTest.java | 2 +- .../configfiles/maven/job/MvnSettingsCredentialsTest.java | 2 +- .../configfiles/maven/job/MvnSettingsProviderTest.java | 4 ++-- .../plugins/configfiles/maven/job/SettingsEnvVarTest.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 8def5bda..c2687931 100644 --- a/pom.xml +++ b/pom.xml @@ -203,7 +203,7 @@ org.jenkins-ci.main jenkins-test-harness-tools - 2.0 + 2.2 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");