Require Java 17 or newer (#1474)

jenkinsci · Oct 7, 2024 · a7fab0d · a7fab0d
1 parent d7310cc
commit a7fab0d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/...l-plugin/src/main/groovy/javaposse/jobdsl/plugin/GlobalJobDslSecurityConfiguration.groovy b/...l-plugin/src/main/groovy/javaposse/jobdsl/plugin/GlobalJobDslSecurityConfiguration.groovy
@@ -4,7 +4,7 @@ import hudson.Extension
 import jenkins.model.GlobalConfiguration
 import jenkins.model.GlobalConfigurationCategory
 import net.sf.json.JSONObject
-import org.kohsuke.stapler.StaplerRequest
+import org.kohsuke.stapler.StaplerRequest2
 
 @Extension
 class GlobalJobDslSecurityConfiguration extends GlobalConfiguration {
@@ -19,7 +19,7 @@ class GlobalJobDslSecurityConfiguration extends GlobalConfiguration {
     }
 
     @Override
-    boolean configure(StaplerRequest req, JSONObject json) {
+    boolean configure(StaplerRequest2 req, JSONObject json) {
         useScriptSecurity = json.has('useScriptSecurity')
         save()
         true

diff --git a/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/ApiViewerRootAction.groovy b/job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/ApiViewerRootAction.groovy
@@ -10,10 +10,10 @@ import hudson.model.UpdateSite
 import javaposse.jobdsl.plugin.EmbeddedApiDocGenerator
 import jenkins.model.Jenkins
 import net.sf.json.JSONObject
-import org.kohsuke.stapler.StaplerRequest
-import org.kohsuke.stapler.StaplerResponse
+import org.kohsuke.stapler.StaplerRequest2
+import org.kohsuke.stapler.StaplerResponse2
 
-import javax.servlet.ServletException
+import jakarta.servlet.ServletException
 
 @Extension
 class ApiViewerRootAction implements RootAction {
@@ -34,12 +34,12 @@ class ApiViewerRootAction implements RootAction {
     }
 
     @SuppressWarnings('GroovyUnusedDeclaration')
-    void doPlugins(StaplerRequest request, StaplerResponse response) throws ServletException, IOException {
+    void doPlugins(StaplerRequest2 request, StaplerResponse2 response) throws ServletException, IOException {
         serveCachedFile(request, response, generatePlugins(), 'update-center.json')
     }
 
     @SuppressWarnings('GroovyUnusedDeclaration')
-    void doData(StaplerRequest request, StaplerResponse response) throws ServletException, IOException {
+    void doData(StaplerRequest2 request, StaplerResponse2 response) throws ServletException, IOException {
         serveCachedFile(request, response, generateData(), 'dsl.json')
     }
 
@@ -91,7 +91,7 @@ class ApiViewerRootAction implements RootAction {
         updateCenter
     }
 
-    private static void serveCachedFile(StaplerRequest request, StaplerResponse response, CachedFile file,
+    private static void serveCachedFile(StaplerRequest2 request, StaplerResponse2 response, CachedFile file,
                                         String fileName) {
         response.serveFile(
                 request,

diff --git a/job-dsl-plugin/src/main/java/javaposse/jobdsl/plugin/DescriptorImpl.java b/job-dsl-plugin/src/main/java/javaposse/jobdsl/plugin/DescriptorImpl.java
@@ -22,7 +22,7 @@
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.jenkinsci.Symbol;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension(dynamicLoadable = YesNoMaybe.YES)
 @Symbol("jobDsl")
@@ -99,7 +99,7 @@ public ListBoxModel doFillLookupStrategyItems() {
     }
 
     @Override
-    public Builder newInstance(@NonNull StaplerRequest req, @NonNull JSONObject formData) throws FormException {
+    public Builder newInstance(@NonNull StaplerRequest2 req, @NonNull JSONObject formData) throws FormException {
         ExecuteDslScripts builder = (ExecuteDslScripts) super.newInstance(req, formData);
         builder.configure(req.findAncestorObject(Item.class));
         return builder;

diff --git a/...ugin/src/test/groovy/javaposse/jobdsl/plugin/GlobalJobDslSecurityConfigurationSpec.groovy b/...ugin/src/test/groovy/javaposse/jobdsl/plugin/GlobalJobDslSecurityConfigurationSpec.groovy
@@ -4,7 +4,7 @@ import jenkins.model.GlobalConfigurationCategory
 import net.sf.json.JSONObject
 import org.junit.ClassRule
 import org.jvnet.hudson.test.JenkinsRule
-import org.kohsuke.stapler.StaplerRequest
+import org.kohsuke.stapler.StaplerRequest2
 import spock.lang.Shared
 import spock.lang.Specification
 
@@ -27,7 +27,7 @@ class GlobalJobDslSecurityConfigurationSpec extends Specification {
 
     def 'enable security'() {
         setup:
-        StaplerRequest req = Mock(StaplerRequest)
+        StaplerRequest2 req = Mock(StaplerRequest2)
         JSONObject json = new JSONObject()
         json.put('useScriptSecurity', '')
         config.useScriptSecurity = false
@@ -48,7 +48,7 @@ class GlobalJobDslSecurityConfigurationSpec extends Specification {
 
     def 'disable security'() {
         setup:
-        StaplerRequest req = Mock(StaplerRequest)
+        StaplerRequest2 req = Mock(StaplerRequest2)
         JSONObject json = new JSONObject()
         config.useScriptSecurity = true
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.1</version>
     <relativePath />
   </parent>
   <artifactId>job-dsl-parent</artifactId>
@@ -33,7 +33,7 @@
     <revision>1.90</revision>
     <changelist>-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/job-dsl-plugin</gitHubRepo>
-    <jenkins.version>2.462.3</jenkins.version>
+    <jenkins.version>2.479</jenkins.version>
     <!-- TODO fix violations -->
     <spotbugs.threshold>High</spotbugs.threshold>
     <spotless.check.skip>false</spotless.check.skip>