Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernize plugin #237

Merged
merged 1 commit into from
May 29, 2023
Merged

Modernize plugin #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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],
])
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.51</version>
<version>4.63</version>
<relativePath />
</parent>

Expand All @@ -18,7 +18,7 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<jenkins.version>2.319.3</jenkins.version>
<jenkins.version>2.361.4</jenkins.version>
<findbugs.effort>Max</findbugs.effort>
<hpi.compatibleSinceVersion>4.0</hpi.compatibleSinceVersion>
</properties>
Expand Down Expand Up @@ -68,8 +68,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.319.x</artifactId>
<version>1654.vcb_69d035fa_20</version>
<artifactId>bom-2.361.x</artifactId>
<version>2081.v85885a_d2e5c5</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/hudson/plugins/promoted_builds/PromotionProcess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Comment on lines +655 to +656
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed a SpotBugs warning resulting from the plugin parent POM upgrade.

return FormValidation.warning(Messages.JobPropertyImpl_LabelString_NoMatch());
return FormValidation.ok();
}
Expand Down