Skip to content

Commit 0c82f79

Browse files
committed
Updated POM for Jetty 12 EE 8 & fixed the UT
1 parent 07cc6e9 commit 0c82f79

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

Jenkinsfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
buildPlugin(useContainerAgent: true, configurations: [
22
[platform: 'linux', jdk: 21],
3-
[platform: 'linux', jdk: 17],
4-
[platform: 'windows', jdk: 11],
3+
[platform: 'windows', jdk: 17],
54
])

pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@
2525
<properties>
2626
<revision>1.321</revision>
2727
<changelist>999999-SNAPSHOT</changelist>
28-
<jenkins.version>2.361.4</jenkins.version>
28+
<jenkins.version>2.472-rc35224.f615612a_1850</jenkins.version>
2929
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
3030
<no-test-jar>false</no-test-jar>
31+
<!-- TODO JENKINS-73339 until in parent POM -->
32+
<jenkins-test-harness.version>2250.v03a_1295b_0a_30</jenkins-test-harness.version>
33+
<maven.compiler.release>17</maven.compiler.release>
3134
</properties>
3235

3336
<dependencies>

src/test/java/jenkins/plugins/github/api/mock/MockGitHub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.eclipse.jetty.server.HttpConnectionFactory;
2828
import org.eclipse.jetty.server.Server;
2929
import org.eclipse.jetty.server.ServerConnector;
30-
import org.eclipse.jetty.servlet.ServletContextHandler;
30+
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
3131
import org.jvnet.hudson.test.ThreadPoolImpl;
3232
import org.kohsuke.stapler.HttpResponse;
3333
import org.kohsuke.stapler.QueryParameter;

0 commit comments

Comments
 (0)