Migrate from EE 8 to EE 9 (#278)

* Migrate from EE 8 to EE 9

* Update Jenkinsfile

---------

Co-authored-by: Tim Jacomb <[email protected]>

Author: basil

Jenkinsfile

@@ -1,4 +1,4 @@
 buildPlugin(useContainerAgent: true, configurations: [
-  [ platform: 'linux', jdk: '11' ],
-  [ platform: 'windows', jdk: '11' ],
+  [ platform: 'linux', jdk: '21' ],
+  [ platform: 'windows', jdk: '17' ],
 ])

pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.7</version>
     <relativePath />
   </parent>
 
@@ -16,8 +16,8 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/database-plugin</gitHubRepo>
-    <jenkins.baseline>2.452</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
 
     <jenkins.opentelemetry-api.version>1.43.0-38.v1a_9b_53e3f70f</jenkins.opentelemetry-api.version>
     <opentelemetry-instrumentation.version>2.6.0</opentelemetry-instrumentation.version>
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3435.v238d66a_043fb_</version>
+        <version>3893.v213a_42768d35</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

src/main/java/org/jenkinsci/plugins/database/GenericDatabase.java

@@ -15,7 +15,7 @@
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.verb.POST;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import javax.sql.DataSource;
 import java.io.File;
 import java.sql.SQLException;

src/main/java/org/jenkinsci/plugins/database/GlobalDatabaseConfiguration.java

@@ -3,7 +3,7 @@
 import hudson.Extension;
 import jenkins.model.GlobalConfiguration;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 
@@ -46,7 +46,7 @@ public void setDatabase(Database database) {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         req.bindJSON(this, json);
         save();
         return true;

src/main/java/org/jenkinsci/plugins/database/PerItemDatabaseConfiguration.java

@@ -6,7 +6,7 @@
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -61,7 +61,7 @@ public void setDatabase(PerItemDatabase database) {
         this.database = database;
     }
 
-    @Override public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    @Override public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         req.bindJSON(this, json);
         save();
         return true;

src/main/resources/org/jenkinsci/plugins/database/RootDatabaseConsole/index.groovy

@@ -18,11 +18,11 @@ l.layout{
             }
         }
 
-        if (request.getAttribute("message")!=null) {
+        if (request2.getAttribute("message")!=null) {
             p(message)
         }
 
-        if (request.getAttribute("r")!=null) {
+        if (request2.getAttribute("r")!=null) {
             // renders the result
             h2("Result")
             table {

src/test/java/org/jenkinsci/plugins/database/Sample.java

@@ -5,7 +5,7 @@
 import net.sf.json.JSONObject;
 import org.jenkinsci.plugins.database.Database;
 import org.jvnet.hudson.test.TestExtension;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * Example of how to define a configuration that involves database.
@@ -43,7 +43,7 @@ public void setDatabase(Database database) {
      * (That is, update the {@link #database} field.
      */
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
         req.bindJSON(this,json);
         save();
         return true;