Merge pull request #151 from basil/jakarta

Migrate from EE 8 to EE 9

Author: res0nance

pom.xml

@@ -4,18 +4,19 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.88</version>
+        <version>5.7</version>
     </parent>
     <artifactId>validating-string-parameter</artifactId>
     <packaging>hpi</packaging>
     <name>Validating String Parameter Plugin</name>
     <version>${changelist}</version>
-    <url>https://github.com/jenkinsci/validating-string-parameter-plugin</url>
+    <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
 
     <properties>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <jenkins.baseline>2.440</jenkins.baseline>
-        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+        <jenkins.baseline>2.479</jenkins.baseline>
+        <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+        <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <changelist>999999-SNAPSHOT</changelist>
     </properties>
 
@@ -29,10 +30,9 @@
     </developers>
 
     <scm>
-        <connection>scm:git:git://github.com/jenkinsci/validating-string-parameter-plugin.git</connection>
-        <developerConnection>scm:git:[email protected]:jenkinsci/validating-string-parameter-plugin.git
-        </developerConnection>
-        <url>https://github.com/jenkinsci/validating-string-parameter-plugin</url>
+        <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+        <developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
+        <url>https://github.com/${gitHubRepo}</url>
         <tag>${scmTag}</tag>
     </scm>
 
@@ -78,7 +78,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>3435.v238d66a_043fb_</version>
+                <version>3944.v1a_e4f8b_452db_</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

src/main/java/hudson/plugins/validating_string_parameter/ValidatingStringParameterDefinition.java

@@ -35,7 +35,7 @@
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.verb.POST;
 
 import java.io.IOException;
@@ -133,7 +133,7 @@ public FormValidation doValidate(@QueryParameter String regex, @QueryParameter f
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
+    public ParameterValue createValue(StaplerRequest2 req, JSONObject jo) {
         ValidatingStringParameterValue value = req.bindJSON(ValidatingStringParameterValue.class, jo);
         String req_value = value.getValue();
 
@@ -147,7 +147,7 @@ public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
     }
 
     @Override
-    public ParameterValue createValue(StaplerRequest req) {
+    public ParameterValue createValue(StaplerRequest2 req) {
         String[] value = req.getParameterValues(getName());
 
         if (value == null || value.length < 1) {

src/test/java/hudson/plugins/validating_string_parameter/ValidatingStringParameterDefinitionTest.java

@@ -7,7 +7,7 @@
 import net.sf.json.JSONObject;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -20,7 +20,7 @@
 public class ValidatingStringParameterDefinitionTest {
 
     @Mock
-    private StaplerRequest req;
+    private StaplerRequest2 req;
 
     @Mock
     private CLICommand cliCommand;