Revert "Require Jenkins 2.479.3 and Jakarta EE 9 (jenkinsci#69)"

[JENKINS-75556] ClassCastException connecting to Gitee server

https://issues.jenkins.io/browse/JENKINS-75556 reports the issue.
Revert this change so that Gitee users are able to install and use the
most recent release of the plugin.

This reverts commit 437cb91.

Author: MarkEWaite

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>5.9</version>
+    <version>4.88</version>
     <relativePath />
   </parent>
 
@@ -17,7 +17,7 @@
   <licenses>
     <license>
       <name>GPL v2.0 License</name>
-      <url>https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html</url>
+      <url>http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html</url>
     </license>
   </licenses>
 
@@ -52,8 +52,8 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.479</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.452</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.4</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
   </properties>
 
@@ -63,7 +63,7 @@
         <!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>4545.v56392b_7ca_7b_a_</version>
+        <version>3944.v1a_e4f8b_452db_</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -106,16 +106,15 @@
     </dependency>
 
     <!-- REST client dependencies -->
+    <dependency>
+      <groupId>org.jboss.spec.javax.ws.rs</groupId>
+      <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
+      <version>1.0.1.Final</version>
+    </dependency>
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-client</artifactId>
-      <version>6.2.11.Final</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.httpcomponents</groupId>
-          <artifactId>httpclient</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>3.0.23.Final</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
@@ -130,8 +129,8 @@
       <artifactId>apache-httpcomponents-client-4-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
-      <artifactId>jackson-jakarta-rs-json-provider</artifactId>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>
       <!-- Needs to match the jackson version from plugin BOM -->
       <version>2.17.0</version>
     </dependency>

src/main/java/com/gitee/jenkins/cause/CauseData.java

@@ -1,7 +1,6 @@
 package com.gitee.jenkins.cause;
 
 import com.gitee.jenkins.gitee.api.model.PullRequest;
-import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.markup.EscapedMarkupFormatter;
 import jenkins.model.Jenkins;
 import net.karneim.pojobuilder.GeneratePojoBuilder;
@@ -125,7 +124,7 @@ public final class CauseData {
     }
 
     public Map<String, String> getBuildVariables() {
-        MapWrapper<String, String> variables = new MapWrapper<>(new HashMap<>());
+        MapWrapper<String, String> variables = new MapWrapper<>(new HashMap<String, String>());
         variables.put("giteeBranch", branch);
         variables.put("giteeSourceBranch", sourceBranch);
         variables.put("giteeActionType", actionType.name());
@@ -519,7 +518,7 @@ String getShortDescription(CauseData data) {
             @Override
             String getShortDescription(CauseData data) {
                 String forkNamespace = StringUtils.equals(data.getSourceNamespace(), data.getTargetBranch()) ? "" : data.getSourceNamespace() + "/";
-                if (Jenkins.get().getMarkupFormatter() instanceof EscapedMarkupFormatter || data.getTargetProjectUrl() == null) {
+                if (Jenkins.getActiveInstance().getMarkupFormatter() instanceof EscapedMarkupFormatter || data.getTargetProjectUrl() == null) {
                     return Messages.GiteeWebHookCause_ShortDescription_PullRequestHook_plain(String.valueOf(data.getPullRequestIid()),
                                                                                                forkNamespace + data.getSourceBranch(),
                                                                                                data.getTargetBranch());
@@ -535,7 +534,7 @@ String getShortDescription(CauseData data) {
             String getShortDescription(CauseData data) {
                 String triggeredBy = data.getTriggeredByUser();
                 String forkNamespace = StringUtils.equals(data.getSourceNamespace(), data.getTargetBranch()) ? "" : data.getSourceNamespace() + "/";
-                if (Jenkins.get().getMarkupFormatter() instanceof EscapedMarkupFormatter || data.getTargetProjectUrl() == null) {
+                if (Jenkins.getActiveInstance().getMarkupFormatter() instanceof EscapedMarkupFormatter || data.getTargetProjectUrl() == null) {
                     return Messages.GiteeWebHookCause_ShortDescription_NoteHook_plain(triggeredBy,
                         String.valueOf(data.getPullRequestIid()),
                         forkNamespace + data.getSourceBranch(),
@@ -590,7 +589,6 @@ public V put(K key, V value) {
             return map.put(key, value);
         }
 
-        @NonNull
         @Override
         public Set<Entry<K, V>> entrySet() {
             return map.entrySet();

src/main/java/com/gitee/jenkins/connection/GiteeApiToken.java

@@ -3,7 +3,6 @@
 import com.cloudbees.plugins.credentials.CredentialsNameProvider;
 import com.cloudbees.plugins.credentials.NameWith;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
-import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Util;
 import hudson.util.Secret;
 
@@ -16,10 +15,8 @@ public interface GiteeApiToken extends StandardCredentials {
     Secret getApiToken();
 
     class NameProvider extends CredentialsNameProvider<GiteeApiToken> {
-
-        @NonNull
         @Override
-        public String getName(@NonNull GiteeApiToken c) {
+        public String getName(GiteeApiToken c) {
             String description = Util.fixEmptyAndTrim(c.getDescription());
             return Messages.GiteeApiToken_name() + (description != null ? " (" + description + ")" : "");
         }

src/main/java/com/gitee/jenkins/connection/GiteeApiTokenImpl.java

@@ -2,7 +2,6 @@
 
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.impl.BaseStandardCredentials;
-import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.util.Secret;
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -27,8 +26,6 @@ public Secret getApiToken() {
 
     @Extension
     public static class DescriptorImpl extends BaseStandardCredentialsDescriptor {
-
-        @NonNull
         @Override
         public String getDisplayName() {
             return Messages.GiteeApiToken_name();

src/main/java/com/gitee/jenkins/connection/GiteeConnection.java

@@ -8,11 +8,13 @@
 import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
 import com.cloudbees.plugins.credentials.common.StandardCredentials;
 import com.cloudbees.plugins.credentials.domains.Domain;
+import com.cloudbees.plugins.credentials.domains.DomainRequirement;
 import com.gitee.jenkins.gitee.api.GiteeClient;
 import com.gitee.jenkins.gitee.api.GiteeClientBuilder;
 import com.gitee.jenkins.gitee.api.impl.GiteeV5ClientBuilder;
 import hudson.init.InitMilestone;
 import hudson.init.Initializer;
+import hudson.model.Item;
 import hudson.security.ACL;
 import hudson.util.Secret;
 import jenkins.model.Jenkins;
@@ -26,7 +28,7 @@
 import java.util.List;
 import java.util.UUID;
 
-import static com.cloudbees.plugins.credentials.CredentialsProvider.lookupCredentialsInItem;
+import static com.cloudbees.plugins.credentials.CredentialsProvider.lookupCredentials;
 import static com.gitee.jenkins.gitee.api.GiteeClientBuilder.getGiteeClientBuilderById;
 
 
@@ -119,14 +121,14 @@ public GiteeClient getClient() {
 
     private String getApiToken(String apiTokenId) {
         StandardCredentials credentials = CredentialsMatchers.firstOrNull(
-            lookupCredentialsInItem(StandardCredentials.class, null, ACL.SYSTEM2, new ArrayList<>()),
+            lookupCredentials(StandardCredentials.class, (Item) null, ACL.SYSTEM, new ArrayList<DomainRequirement>()),
             CredentialsMatchers.withId(apiTokenId));
         if (credentials != null) {
-            if (credentials instanceof GiteeApiToken token) {
-                return token.getApiToken().getPlainText();
+            if (credentials instanceof GiteeApiToken) {
+                return ((GiteeApiToken) credentials).getApiToken().getPlainText();
             }
-            if (credentials instanceof StringCredentials stringCredentials) {
-                return stringCredentials.getSecret().getPlainText();
+            if (credentials instanceof StringCredentials) {
+                return ((StringCredentials) credentials).getSecret().getPlainText();
             }
         }
         throw new IllegalStateException("No credentials found for credentialsId: " + apiTokenId);
@@ -146,10 +148,10 @@ protected GiteeConnection readResolve() {
 
     @Initializer(after = InitMilestone.PLUGINS_STARTED)
     public static void migrate() throws IOException {
-        GiteeConnectionConfig descriptor = (GiteeConnectionConfig) Jenkins.get().getDescriptor(GiteeConnectionConfig.class);
+        GiteeConnectionConfig descriptor = (GiteeConnectionConfig) Jenkins.getInstance().getDescriptor(GiteeConnectionConfig.class);
         for (GiteeConnection connection : descriptor.getConnections()) {
             if (connection.apiTokenId == null && connection.apiToken != null) {
-                for (CredentialsStore credentialsStore : CredentialsProvider.lookupStores(Jenkins.get())) {
+                for (CredentialsStore credentialsStore : CredentialsProvider.lookupStores(Jenkins.getInstance())) {
                     if (credentialsStore instanceof SystemCredentialsProvider.StoreImpl) {
                         List<Domain> domains = credentialsStore.getDomains();
                         connection.apiTokenId = UUID.randomUUID().toString();

src/main/java/com/gitee/jenkins/connection/GiteeConnectionConfig.java

@@ -21,10 +21,10 @@
 import org.eclipse.jgit.util.StringUtils;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerRequest;
 
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -49,7 +49,7 @@ public GiteeConnectionConfig() {
     }
 
     @Override
-    public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
+    public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
         connections = req.bindJSONToList(GiteeConnection.class, json.get("connections"));
 //        useAuthenticatedEndpoint = json.getBoolean("useAuthenticatedEndpoint");
         refreshConnectionMap();
@@ -152,11 +152,11 @@ public FormValidation doTestConnection(@QueryParameter String url,
     }
 
     public ListBoxModel doFillApiTokenIdItems(@QueryParameter String name, @QueryParameter String url) {
-        if (Jenkins.get().hasPermission(Item.CONFIGURE)) {
+        if (Jenkins.getInstance().hasPermission(Item.CONFIGURE)) {
             AbstractIdCredentialsListBoxModel<StandardListBoxModel, StandardCredentials> options = new StandardListBoxModel()
                 .includeEmptyValue()
-                .includeMatchingAs(ACL.SYSTEM2,
-                                   Jenkins.get(),
+                .includeMatchingAs(ACL.SYSTEM,
+                                   Jenkins.getActiveInstance(),
                                    StandardCredentials.class,
                                    URIRequirementBuilder.fromUri(url).build(),
                                    new GiteeCredentialMatcher());

src/main/java/com/gitee/jenkins/connection/GiteeConnectionProperty.java

@@ -2,7 +2,6 @@
 
 
 import com.gitee.jenkins.gitee.api.GiteeClient;
-import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
 import hudson.model.Job;
 import hudson.model.JobProperty;
@@ -14,7 +13,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerRequest;
 
 /**
  * @author Robin Müller
@@ -34,7 +33,7 @@ public String getGiteeConnection() {
 
     public GiteeClient getClient() {
         if (StringUtils.isNotEmpty(giteeConnection)) {
-            GiteeConnectionConfig connectionConfig = (GiteeConnectionConfig) Jenkins.get().getDescriptor(GiteeConnectionConfig.class);
+            GiteeConnectionConfig connectionConfig = (GiteeConnectionConfig) Jenkins.getInstance().getDescriptor(GiteeConnectionConfig.class);
             return connectionConfig != null ? connectionConfig.getClient(giteeConnection) : null;
         }
         return null;
@@ -61,7 +60,6 @@ public static GiteeClient getClient(Job<?, ?> job) {
     @Symbol("giteeConnection")
     public static class DescriptorImpl extends JobPropertyDescriptor {
 
-        @NonNull
         @Override
         public String getDisplayName() {
             return "Gitee connection";
@@ -73,13 +71,13 @@ public boolean isApplicable(Class<? extends Job> jobType) {
         }
 
         @Override
-        public JobProperty<?> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
+        public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
             return req.bindJSON(GiteeConnectionProperty.class, formData);
         }
 
         public ListBoxModel doFillGiteeConnectionItems() {
             ListBoxModel options = new ListBoxModel();
-            GiteeConnectionConfig descriptor = (GiteeConnectionConfig) Jenkins.get().getDescriptor(GiteeConnectionConfig.class);
+            GiteeConnectionConfig descriptor = (GiteeConnectionConfig) Jenkins.getInstance().getDescriptor(GiteeConnectionConfig.class);
             for (GiteeConnection connection : descriptor.getConnections()) {
                 options.add(connection.getName(), connection.getName());
             }

src/main/java/com/gitee/jenkins/environment/GiteeEnvironmentContributor.java

@@ -20,10 +20,10 @@ public class GiteeEnvironmentContributor extends EnvironmentContributor {
     @Override
     public void buildEnvironmentFor(@NonNull Run r, @NonNull EnvVars envs, @NonNull TaskListener listener) throws IOException, InterruptedException {
         GiteeWebHookCause cause = null;
-        if (r instanceof MatrixRun run) {
-            MatrixBuild parent = run.getParentBuild();
+        if (r instanceof MatrixRun) {
+            MatrixBuild parent = ((MatrixRun)r).getParentBuild();
             if (parent != null) {
-                cause = parent.getCause(GiteeWebHookCause.class);
+                cause = (GiteeWebHookCause) parent.getCause(GiteeWebHookCause.class);
             }
         } else {
             cause = (GiteeWebHookCause) r.getCause(GiteeWebHookCause.class);

src/main/java/com/gitee/jenkins/gitee/JacksonConfig.java

@@ -2,13 +2,13 @@
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.ext.ContextResolver;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Provider;
 
 /**
  * @author Robin Müller
@@ -19,7 +19,7 @@
 public class JacksonConfig implements ContextResolver<ObjectMapper> {
     public ObjectMapper getContext(Class<?> type) {
         return new ObjectMapper()
-                .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE)
+                .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
                 .configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
     }

src/main/java/com/gitee/jenkins/gitee/api/GiteeClientBuilder.java

@@ -27,7 +27,7 @@ public static GiteeClientBuilder getGiteeClientBuilderById(String id) {
     }
 
     public static List<GiteeClientBuilder> getAllGiteeClientBuilders() {
-        List<GiteeClientBuilder> builders = new ArrayList<>(Jenkins.get().getExtensionList(GiteeClientBuilder.class));
+        List<GiteeClientBuilder> builders = new ArrayList<>(Jenkins.getInstance().getExtensionList(GiteeClientBuilder.class));
         sort(builders);
         return builders;
     }