downgraded the jersey-client to 2.27 in order to be able to get the o…

…auth token
iamzoltan · Feb 28, 2023 · a946ac8 · a946ac8
1 parent 4298145
commit a946ac8
Show file tree

Hide file tree

Showing 39 changed files with 198 additions and 198 deletions.
diff --git a/orcid-message-listener/src/main/java/org/orcid/cron/ResendSolrFailedMessages.java b/orcid-message-listener/src/main/java/org/orcid/cron/ResendSolrFailedMessages.java
@@ -23,7 +23,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 @Configuration
 @EnableScheduling

diff --git a/orcid-message-listener/src/main/java/org/orcid/cron/ResendV2FailedMessages.java b/orcid-message-listener/src/main/java/org/orcid/cron/ResendV2FailedMessages.java
@@ -24,7 +24,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 @Configuration
 @EnableScheduling

diff --git a/orcid-message-listener/src/main/java/org/orcid/cron/ResendV3FailedMessages.java b/orcid-message-listener/src/main/java/org/orcid/cron/ResendV3FailedMessages.java
@@ -24,7 +24,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 @Configuration
 @EnableScheduling

diff --git a/orcid-message-listener/src/main/java/org/orcid/listener/http/OrcidAPIClient.java b/orcid-message-listener/src/main/java/org/orcid/listener/http/OrcidAPIClient.java
@@ -11,7 +11,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 @Component
 public class OrcidAPIClient {

diff --git a/orcid-message-listener/src/main/java/org/orcid/listener/orcid/Orcid20ManagerImpl.java b/orcid-message-listener/src/main/java/org/orcid/listener/orcid/Orcid20ManagerImpl.java
@@ -21,7 +21,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 @Component
 public class Orcid20ManagerImpl implements Orcid20Manager {

diff --git a/orcid-message-listener/src/main/java/org/orcid/listener/orcid/Orcid30ManagerImpl.java b/orcid-message-listener/src/main/java/org/orcid/listener/orcid/Orcid30ManagerImpl.java
@@ -28,7 +28,7 @@
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 @Component
 public class Orcid30ManagerImpl implements Orcid30Manager {

diff --git a/orcid-message-listener/src/main/java/org/orcid/listener/solr/SolrOrgsMessageProcessor.java b/orcid-message-listener/src/main/java/org/orcid/listener/solr/SolrOrgsMessageProcessor.java
@@ -20,7 +20,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 @Component
 public class SolrOrgsMessageProcessor implements Consumer<OrgDisambiguatedSolrDocument> {

diff --git a/...d-scheduler-web/src/main/java/org/orcid/scheduler/jersey/ZenodoRecordsJsonBodyReader.java b/...d-scheduler-web/src/main/java/org/orcid/scheduler/jersey/ZenodoRecordsJsonBodyReader.java
@@ -10,13 +10,13 @@
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({ "application/json" })

diff --git a/...cheduler-web/src/main/java/org/orcid/scheduler/tasks/impl/IdentityProviderLoaderImpl.java b/...cheduler-web/src/main/java/org/orcid/scheduler/tasks/impl/IdentityProviderLoaderImpl.java
@@ -33,7 +33,7 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 public class IdentityProviderLoaderImpl implements IdentityProviderLoader {
 

diff --git a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/validation/PublicProfileValidator.java b/orcid-scheduler-web/src/main/java/org/orcid/scheduler/validation/PublicProfileValidator.java
@@ -25,7 +25,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.xml.sax.SAXException;
 
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 public class PublicProfileValidator {
 

diff --git a/orcid-utils/pom.xml b/orcid-utils/pom.xml
@@ -66,12 +66,12 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>3.0.4</version>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>
             <artifactId>jersey-hk2</artifactId>
-            <version>3.0.4</version>
+            <version>${jersey.version}</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider -->

diff --git a/orcid-utils/src/main/java/org/orcid/utils/alerting/impl/SlackManagerImpl.java b/orcid-utils/src/main/java/org/orcid/utils/alerting/impl/SlackManagerImpl.java
@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.MediaType;
 
 /**
  * 

diff --git a/orcid-utils/src/main/java/org/orcid/utils/email/MailGunManager.java b/orcid-utils/src/main/java/org/orcid/utils/email/MailGunManager.java
@@ -11,8 +11,8 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import jakarta.ws.rs.core.Form;
-import jakarta.ws.rs.core.MediaType;
+import javax.ws.rs.core.Form;
+import javax.ws.rs.core.MediaType;
 
 @Component
 public class MailGunManager {

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/JerseyClientHelper.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/JerseyClientHelper.java
@@ -13,13 +13,13 @@
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.stereotype.Component;
 
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.Invocation.Builder;
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 
 @Component
 public class JerseyClientHelper implements DisposableBean {

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/OrcidJerseyClientHandler.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/OrcidJerseyClientHandler.java
@@ -20,8 +20,8 @@
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
 
 public class OrcidJerseyClientHandler {
 

diff --git a/...tils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2ActivitiesSummaryBodyReader.java b/...tils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2ActivitiesSummaryBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.record.summary_v2.ActivitiesSummary;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({"application/xml", "application/json"})

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2EducationBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2EducationBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.record_v2.Education;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({"application/xml", "application/json"})

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2EmploymentBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2EmploymentBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.record_v2.Employment;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({"application/xml", "application/json"})

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2FundingBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2FundingBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.record_v2.Funding;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({"application/xml", "application/json"})

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2OrcidErrorBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2OrcidErrorBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.error_v2.OrcidError;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({"application/xml", "application/json"})

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2PeerReviewBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2PeerReviewBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.record_v2.PeerReview;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({"application/xml", "application/json"})

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2RecordBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2RecordBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.record_v2.Record;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({"application/xml", "application/json"})

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2WorkBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2WorkBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.record_v2.Work;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({"application/xml", "application/json"})

diff --git a/...tils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ActivitiesSummaryBodyReader.java b/...tils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ActivitiesSummaryBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.v3.release.record.summary.ActivitiesSummary;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({ "application/xml", "application/json" })

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3DistinctionBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3DistinctionBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.v3.release.record.Distinction;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({ "application/xml", "application/json" })

diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3EducationBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3EducationBodyReader.java
@@ -11,13 +11,13 @@
 
 import org.orcid.jaxb.model.v3.release.record.Education;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.ProcessingException;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.ProcessingException;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyReader;
+import javax.ws.rs.ext.Provider;
 
 @Provider
 @Consumes({ "application/xml", "application/json" })