From 70d151e60ec42689f0d205887719fdd4ce599c4a Mon Sep 17 00:00:00 2001
From: Boris Yao <106237859+BorisYaoA@users.noreply.github.com>
Date: Mon, 19 Aug 2024 14:27:11 +0200
Subject: [PATCH] MarkWaite@yahoo.com

* [JENKINS-73134] Adapt github-oauth-plugin for jetty12

* change jenkins version

* revert jenkins version

* Require Jenkins 2.472 as minimum Jenkins version

Jetty 12 EE 8 dependencies in the tests require Jenkins 2.472 or newer.

Use plugin BOM 2.462.x as the most recent plugin BOM.  Once 2.472 is
available in an LTS, then the plugin BOM that includes Jenkins 2.472
can be used as well.

* Test with Jenkins test harness 2254.x

Most recent Jenkins test harness

---------

Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
---
 pom.xml                                              | 12 +++++++++---
 .../plugins/GithubAccessTokenPropertySEC797Test.java |  6 +++---
 .../plugins/GithubAccessTokenPropertyTest.java       |  6 +++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 193d0bb3..c9339884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,8 +10,14 @@
 
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <jenkins.version>2.361.4</jenkins.version>
+        <jenkins.baseline>2.462</jenkins.baseline>
+        <!-- TODO: replace when 2.472 is in LTS -->
+        <!-- <jenkins.version>${jenkins.baseline}.3</jenkins.version> -->
+        <jenkins.version>2.472</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
+        <!-- TODO JENKINS-73339 until in parent POM -->
+        <jenkins-test-harness.version>2254.vcff7a_d4969e5</jenkins-test-harness.version>
+        <maven.compiler.release>17</maven.compiler.release>
     </properties>
 
     <groupId>org.jenkins-ci.plugins</groupId>
@@ -68,8 +74,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.361.x</artifactId>
-                <version>2102.v854b_fec19c92</version>
+                <artifactId>bom-${jenkins.baseline}.x</artifactId>
+                <version>3271.vf18ea_cb_9edfb_</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertySEC797Test.java b/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertySEC797Test.java
index 0103cde5..4e303f14 100644
--- a/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertySEC797Test.java
+++ b/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertySEC797Test.java
@@ -33,9 +33,9 @@
 import org.apache.commons.lang.StringUtils;
 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.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.DefaultServlet;
+import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertyTest.java b/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertyTest.java
index 79f5009e..84c378fe 100644
--- a/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertyTest.java
+++ b/src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertyTest.java
@@ -33,9 +33,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.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.DefaultServlet;
+import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;