From d891dfd682e8417b0eb3aeb2968d461061f93c25 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Thu, 14 Jul 2022 11:56:15 +0100 Subject: [PATCH 1/4] Remove java 8 from CI --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 92746332..a118c5b2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,6 @@ #!/usr/bin/env groovy /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */ -buildPlugin(useAci: true) +buildPlugin(useContainerAgent: true, configurations: [ + [ platform: "linux", jdk: "11" ] +]) From 8a4527f4f001107d5fb6b453717e01e7d9997faa Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Thu, 14 Jul 2022 14:27:35 +0100 Subject: [PATCH 2/4] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a118c5b2..4f53ef37 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,5 +2,6 @@ /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */ buildPlugin(useContainerAgent: true, configurations: [ - [ platform: "linux", jdk: "11" ] + [ platform: "linux", jdk: "11" ], + [ platform: "windows", jdk: "11" ], ]) From 87484135f3a9558b27fcb285dd60427d21ee86db Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Thu, 14 Jul 2022 14:28:45 +0100 Subject: [PATCH 3/4] Update Combination.java --- src/main/java/hudson/matrix/Combination.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/hudson/matrix/Combination.java b/src/main/java/hudson/matrix/Combination.java index 76072e1f..5fca315e 100644 --- a/src/main/java/hudson/matrix/Combination.java +++ b/src/main/java/hudson/matrix/Combination.java @@ -84,7 +84,7 @@ public int toIndex(AxisList axis) { * Evaluates the given Groovy expression with values bound from this combination. * *

- * For example, if this combination is a=X,b=Y, then expressions like a=="X" would evaluate to + * For example, if this combination is a=X,b=Y, then expressions like a=="X" would evaluate to * true. */ public boolean evalGroovyExpression(AxisList axes, String expression) { @@ -147,7 +147,7 @@ public List values(Collection axes) { /** * Converts to the ID string representation: - * axisName=value,axisName=value,... + * axisName=value,axisName=value,... * * @param sep1 * The separator between multiple axes. From 642b2c588c2b25087e2cbf4df0499576730dc6f4 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Thu, 14 Jul 2022 14:29:03 +0100 Subject: [PATCH 4/4] Update AxisDescriptor.java --- src/main/java/hudson/matrix/AxisDescriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/hudson/matrix/AxisDescriptor.java b/src/main/java/hudson/matrix/AxisDescriptor.java index 11214c8b..4d120c59 100644 --- a/src/main/java/hudson/matrix/AxisDescriptor.java +++ b/src/main/java/hudson/matrix/AxisDescriptor.java @@ -80,7 +80,7 @@ public FormValidation doCheckName(@QueryParameter String value) { * necessary to disallow '=' in value as everything after the first * occurrence is considered to be a value. * - * Subclasses are expected to expose own doCheck method possibly delegating to this one. + * Subclasses are expected to expose own doCheck method possibly delegating to this one. */ public FormValidation checkValue(@QueryParameter String value) { if(Util.fixEmpty(value)==null)