Skip to content

Commit 964a90a

Browse files
committed
feat(java): Require Jenkins core 2.479.1 and Java 17.
1 parent 831b1cd commit 964a90a

File tree

3 files changed

+11
-31
lines changed

3 files changed

+11
-31
lines changed

pom.xml

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<parent>
2929
<groupId>org.jenkins-ci.plugins</groupId>
3030
<artifactId>plugin</artifactId>
31-
<version>4.41</version>
31+
<version>5.7</version>
3232
<relativePath />
3333
</parent>
3434
<artifactId>xcode-plugin</artifactId>
@@ -44,28 +44,6 @@
4444
<distribution>repo</distribution>
4545
</license>
4646
</licenses>
47-
<developers>
48-
<developer>
49-
<id>rayhilton</id>
50-
<name>Ray Yamamoto Hilton</name>
51-
<email>[email protected]</email>
52-
</developer>
53-
<developer>
54-
<id>aheritier</id>
55-
<name>Arnaud Heritier</name>
56-
<email>[email protected]</email>
57-
</developer>
58-
<developer>
59-
<id>lacostej</id>
60-
<name>Jerome Lacoste</name>
61-
<email>[email protected]</email>
62-
</developer>
63-
<developer>
64-
<id>kazuhidet</id>
65-
<name>Kazuhide Takahashi</name>
66-
<email>[email protected]</email>
67-
</developer>
68-
</developers>
6947
<scm>
7048
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
7149
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
@@ -88,8 +66,8 @@
8866
<dependencies>
8967
<dependency>
9068
<groupId>io.jenkins.tools.bom</groupId>
91-
<artifactId>bom-2.319.x</artifactId>
92-
<version>1466.v85a_616ea_b_87c </version>
69+
<artifactId>bom-${jenkins.baseline}.x</artifactId>
70+
<version>4136.vca_c3202a_7fd1 </version>
9371
<type>pom</type>
9472
<scope>import</scope>
9573
</dependency>
@@ -146,7 +124,9 @@
146124
<revision>2.0.17</revision>
147125
<changelist>999999-SNAPSHOT</changelist>
148126
<gitHubRepo>jenkinsci/xcode-plugin</gitHubRepo>
149-
<jenkins.version>2.319.1</jenkins.version>
127+
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
128+
<jenkins.baseline>2.479</jenkins.baseline>
129+
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
150130
</properties>
151131
<build>
152132
<plugins>

src/main/java/au/com/rayh/GlobalConfigurationImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.kohsuke.stapler.DataBoundConstructor;
3030
import org.kohsuke.stapler.DataBoundSetter;
3131
import org.kohsuke.stapler.QueryParameter;
32-
import org.kohsuke.stapler.StaplerRequest;
32+
import org.kohsuke.stapler.StaplerRequest2;
3333

3434
import hudson.Extension;
3535
import hudson.model.AbstractProject;
@@ -42,7 +42,7 @@
4242
import java.util.logging.Logger;
4343

4444
import edu.umd.cs.findbugs.annotations.CheckForNull;
45-
import javax.servlet.ServletException;
45+
import jakarta.servlet.ServletException;
4646

4747
/**
4848
* Stores global configuration for XCode.
@@ -230,7 +230,7 @@ public String getDisplayName() {
230230
}
231231

232232
@Override
233-
public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
233+
public boolean configure(StaplerRequest2 req, JSONObject formData) throws FormException {
234234
req.bindJSON(this, formData);
235235
setKeychains(new ArrayList<>(req.bindParametersToList(Keychain.class, "keychain.")));
236236
setTeams(new ArrayList<>(req.bindParametersToList(Team.class, "team.")));

src/main/java/hudson/plugins/xcode/XcodeInstallation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.jenkinsci.Symbol;
1717
import org.kohsuke.stapler.DataBoundConstructor;
1818
import org.kohsuke.stapler.QueryParameter;
19-
import org.kohsuke.stapler.StaplerRequest;
19+
import org.kohsuke.stapler.StaplerRequest2;
2020

2121
import java.io.File;
2222
import java.io.IOException;
@@ -111,7 +111,7 @@ public String getDisplayName() {
111111
}
112112

113113
@Override
114-
public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
114+
public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
115115
setInstallations(req.bindJSONToList(clazz, json.get("tool")).toArray(new XcodeInstallation[0]));
116116
save();
117117
return true;

0 commit comments

Comments
 (0)