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

Require Jenkins 2.479.1 or newer #134

Merged
merged 5 commits into from
Jan 19, 2025
Merged

Require Jenkins 2.479.1 or newer #134

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
565f03c
Bump org.jenkins-ci.plugins:plugin from 4.88 to 5.5
dependabot[bot] Jan 13, 2025
7b59615
Require Jenkins 2.479.1 or newer
MarkEWaite Jan 19, 2025
bc6de34
Use pattern matching instanceof from Java 17
MarkEWaite Jan 19, 2025
1424361
Use str.formatted instead of String.format
MarkEWaite Jan 19, 2025
eb11cad
Use jakarta ServletException, not javax
MarkEWaite Jan 19, 2025
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
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.88</version>
<version>5.5</version>
<relativePath />
</parent>

Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>3435.v238d66a_043fb_</version>
<version>3944.v1a_e4f8b_452db_</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -33,8 +33,8 @@
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/build-name-setter-plugin</gitHubRepo>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.440</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<!--Enabling static analysis using spotbugs checks-->
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold> <!--Decreased threshold for more deeper checks-->
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/EnvironmentVarSetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private void log(String format, Object... args) {
return;
}

String message = String.format(format, args);
String message = format.formatted(args);
LOGGER.fine(message);
if (log != null) {
log.println(message);
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/org/jenkinsci/plugins/buildnamesetter/Executor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,10 @@
}

public void setVariable(String nameTemplate) throws MacroEvaluationException {
if (!(run instanceof AbstractBuild)) {
return;
if (run instanceof AbstractBuild abstractBuild) {

Check warning on line 63 in src/main/java/org/jenkinsci/plugins/buildnamesetter/Executor.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line 

Line 63 is only partially covered, one branch is missing
EnvironmentVarSetter.setVar(abstractBuild, EnvironmentVarSetter.buildDisplayNameVar,
evaluateMacro(nameTemplate), listener.getLogger());
}

AbstractBuild abstractBuild = (AbstractBuild) run;
EnvironmentVarSetter.setVar(abstractBuild, EnvironmentVarSetter.buildDisplayNameVar,
evaluateMacro(nameTemplate), listener.getLogger());
}

public String evaluateMacro(String template) throws MacroEvaluationException {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jenkinsci/plugins/buildnameupdater/BuildNameUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import hudson.tasks.BuildStepDescriptor;
import hudson.tasks.Builder;
import hudson.util.FormValidation;
import javax.servlet.ServletException;
import jakarta.servlet.ServletException;
import jenkins.MasterToSlaveFileCallable;
import org.apache.commons.lang.StringUtils;
import org.jenkinsci.plugins.buildnamesetter.Executor;
Expand Down
Loading