Skip to content

Test JGit 7.2 and Mina SSHD 2.15.0 #73

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

Closed
MarkEWaite wants to merge 1 commit into from
Closed

Test JGit 7.2 and Mina SSHD 2.15.0 #73

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
30 changes: 18 additions & 12 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.8</version>
<relativePath />
</parent>

Expand All @@ -21,14 +21,6 @@
</license>
</licenses>

<developers>
<developer>
<id>Yashin</id>
<name>Yashin Luo</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 @@ -52,8 +44,8 @@
<properties>
<changelist>999999-SNAPSHOT</changelist>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.452</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.4</jenkins.version>
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
</properties>

Expand All @@ -63,7 +55,7 @@
<!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>3944.v1a_e4f8b_452db_</version>
<version>4440.v39a_9eb_b_c6b_4d</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -75,9 +67,23 @@
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
</dependency>
<!-- TODO Remove when included in plugin BOM -->
<dependency>
<groupId>io.jenkins.plugins.mina-sshd-api</groupId>
<artifactId>mina-sshd-api-common</artifactId>
<version>2.15.0-156.v48eb_e3c5a_805</version>
</dependency>
<!-- TODO Remove when included in plugin BOM -->
<dependency>
<groupId>io.jenkins.plugins.mina-sshd-api</groupId>
<artifactId>mina-sshd-api-core</artifactId>
<version>2.15.0-156.v48eb_e3c5a_805</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git-client</artifactId>
<!-- TODO Remove when included in plugin BOM -->
<version>6.2.0-rc3718.2c4095781192</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gitee/jenkins/connection/GiteeConnectionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.eclipse.jgit.util.StringUtils;
import org.jenkinsci.plugins.plaincredentials.StringCredentials;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

import javax.ws.rs.ProcessingException;
import javax.ws.rs.WebApplicationException;
Expand Down Expand Up @@ -49,7 +49,7 @@ public GiteeConnectionConfig() {
}

@Override
public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
connections = req.bindJSONToList(GiteeConnection.class, json.get("connections"));
// useAuthenticatedEndpoint = json.getBoolean("useAuthenticatedEndpoint");
refreshConnectionMap();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gitee/jenkins/connection/GiteeConnectionProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.apache.commons.lang.StringUtils;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

/**
* @author Robin Müller
Expand Down Expand Up @@ -71,7 +71,7 @@ public boolean isApplicable(Class<? extends Job> jobType) {
}

@Override
public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
public JobProperty<?> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
return req.bindJSON(GiteeConnectionProperty.class, formData);
}

Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/gitee/jenkins/trigger/GiteePushTrigger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;

import java.io.IOException;
import java.io.ObjectStreamException;
Expand Down Expand Up @@ -670,7 +670,7 @@ private StringBuilder retrieveParentUrl(Item item) {
}

private Job<?, ?> retrieveCurrentJob() {
StaplerRequest request = Stapler.getCurrentRequest();
StaplerRequest2 request = Stapler.getCurrentRequest2();
if (request != null) {
Ancestor ancestor = request.findAncestor(Job.class);
return ancestor == null ? null : (Job<?, ?>) ancestor.getObject();
Expand All @@ -679,19 +679,19 @@ private StringBuilder retrieveParentUrl(Item item) {
}

@Override
public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
public boolean configure(StaplerRequest2 req, JSONObject formData) throws FormException {
save();
return super.configure(req, formData);
}

public void doGenerateSecretToken(@AncestorInPath final Job<?, ?> project, StaplerResponse response) {
public void doGenerateSecretToken(@AncestorInPath final Job<?, ?> project, StaplerResponse2 response) {
byte[] random = new byte[16]; // 16x8=128bit worth of randomness, since we use md5 digest as the API token
RANDOM.nextBytes(random);
String secretToken = Util.toHexString(random);
response.setHeader("script", "document.getElementById('giteeSecretToken').value='" + secretToken + "'");
}

public void doClearSecretToken(@AncestorInPath final Job<?, ?> project, StaplerResponse response) {;
public void doClearSecretToken(@AncestorInPath final Job<?, ?> project, StaplerResponse2 response) {;
response.setHeader("script", "document.getElementById('giteeSecretToken').value=''");
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gitee/jenkins/trigger/handler/AbstractWebHookTriggerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.eclipse.jgit.transport.URIish;
import org.jenkinsci.plugins.workflow.job.WorkflowRun;

import javax.servlet.ServletException;
import jakarta.servlet.ServletException;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gitee/jenkins/trigger/handler/note/NoteHookTriggerHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.apache.commons.lang.StringUtils;
import org.eclipse.jgit.transport.URIish;

import javax.servlet.ServletException;
import jakarta.servlet.ServletException;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gitee/jenkins/trigger/handler/pull/PullRequestHookTriggerHandlerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.apache.commons.lang.StringUtils;
import org.eclipse.jgit.transport.URIish;

import javax.servlet.ServletException;
import jakarta.servlet.ServletException;
import java.io.IOException;
import java.util.Collection;
import java.util.ArrayList;
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/gitee/jenkins/webhook/ActionResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import jenkins.model.Jenkins;
import jenkins.scm.api.SCMSourceOwner;
import org.apache.commons.io.IOUtils;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;

import java.io.IOException;
import java.nio.charset.Charset;
Expand All @@ -44,7 +44,7 @@ public class ActionResolver {
private static final Pattern COMMIT_STATUS_PATTERN =
Pattern.compile("^(refs/[^/]+/)?(commits|builds)/(?<sha1>[0-9a-fA-F]+)(?<statusJson>/status.json)?$");

public WebHookAction resolve(final String projectName, StaplerRequest request) {
public WebHookAction resolve(final String projectName, StaplerRequest2 request) {
Iterator<String> restOfPathParts = Splitter.on('/').omitEmptyStrings().split(request.getRestOfPath()).iterator();
Item project = resolveProject(projectName, restOfPathParts);
if (project == null) {
Expand All @@ -53,7 +53,7 @@ public WebHookAction resolve(final String projectName, StaplerRequest request) {
return resolveAction(project, Joiner.on('/').join(restOfPathParts), request);
}

private WebHookAction resolveAction(Item project, String restOfPath, StaplerRequest request) {
private WebHookAction resolveAction(Item project, String restOfPath, StaplerRequest2 request) {
String method = request.getMethod();
if (method.equals("POST")) {
return onPost(project, request);
Expand All @@ -69,7 +69,7 @@ private WebHookAction resolveAction(Item project, String restOfPath, StaplerRequ
return new NoopAction();
}

private WebHookAction onGet(Job<?, ?> project, String restOfPath, StaplerRequest request) {
private WebHookAction onGet(Job<?, ?> project, String restOfPath, StaplerRequest2 request) {
Matcher commitMatcher = COMMIT_STATUS_PATTERN.matcher(restOfPath);
if (restOfPath.isEmpty() && request.hasParameter("ref")) {
return new BranchBuildPageRedirectAction(project, request.getParameter("ref"));
Expand All @@ -90,15 +90,15 @@ private WebHookAction onGetCommitStatus(Job<?, ?> project, String sha1, String s
}
}

private WebHookAction onGetStatusPng(Job<?, ?> project, StaplerRequest request) {
private WebHookAction onGetStatusPng(Job<?, ?> project, StaplerRequest2 request) {
if (request.hasParameter("ref")) {
return new BranchStatusPngAction(project, request.getParameter("ref"));
} else {
return new CommitStatusPngAction(project, request.getParameter("sha1"));
}
}

private WebHookAction onPost(Item project, StaplerRequest request) {
private WebHookAction onPost(Item project, StaplerRequest2 request) {
String eventHeader = request.getHeader("X-Gitee-Event");
if (eventHeader == null) {
LOGGER.log(Level.FINE, "Missing X-Gitee-Event header");
Expand All @@ -121,7 +121,7 @@ private WebHookAction onPost(Item project, StaplerRequest request) {
}
}

private String getRequestBody(StaplerRequest request) {
private String getRequestBody(StaplerRequest2 request) {
String requestBody;
try {
Charset charset = request.getCharacterEncoding() == null ? UTF_8 : Charset.forName(request.getCharacterEncoding());
Expand Down Expand Up @@ -152,7 +152,7 @@ public Item invoke() {
}

static class NoopAction implements WebHookAction {
public void execute(StaplerResponse response) {
public void execute(StaplerResponse2 response) {
}
}
}
14 changes: 7 additions & 7 deletions src/main/java/com/gitee/jenkins/webhook/GiteeOldWebHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import hudson.Extension;
import hudson.model.UnprotectedRootAction;
import hudson.security.csrf.CrumbExclusion;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;

import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down Expand Up @@ -40,7 +40,7 @@ public String getUrlName() {
return WEBHOOK_URL;
}

public void getDynamic(final String projectName, final StaplerRequest request, StaplerResponse response) {
public void getDynamic(final String projectName, final StaplerRequest2 request, StaplerResponse2 response) {
LOGGER.log(Level.INFO, "WebHook called with url: {0}", request.getRequestURIWithQueryString());
actionResolver.resolve(projectName, request).execute(response);
}
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/gitee/jenkins/webhook/GiteeWebHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import hudson.Extension;
import hudson.model.UnprotectedRootAction;
import hudson.security.csrf.CrumbExclusion;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;

import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down Expand Up @@ -40,7 +40,7 @@ public String getUrlName() {
return WEBHOOK_URL;
}

public void getDynamic(final String projectName, final StaplerRequest request, StaplerResponse response) {
public void getDynamic(final String projectName, final StaplerRequest2 request, StaplerResponse2 response) {
LOGGER.log(Level.INFO, "WebHook called with url: {0}", request.getRequestURIWithQueryString());
actionResolver.resolve(projectName, request).execute(response);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gitee/jenkins/webhook/WebHookAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.gitee.jenkins.webhook;

import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerResponse2;

/**
* @author Robin Müller
*/
public interface WebHookAction {
void execute(StaplerResponse response);
void execute(StaplerResponse2 response);
}
10 changes: 5 additions & 5 deletions src/main/java/com/gitee/jenkins/webhook/build/BuildWebHookAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
import jenkins.model.Jenkins;
import org.acegisecurity.Authentication;
import org.apache.commons.lang.StringUtils;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;
import com.gitee.jenkins.trigger.GiteePushTrigger;
import com.gitee.jenkins.connection.GiteeConnectionConfig;
import com.gitee.jenkins.webhook.WebHookAction;

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

/**
* @author Xinran Xiao
Expand All @@ -31,14 +31,14 @@ abstract class BuildWebHookAction implements WebHookAction {

abstract void execute();

public final void execute(StaplerResponse response) {
public final void execute(StaplerResponse2 response) {
processForCompatibility();
execute();
}

public static HttpResponses.HttpResponseException responseWithHook(final WebHook webHook) {
return new HttpResponses.HttpResponseException() {
public void generateResponse(StaplerRequest req, StaplerResponse rsp, Object node) throws IOException, ServletException {
public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException, ServletException {
String text = webHook.getWebHookDescription() + " has been accepted.";
rsp.setContentType("text/plain;charset=UTF-8");
rsp.getWriter().println(text);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gitee/jenkins/webhook/build/NoteBuildAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import hudson.security.ACL;
import hudson.util.HttpResponses;
import jenkins.model.Jenkins;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerResponse2;

import java.util.logging.Level;
import java.util.logging.Logger;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/gitee/jenkins/webhook/status/BuildPageRedirectAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import hudson.model.Run;
import hudson.util.HttpResponses;
import jenkins.model.Jenkins;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerResponse2;

import java.io.IOException;

Expand All @@ -19,7 +19,7 @@ protected BuildPageRedirectAction(Run<?, ?> build) {
this.build = build;
}

public void execute(StaplerResponse response) {
public void execute(StaplerResponse2 response) {
if (build != null) {
try {
response.sendRedirect2(Jenkins.getInstance().getRootUrl() + build.getUrl());
Expand Down
Loading
Loading