Skip to content

Commit dc1e643

Browse files
Merge pull request #210 from raul-arabaolaza/JETTY12
[JENKINS-73140] Adapt to Jetty 12 EE8
2 parents 8865261 + a69d5aa commit dc1e643

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Jenkinsfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
buildPlugin(
22
useContainerAgent: true,
33
configurations: [
4-
[platform: 'linux', jdk: 11],
54
[platform: 'linux', jdk: 21],
6-
[platform: 'windows', jdk: 17],
5+
[platform: 'windows', jdk: 17]
76
])

pom.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,17 @@
2828
<revision>4.11.0</revision>
2929
<changelist>999999-SNAPSHOT</changelist>
3030
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
31-
<jenkins.version>2.387.3</jenkins.version>
31+
<jenkins.version>2.472</jenkins.version>
3232
<no-test-jar>false</no-test-jar>
3333
<!--
3434
beware https://github.com/jenkinsci/plugin-pom/issues/705 and https://github.com/jenkinsci/plugin-pom/issues/707
3535
if updating these ensure the used transitive deps that have their version managed are updated as direct dependencies and any unused ones are removed.
3636
-->
3737
<okio.version>3.5.0</okio.version>
3838
<kotlin.version>1.9.22</kotlin.version>
39+
<!--TODO Until is included in parent pom -->
40+
<maven.compiler.release>17</maven.compiler.release>
41+
<jenkins-test-harness.version>2250.v03a_1295b_0a_30</jenkins-test-harness.version>
3942
</properties>
4043

4144
<dependencyManagement>

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

+1-1
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)