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

Jump to bottom

Require Jenkins 2.346.3 or newer #194

Merged
merged 5 commits into from
Oct 1, 2022
Merged

Require Jenkins 2.346.3 or newer #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f13636
Remove unused exclusion
MarkEWaite Oct 1, 2022
5b22c6e
Require Jenkins 2.346.3 or newer
MarkEWaite Oct 1, 2022
15c58fa
Test with nested view plugin 1.26
MarkEWaite Oct 1, 2022
480be88
Update Jenkinsfile to match new min version
MarkEWaite Oct 1, 2022
48c09ed
Exclude two new spotbugs warnings
MarkEWaite Oct 1, 2022
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
6 changes: 3 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
buildPlugin(failFast: false,
configurations: [
[platform: 'linux', jdk: '17', jenkins: '2.342'],
[platform: 'linux', jdk: '11'],
[platform: 'windows', jdk: '8' ],
[platform: 'linux', jdk: '17', jenkins: '2.371' ],
[platform: 'linux', jdk: '11', jenkins: '2.361.1'],
[platform: 'windows', jdk: '8' ],
])
12 changes: 3 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<revision>4.1.1</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/priority-sorter-plugin</gitHubRepo>
<jenkins.version>2.332.4</jenkins.version>
<jenkins.version>2.346.3</jenkins.version>
<pmdVersion>6.50.0</pmdVersion>
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold>
Expand Down Expand Up @@ -49,7 +49,7 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.332.x</artifactId>
<artifactId>bom-2.346.x</artifactId>
<version>1607.va_c1576527071</version>
<scope>import</scope>
<type>pom</type>
Expand Down Expand Up @@ -122,12 +122,6 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand Down Expand Up @@ -164,7 +158,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>nested-view</artifactId>
<version>1.24</version>
<version>1.26</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/jenkins/advancedqueue/RunExclusiveThrottler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package jenkins.advancedqueue;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

import hudson.Extension;
import hudson.model.Queue.Item;
import hudson.model.Run;
Expand All @@ -18,7 +20,9 @@
public class RunExclusiveThrottler {

static private List<String> exclusiveJobs = Collections.synchronizedList(new ArrayList<String>());
@SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification = "Low risk")
static private int exclusiveJobGroupId = -1;
@SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification = "Low risk")
static private String exclusiveJobName = "";

static PriorityConfigurationCallback dummyCallback = new PriorityConfigurationCallback() {
Expand Down