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.361.4 or newer #68

Merged
merged 7 commits into from
Dec 16, 2022
Merged

Require Jenkins 2.361.4 or newer #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bd5c46
Bump plugin from 4.49 to 4.53
dependabot[bot] Dec 15, 2022
7528aa5
Merge branch 'master' into dependabot/maven/master/org.jenkins-ci.plu…
gounthar Dec 15, 2022
38cf14a
chore(jenkins) Simplify Jenkinsfile
gounthar Dec 15, 2022
3d70b57
chore(dependencies) Require 2.361.4 as minimum Jenkins version
gounthar Dec 15, 2022
7b4aae1
fix(spotbug) Removed a warning
gounthar Dec 15, 2022
a770eb7
fix(spotbugs) Added the much needed import
gounthar Dec 15, 2022
ba38dec
Update justification
MarkEWaite Dec 16, 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
13 changes: 6 additions & 7 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Build the plugin using https://github.com/jenkins-infra/pipeline-library
buildPlugin(failFast: false,
configurations: [
[platform: 'linux', jdk: '17', jenkins: '2.371'],
[platform: 'linux', jdk: '11', jenkins: '2.361.1'],
[platform: 'windows', jdk: '8'],
])
buildPlugin(
useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
configurations: [
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
])
6 changes: 3 additions & 3 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.49</version>
<version>4.53</version>
<relativePath />
</parent>

Expand All @@ -16,7 +16,7 @@
<url>https://github.com/jenkinsci/cvs-plugin</url>

<properties>
<jenkins.version>2.346.3</jenkins.version>
<jenkins.version>2.361.4</jenkins.version>
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold>
</properties>
Expand Down Expand Up @@ -44,7 +44,7 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.346.x</artifactId>
<artifactId>bom-2.361.x</artifactId>
<version>1750.v0071fa_4c4a_e3</version>
<scope>import</scope>
<type>pom</type>
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/hudson/scm/CVSSCM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@

import static hudson.Util.fixEmptyAndTrim;

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

/**
* CVS.
*
Expand Down Expand Up @@ -438,6 +440,9 @@ private class RepositoryBrowser {
// we don't provide a way for users to edit this, other than by manually editing their XML config
private String changelogEncoding = "UTF-8";

@SuppressFBWarnings(
value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR",
justification = "Jenkins relies on calling overridable methods from constructors")
public DescriptorImpl() {
super(CVSRepositoryBrowser.class);
load();
Expand Down