Skip to content

Commit ebe488c

Browse files
committed
feat(java): Require Jenkins core 2.479.1 and Java 17.
1 parent a324548 commit ebe488c

File tree

2 files changed

+9
-22
lines changed

2 files changed

+9
-22
lines changed

pom.xml

+7-20
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.18</version>
7+
<version>5.7</version>
88
<relativePath />
99
</parent>
1010

@@ -24,14 +24,15 @@
2424
</scm>
2525

2626
<properties>
27+
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
28+
<jenkins.baseline>2.479</jenkins.baseline>
2729
<!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
28-
<jenkins.version>2.263.1</jenkins.version>
29-
<java.level>8</java.level>
30+
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
3031
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
3132
<pipeline-model-definition.version>1.6.0</pipeline-model-definition.version>
3233
<revision>1.0.0</revision>
3334
<changelist>-SNAPSHOT</changelist>
34-
<jenkins-test-harness.version>2.34</jenkins-test-harness.version>
35+
<jenkins-test-harness.version>2391.v9b_3e2d3351a_2</jenkins-test-harness.version>
3536
<kubernetes-server-mock.version>5.4.0</kubernetes-server-mock.version>
3637
<tekton-client.version>5.4.0</tekton-client.version>
3738
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
@@ -48,13 +49,6 @@
4849
</license>
4950
</licenses>
5051

51-
<developers>
52-
<developer>
53-
<id>waveywaves</id>
54-
<name>Vibhav Bobade</name>
55-
</developer>
56-
</developers>
57-
5852
<dependencies>
5953
<dependency>
6054
<groupId>org.slf4j</groupId>
@@ -97,7 +91,6 @@
9791
<dependency>
9892
<groupId>org.jenkins-ci.plugins</groupId>
9993
<artifactId>github-branch-source</artifactId>
100-
<version>2.9.7</version>
10194
<scope>test</scope>
10295
</dependency>
10396
<dependency>
@@ -115,7 +108,6 @@
115108
<dependency>
116109
<groupId>org.jenkins-ci.plugins</groupId>
117110
<artifactId>pipeline-utility-steps</artifactId>
118-
<version>2.7.1</version>
119111
<scope>test</scope>
120112
</dependency>
121113

@@ -125,16 +117,11 @@
125117
<dependencies>
126118
<dependency>
127119
<groupId>io.jenkins.tools.bom</groupId>
128-
<artifactId>bom-2.249.x</artifactId>
129-
<version>29</version>
120+
<artifactId>bom-${jenkins.baseline}.x</artifactId>
121+
<version>4136.vca_c3202a_7fd1</version>
130122
<scope>import</scope>
131123
<type>pom</type>
132124
</dependency>
133-
<dependency>
134-
<groupId>org.slf4j</groupId>
135-
<artifactId>slf4j-api</artifactId>
136-
<version>1.7.30</version>
137-
</dependency>
138125
<dependency>
139126
<groupId>org.apache.commons</groupId>
140127
<artifactId>commons-lang3</artifactId>

src/main/java/org/waveywaves/jenkins/plugins/tekton/client/global/TektonGlobalConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import jenkins.model.GlobalConfiguration;
66
import jenkins.model.Jenkins;
77
import net.sf.json.JSONObject;
8-
import org.kohsuke.stapler.StaplerRequest;
8+
import org.kohsuke.stapler.StaplerRequest2;
99
import org.waveywaves.jenkins.plugins.tekton.client.TektonUtils;
1010

1111
import java.util.ArrayList;
@@ -37,7 +37,7 @@ public static TektonGlobalConfiguration get() {
3737
}
3838

3939
@Override
40-
public boolean configure(final StaplerRequest req, final JSONObject formData) {
40+
public boolean configure(final StaplerRequest2 req, final JSONObject formData) {
4141
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
4242
setClusterConfigs(req.bindJSONToList(ClusterConfig.class, formData.get("clusterConfigs")));
4343
save();

0 commit comments

Comments
 (0)