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

Jump to bottom

[JENKINS-73133] Adapt GitHub for Jetty 12 (EE 8) #380

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

[JENKINS-73133] Adapt GitHub for Jetty 12 (EE 8) #380

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
[JENKINS-73133] Adapt GitHub for Jetty 12 (EE 8)
  • Loading branch information
@basil
basil committed Jun 21, 2024
commit dd3ff7b9db74cedbb550f5ea7b1e363b92d620f7
6 changes: 5 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,14 @@
<revision>1.39.1</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/github-plugin</gitHubRepo>
<jenkins.version>2.414.3</jenkins.version>
<!-- TODO JENKINS-73130 https://ci.jenkins.io/job/Core/job/jenkins/job/prototype/ -->
<jenkins.version>2.464-rc35068.0fff405a_c344</jenkins.version>
<release.skipTests>false</release.skipTests>
<tagNameFormat>v@{project.version}</tagNameFormat>
<useBeta>true</useBeta> <!-- For Jenkins.MANAGE permission -->
<!-- TODO JENKINS-73339 until in parent POM -->
<jenkins-test-harness.version>2230.v4fa_477b_634f4</jenkins-test-harness.version>
<maven.compiler.release>17</maven.compiler.release>
</properties>

<repositories>
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/org/jenkinsci/plugins/github/config/GitHubServerConfigIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@
import net.sf.json.JSONObject;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletContextHandler.Context;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.ee8.servlet.DefaultServlet;
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
import org.eclipse.jetty.ee8.servlet.ServletHolder;
import org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl;
import org.junit.After;
import org.junit.Before;
Expand Down
Loading