diff --git a/Jenkinsfile b/Jenkinsfile
index e4d45c13..658e67bb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,12 +1,4 @@
-#!/usr/bin/env groovy
-
-buildPlugin(useContainerAgent: false, // temporarily disable for Windows issues
- configurations: [
- [platform: 'linux', jdk: '11'],
- [platform: 'windows', jdk: '8'],
-
- // testing the Guava & Guice bumps
- // https://github.com/jenkinsci/jenkins/pull/5707
- // https://github.com/jenkinsci/jenkins/pull/5858
- //[ platform: "linux", jdk: "8", jenkins: '2.321', javaLevel: "8" ]
- ])
+buildPlugin(configurations: [
+ [platform: 'linux', jdk: 17],
+ [platform: 'windows', jdk: 11],
+])
diff --git a/pom.xml b/pom.xml
index 75dfb447..fa7d70e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
org.jenkins-ci.plugins
plugin
- 4.51
+ 4.63
@@ -18,7 +18,7 @@
999999-SNAPSHOT
jenkinsci/${project.artifactId}-plugin
- 2.319.3
+ 2.361.4
Max
4.0
@@ -68,8 +68,8 @@
io.jenkins.tools.bom
- bom-2.319.x
- 1654.vcb_69d035fa_20
+ bom-2.361.x
+ 2081.v85885a_d2e5c5
import
pom
diff --git a/src/main/java/hudson/plugins/promoted_builds/PromotionProcess.java b/src/main/java/hudson/plugins/promoted_builds/PromotionProcess.java
index 080c48fa..00534647 100644
--- a/src/main/java/hudson/plugins/promoted_builds/PromotionProcess.java
+++ b/src/main/java/hudson/plugins/promoted_builds/PromotionProcess.java
@@ -652,7 +652,8 @@ public FormValidation doCheckLabelString(@QueryParameter String value) {
Messages.JobPropertyImpl_LabelString_InvalidBooleanExpression(e.getMessage()));
}
// TODO: if there's an atom in the expression that is empty, report it
- if (Jenkins.get().getLabel(value).isEmpty())
+ Label label = Jenkins.get().getLabel(value);
+ if (label == null || label.isEmpty())
return FormValidation.warning(Messages.JobPropertyImpl_LabelString_NoMatch());
return FormValidation.ok();
}