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 index d555a110231..50833506962 100644 --- 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 index f51183e7a37..677c9ffb748 100644 --- 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 index 359d1e7ce08..87ae7d1efe4 100644 --- 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 index 9d1e449a92d..0839e5d8b73 100644 --- 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 index 6b8d56af88a..729da2afc1b 100644 --- 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 index ebc2efa322f..3e1797aa1a7 100644 --- 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 index f68d8150828..7f33e4f0c93 100644 --- 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 { diff --git a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/jersey/ZenodoRecordsJsonBodyReader.java b/orcid-scheduler-web/src/main/java/org/orcid/scheduler/jersey/ZenodoRecordsJsonBodyReader.java index 3d744f6dd81..111ccf93740 100644 --- a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/jersey/ZenodoRecordsJsonBodyReader.java +++ b/orcid-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/orcid-scheduler-web/src/main/java/org/orcid/scheduler/tasks/impl/IdentityProviderLoaderImpl.java b/orcid-scheduler-web/src/main/java/org/orcid/scheduler/tasks/impl/IdentityProviderLoaderImpl.java index fc76cb0f216..10e92e7d766 100644 --- a/orcid-scheduler-web/src/main/java/org/orcid/scheduler/tasks/impl/IdentityProviderLoaderImpl.java +++ b/orcid-scheduler-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 index 315afc1e749..fa75360f9f8 100644 --- 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 index bf308d7a9b3..7402e8621ad 100644 --- a/orcid-utils/pom.xml +++ b/orcid-utils/pom.xml @@ -66,12 +66,12 @@ org.glassfish.jersey.core jersey-client - 3.0.4 + ${jersey.version} org.glassfish.jersey.inject jersey-hk2 - 3.0.4 + ${jersey.version} 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 index 849011701a3..76988ad4f69 100644 --- 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 index b55f24cf6f0..2daa316e5c1 100644 --- 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 index d4dca424edb..599b53bbc98 100644 --- 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 index 41cda204981..9d59f438ffe 100644 --- 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/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2ActivitiesSummaryBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2ActivitiesSummaryBodyReader.java index 15dc226fcf6..8b3bc3fd9e8 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V2ActivitiesSummaryBodyReader.java +++ b/orcid-utils/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 index ef92ed9711c..49d036dec7b 100644 --- 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 index ead80176824..51dba00791c 100644 --- 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 index 4154fb94146..a1c1a69b6a0 100644 --- 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 index fd0a046e9b0..3a7b67deea3 100644 --- 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 index 80ef8392d49..0083050cd08 100644 --- 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 index 2bc3e13b7bf..6b951b1a780 100644 --- 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 index 9e1e3b629e7..16a039f0417 100644 --- 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/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ActivitiesSummaryBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ActivitiesSummaryBodyReader.java index c0f1686aed9..c981cb303e3 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ActivitiesSummaryBodyReader.java +++ b/orcid-utils/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 index 8f4d0175ddf..435bc237b12 100644 --- 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 index 51357c463b4..de3c8a3013a 100644 --- 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" }) diff --git a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3EmploymentBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3EmploymentBodyReader.java index a87660177e2..659a005ed90 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3EmploymentBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3EmploymentBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.record.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/V3FundingBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3FundingBodyReader.java index 9533b1ace50..2f1788e4d2d 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3FundingBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3FundingBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.record.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/V3InvitedPositionBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3InvitedPositionBodyReader.java index 43acc344aad..564e44f2ae7 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3InvitedPositionBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3InvitedPositionBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.record.InvitedPosition; -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/V3MembershipBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3MembershipBodyReader.java index 0907388465a..fea6f201c3a 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3MembershipBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3MembershipBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.record.Membership; -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/V3OrcidErrorBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3OrcidErrorBodyReader.java index eba75f0f7a5..0da6007291a 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3OrcidErrorBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3OrcidErrorBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.error.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/V3PeerReviewBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3PeerReviewBodyReader.java index 81a8e80f7f0..d7ae791c2a7 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3PeerReviewBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3PeerReviewBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.record.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/V3QualificationBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3QualificationBodyReader.java index 51a8b671d4e..0017a4131b0 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3QualificationBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3QualificationBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.record.Qualification; -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/V3RecordBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3RecordBodyReader.java index ed2b661714e..d8e00f4604b 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3RecordBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3RecordBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.record.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/V3ResearchResourceBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ResearchResourceBodyReader.java index da5e02f9205..45a26619736 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ResearchResourceBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ResearchResourceBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.record.ResearchResource; -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/V3ResearchResourcesBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ResearchResourcesBodyReader.java index afd0f02171b..c30500d1d9d 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ResearchResourcesBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ResearchResourcesBodyReader.java @@ -12,13 +12,13 @@ import org.orcid.jaxb.model.v3.release.record.Record; import org.orcid.jaxb.model.v3.release.record.summary.ResearchResources; -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/V3ServiceBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ServiceBodyReader.java index 0c9b2920dd1..0d1a349d690 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ServiceBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3ServiceBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.record.Service; -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/V3WorkBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3WorkBodyReader.java index 7bb7f1958d1..22ddb5fecd8 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3WorkBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/V3WorkBodyReader.java @@ -11,13 +11,13 @@ import org.orcid.jaxb.model.v3.release.record.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/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/W3CDocumentBodyReader.java b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/W3CDocumentBodyReader.java index c5d36a32a6a..ca9e9c112c0 100644 --- a/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/W3CDocumentBodyReader.java +++ b/orcid-utils/src/main/java/org/orcid/utils/jersey/unmarshaller/W3CDocumentBodyReader.java @@ -12,13 +12,13 @@ import org.w3c.dom.Document; import org.xml.sax.SAXException; -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", "application/samlmetadata+xml" })