From 4dfa8ab8dafa494bdefead07e3ab218ba59c3caa Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Thu, 16 Jan 2020 20:46:41 +0000 Subject: [PATCH 1/4] Upgrade to use jcasc test harness --- pom.xml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index e225f4403..89c85ded9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 3.43 + 3.55 @@ -35,7 +35,7 @@ 2.4.5 2.20 - 1.8 + 1.35 @@ -289,7 +289,7 @@ org.jenkins-ci.plugins jackson2-api - 2.8.11.2 + 2.10.2 @@ -336,10 +336,9 @@ test - io.jenkins - configuration-as-code + io.jenkins.configuration-as-code + test-harness ${configuration-as-code.version} - tests test From 37b56195590762f1982bda8fd2c68f176251f3f1 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Thu, 16 Jan 2020 21:09:49 +0000 Subject: [PATCH 2/4] Bump jenkins.version due to jackson2-api plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 89c85ded9..9c0ea9f0c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 2.0 - 2.60.3 + 2.138.4 4.0.2 From a5459d3d1aab3b39feda238eb9c14c4e438d7185 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Fri, 17 Jan 2020 20:38:19 +0000 Subject: [PATCH 3/4] Fix enforcer errors --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9c0ea9f0c..62169bac0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ false - 2.4.5 + 2.4.11 2.20 1.35 @@ -329,6 +329,12 @@ + + org.codehaus.groovy + groovy-all + ${groovy.version} + test + io.jenkins configuration-as-code From bf2d4de86c36347e23a8605ac07deed2ff252f15 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Fri, 17 Jan 2020 20:51:08 +0000 Subject: [PATCH 4/4] Rerun CI