Revert "Update Jakarta classes import"

This reverts commit 530ce29.
jenkinsci · May 18, 2022 · 554b639 · 554b639
1 parent 44a7c7c
commit 554b639
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 30 deletions.
diff --git a/...org/jenkinsci/plugins/maven_artifact_choicelistprovider/AbstractRESTfulVersionReader.java b/...org/jenkinsci/plugins/maven_artifact_choicelistprovider/AbstractRESTfulVersionReader.java
@@ -7,12 +7,12 @@
 import java.util.logging.Logger;
 
 import javax.net.ssl.SSLHandshakeException;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ResponseProcessingException;
+import javax.ws.rs.client.WebTarget;
 
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.ResponseProcessingException;
-import jakarta.ws.rs.client.WebTarget;
 import org.apache.commons.lang.StringUtils;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
@@ -95,7 +95,7 @@ public List<String> retrieveVersions(String pRepositoryId, String pGroupId, Stri
 				msg = "General Error:" + e.getMessage();
 			}
 			throw new VersionReaderException(msg, e);
-		} catch(jakarta.ws.rs.NotFoundException e) {
+		} catch(javax.ws.rs.NotFoundException e) {
 			throw new VersionReaderException("The artifact you are looking for does not exist (HTTP404). Have you used the correct repositoryId / baseURL?", e);
 		} catch (VersionReaderException e) {
 			throw e; // just forward from the services
@@ -107,7 +107,7 @@ public List<String> retrieveVersions(String pRepositoryId, String pGroupId, Stri
 				throw new VersionReaderException(
 						"Timeout while connecting to your Repository Service. Please consider the Jenkins-Proxy settings. If using HTTPs also invalid certificates can be the root cause.",
 						e);
-			} else if (e instanceof jakarta.ws.rs.BadRequestException) {
+			} else if (e instanceof javax.ws.rs.BadRequestException) {
 				throw new VersionReaderException("Request is invalid", e);
 			} else {
 				throw new VersionReaderException("failed to retrieve versions from repository for r:" + getURL()

diff --git a/...java/org/jenkinsci/plugins/maven_artifact_choicelistprovider/RESTfulParameterBuilder.java b/...java/org/jenkinsci/plugins/maven_artifact_choicelistprovider/RESTfulParameterBuilder.java
@@ -5,8 +5,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import jakarta.ws.rs.core.MultivaluedHashMap;
-import jakarta.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
 
 import org.apache.commons.lang.StringUtils;
 

diff --git a/.../plugins/maven_artifact_choicelistprovider/artifactory/ArtifactoryChoiceListProvider.java b/.../plugins/maven_artifact_choicelistprovider/artifactory/ArtifactoryChoiceListProvider.java
@@ -3,6 +3,8 @@
 import java.util.Collections;
 import java.util.Map;
 
+import javax.ws.rs.POST;
+
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactChoiceListProvider;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactDescriptorImpl;
@@ -24,7 +26,6 @@
 import hudson.security.ACL;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
-import org.kohsuke.stapler.interceptor.RequirePOST;
 
 public class ArtifactoryChoiceListProvider extends AbstractMavenArtifactChoiceListProvider {
 
@@ -66,7 +67,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item pItem) {
             return retVal;
         }
 
-        @RequirePOST
+        @POST
         public FormValidation doTest(@AncestorInPath Item pItem, @QueryParameter String url, @QueryParameter String credentialsId, @QueryParameter String groupId,
                 @QueryParameter String artifactId, @QueryParameter String packaging, @QueryParameter String classifier,
                 @QueryParameter boolean inverseFilter, @QueryParameter String filterExpression, @QueryParameter boolean reverseOrder) {

diff --git a/...insci/plugins/maven_artifact_choicelistprovider/artifactory/ArtifactorySearchService.java b/...insci/plugins/maven_artifact_choicelistprovider/artifactory/ArtifactorySearchService.java
@@ -7,9 +7,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
 
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractRESTfulVersionReader;

diff --git a/...nsci/plugins/maven_artifact_choicelistprovider/maven/MavenMetadataChoiceListProvider.java b/...nsci/plugins/maven_artifact_choicelistprovider/maven/MavenMetadataChoiceListProvider.java
@@ -3,6 +3,8 @@
 import java.util.Collections;
 import java.util.Map;
 
+import javax.ws.rs.POST;
+
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactChoiceListProvider;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.IVersionReader;
@@ -24,7 +26,6 @@
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import jp.ikedam.jenkins.plugins.extensible_choice_parameter.ChoiceListProvider;
-import org.kohsuke.stapler.interceptor.RequirePOST;
 
 
 /**
@@ -106,7 +107,7 @@ public FormValidation doCheckArtifactId(@QueryParameter String artifactId) {
             return FormValidation.ok();
         }
 
-        @RequirePOST
+        @POST
         public FormValidation doTest(@AncestorInPath Item pItem, @QueryParameter String url, @QueryParameter String credentialsId, @QueryParameter String repositoryId,
                                      @QueryParameter String groupId, @QueryParameter String artifactId,
                                      @QueryParameter boolean inverseFilter, @QueryParameter String filterExpression, @QueryParameter boolean reverseOrder) {

diff --git a/...jenkinsci/plugins/maven_artifact_choicelistprovider/maven/MavenMetadataSearchService.java b/...jenkinsci/plugins/maven_artifact_choicelistprovider/maven/MavenMetadataSearchService.java
@@ -8,8 +8,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;

diff --git a/...rg/jenkinsci/plugins/maven_artifact_choicelistprovider/nexus/NexusChoiceListProvider.java b/...rg/jenkinsci/plugins/maven_artifact_choicelistprovider/nexus/NexusChoiceListProvider.java
@@ -4,6 +4,8 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
+import javax.ws.rs.POST;
+
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactChoiceListProvider;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactDescriptorImpl;
@@ -27,7 +29,6 @@
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.interceptor.RequirePOST;
 
 public class NexusChoiceListProvider extends AbstractMavenArtifactChoiceListProvider {
 
@@ -79,7 +80,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item pItem) {
             return retVal;
         }
 
-        @RequirePOST
+        @POST
         public FormValidation doTest(@AncestorInPath Item pItem, @QueryParameter String url, @QueryParameter String credentialsId, @QueryParameter String repositoryId,
                 @QueryParameter String groupId, @QueryParameter String artifactId, @QueryParameter String packaging, @QueryParameter String classifier,
                 @QueryParameter boolean inverseFilter, @QueryParameter String filterExpression, @QueryParameter boolean reverseOrder) {

diff --git a/...g/jenkinsci/plugins/maven_artifact_choicelistprovider/nexus/NexusLuceneSearchService.java b/...g/jenkinsci/plugins/maven_artifact_choicelistprovider/nexus/NexusLuceneSearchService.java
@@ -8,9 +8,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;

diff --git a/.../jenkinsci/plugins/maven_artifact_choicelistprovider/nexus3/Nexus3ChoiceListProvider.java b/.../jenkinsci/plugins/maven_artifact_choicelistprovider/nexus3/Nexus3ChoiceListProvider.java
@@ -3,6 +3,8 @@
 import java.util.Collections;
 import java.util.Map;
 
+import javax.ws.rs.POST;
+
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactChoiceListProvider;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactDescriptorImpl;
@@ -26,7 +28,6 @@
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.interceptor.RequirePOST;
 
 public class Nexus3ChoiceListProvider extends AbstractMavenArtifactChoiceListProvider {
 
@@ -73,7 +74,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item pItem) {
             return retVal;
         }
 
-        @RequirePOST
+        @POST
         public FormValidation doTest(@AncestorInPath Item pItem, @QueryParameter String url, @QueryParameter String credentialsId, @QueryParameter String repositoryId,
                 @QueryParameter String groupId, @QueryParameter String artifactId, @QueryParameter String packaging, @QueryParameter String classifier,
                 @QueryParameter boolean inverseFilter, @QueryParameter String filterExpression, @QueryParameter boolean reverseOrder) {

diff --git a/...enkinsci/plugins/maven_artifact_choicelistprovider/nexus3/Nexus3RestApiSearchService.java b/...enkinsci/plugins/maven_artifact_choicelistprovider/nexus3/Nexus3RestApiSearchService.java
@@ -8,9 +8,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
 
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractRESTfulVersionReader;

diff --git a/...nsci/plugins/maven_artifact_choicelistprovider/nexus3/Nexus3RestApiSearchServiceTest.java b/...nsci/plugins/maven_artifact_choicelistprovider/nexus3/Nexus3RestApiSearchServiceTest.java
@@ -5,8 +5,8 @@
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.ValidAndInvalidClassifier;
 import org.junit.Test;
 
-import jakarta.ws.rs.client.Invocation;
-import jakarta.ws.rs.client.WebTarget;
+import javax.ws.rs.client.Invocation;
+import javax.ws.rs.client.WebTarget;
 import java.util.ArrayList;
 import java.util.List;