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

feat(java): Require Jenkins core 2.479.1 and Java 17. #162

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

feat(java): Require Jenkins core 2.479.1 and Java 17. #162

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
32 changes: 6 additions & 26 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.41</version>
<version>5.7</version>
<relativePath />
</parent>
<artifactId>xcode-plugin</artifactId>
Expand All @@ -44,28 +44,6 @@
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>rayhilton</id>
<name>Ray Yamamoto Hilton</name>
<email>[email protected]</email>
</developer>
<developer>
<id>aheritier</id>
<name>Arnaud Heritier</name>
<email>[email protected]</email>
</developer>
<developer>
<id>lacostej</id>
<name>Jerome Lacoste</name>
<email>[email protected]</email>
</developer>
<developer>
<id>kazuhidet</id>
<name>Kazuhide Takahashi</name>
<email>[email protected]</email>
</developer>
</developers>
<scm>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
Expand All @@ -88,8 +66,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.319.x</artifactId>
<version>1466.v85a_616ea_b_87c </version>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>4136.vca_c3202a_7fd1 </version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -146,7 +124,9 @@
<revision>2.0.17</revision>
<changelist>999999-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/xcode-plugin</gitHubRepo>
<jenkins.version>2.319.1</jenkins.version>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
</properties>
<build>
<plugins>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/au/com/rayh/GlobalConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,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 hudson.Extension;
import hudson.model.AbstractProject;
Expand All @@ -42,7 +42,7 @@
import java.util.logging.Logger;

import edu.umd.cs.findbugs.annotations.CheckForNull;
import javax.servlet.ServletException;
import jakarta.servlet.ServletException;

/**
* Stores global configuration for XCode.
Expand Down Expand Up @@ -230,7 +230,7 @@ public String getDisplayName() {
}

@Override
public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
public boolean configure(StaplerRequest2 req, JSONObject formData) throws FormException {
req.bindJSON(this, formData);
setKeychains(new ArrayList<>(req.bindParametersToList(Keychain.class, "keychain.")));
setTeams(new ArrayList<>(req.bindParametersToList(Team.class, "team.")));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/plugins/xcode/XcodeInstallation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -111,7 +111,7 @@ public String getDisplayName() {
}

@Override
public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
setInstallations(req.bindJSONToList(clazz, json.get("tool")).toArray(new XcodeInstallation[0]));
save();
return true;
Expand Down