Skip to content

feat(java): Require Jenkins core 2.492.3 and Java 17 #8

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

Open
gounthar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(java): Require Jenkins core 2.492.3 and Java 17 #8

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
22 changes: 7 additions & 15 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.16</version>
<version>5.17</version>
<relativePath />
</parent>
<groupId>io.jenkins.plugins</groupId>
Expand All @@ -15,25 +15,19 @@
<description>This plug-in can dynamically create a set of check boxes for users to check before building. The check box settings are configured through YAML or JSON files, and the file content can be obtained through HTTP, HTTPS, or file paths. After checking the check box, the user can use params['ParameterName'] in the build script to get the selected value. The result of the user's selection is returned in the form of a string separated by "," value1, value2, value3.</description>
<url>https://github.com/jenkinsci/custom-checkbox-parameter-plugin</url>
<properties>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.492</jenkins.baseline>
<!--https://www.jenkins.io/doc/developer/plugin-development/updating-parent/-->
<jenkins.version>2.277.1</jenkins.version>
<java.level>8</java.level>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
</properties>
<licenses>
<license>
<name>MIT License</name>
<url>https://opensource.org/licenses/MIT</url>
</license>
</licenses>
<developers>
<developer>
<id>bluersw</id>
<name>SunWeiSheng</name>
<email>sunweisheng@live.cn</email>
</developer>
</developers>
<scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<connection>scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>HEAD</tag>
Expand All @@ -55,8 +49,8 @@
<dependency>
<!-- Pick up common dependencies for 2.164.x: https://github.com/jenkinsci/bom#usage -->
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.277.x</artifactId>
<version>26</version>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>4890.vfca_82c6741a_d</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -66,7 +60,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.28.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -102,7 +95,6 @@
<dependency>
<groupId>com.sonyericsson.hudson.plugins.rebuild</groupId>
<artifactId>rebuild</artifactId>
<version>1.25</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bluersw/CheckboxParameterDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

import static org.apache.commons.lang.StringUtils.*;

Expand Down Expand Up @@ -177,7 +177,7 @@ public void setProtocol(Protocol protocol) {
@CheckForNull
@Override
@SuppressWarnings("rawtypes")
public ParameterValue createValue(StaplerRequest staplerRequest, JSONObject jsonObject) {
public ParameterValue createValue(StaplerRequest2 staplerRequest, JSONObject jsonObject) {
StringBuilder result = new StringBuilder();
for (Object o : jsonObject.entrySet()) {
Map.Entry entry = (Map.Entry) o;
Expand All @@ -200,7 +200,7 @@ public ParameterValue createValue(StaplerRequest staplerRequest, JSONObject json

@CheckForNull
@Override
public ParameterValue createValue(StaplerRequest staplerRequest) {
public ParameterValue createValue(StaplerRequest2 staplerRequest) {
String[] value = staplerRequest.getParameterValues(this.getName());
if (value == null || value.length == 0 || isBlank(value[0])) {
return this.getDefaultParameterValue();
Expand Down Expand Up @@ -384,7 +384,7 @@ public String getDisplayName() {
}

@Override
public ParameterDefinition newInstance(@Nullable StaplerRequest req, @NonNull JSONObject formData) {
public ParameterDefinition newInstance(@Nullable StaplerRequest2 req, @NonNull JSONObject formData) {
assert req != null;
return req.bindJSON(CheckboxParameterDefinition.class,formData);
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/bluersw/model/CheckboxList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import java.io.IOException;
import java.util.ArrayList;

import javax.servlet.ServletException;
import jakarta.servlet.ServletException;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;
import org.kohsuke.stapler.export.ExportConfig;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;
Expand Down Expand Up @@ -45,7 +45,7 @@ public void add(String name, String value,boolean selected){
public void setMessage(String message){this.message = message;}

@Override
public void generateResponse(StaplerRequest staplerRequest, StaplerResponse staplerResponse, Object o) throws IOException, ServletException {
public void generateResponse(StaplerRequest2 staplerRequest, StaplerResponse2 staplerResponse, Object o) throws IOException, ServletException {
ExportConfig ec = new ExportConfig();
ec.withFlavor(Flavor.JSON);
staplerResponse.serveExposedBean(staplerRequest,this, ec);
Expand Down