More jakarta changes

Author: Camelia-Orcid

orcid-activemq/pom.xml

@@ -50,9 +50,9 @@
 <version>2.3.3</version>
 </dependency>
 	<dependency>
-         <groupId>javax.annotation</groupId>
-         <artifactId>javax.annotation-api</artifactId>
-         <version>1.3.2</version>
+         <groupId>jakarta.annotation</groupId>
+     <artifactId>jakarta.annotation-api</artifactId>
+     <version>2.1.1</version>
     </dependency>
 
      <!-- Test dependencies -->

orcid-activemq/src/test/java/org/orcid/activemq/AppContextActiveMQTest.java

@@ -2,7 +2,7 @@
 
 import static org.junit.Assert.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.apache.activemq.xbean.BrokerFactoryBean;
 import org.junit.Test;

orcid-activities-indexer/pom.xml

@@ -85,23 +85,22 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-c3p0</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-        </dependency>
+            <dependency>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-core</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-agroal</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-c3p0</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate.validator</groupId>
+                <artifactId>hibernate-validator</artifactId>
+            </dependency>
   </dependencies>
   <parent>
   	<groupId>org.orcid</groupId>

orcid-activities-indexer/src/main/java/org/orcid/activitiesindexer/cron/RetryFailedRecords.java

@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.apache.commons.lang3.StringUtils;
 import org.orcid.activitiesindexer.persistence.entities.ActivitiesStatusEntity;

orcid-activities-indexer/src/main/java/org/orcid/activitiesindexer/listener/BaseListener.java

@@ -19,8 +19,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
 
 import org.apache.activemq.command.ActiveMQMapMessage;
 import org.fusesource.hawtbuf.UTF8Buffer;

orcid-activities-indexer/src/main/java/org/orcid/activitiesindexer/listener/ReIndexListener.java

@@ -20,10 +20,10 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import javax.annotation.Resource;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.xml.bind.JAXBException;
+import jakarta.annotation.Resource;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.xml.bind.JAXBException;
 
 import org.orcid.activitiesindexer.s3.S3MessageProcessor;
 import org.orcid.utils.listener.LastModifiedMessage;

orcid-activities-indexer/src/main/java/org/orcid/activitiesindexer/listener/UpdatedOrcidListener.java

@@ -18,9 +18,9 @@
 
 import java.util.Map;
 
-import javax.annotation.Resource;
-import javax.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.annotation.Resource;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
 
 import org.orcid.utils.listener.LastModifiedMessage;
 import org.slf4j.Logger;

orcid-activities-indexer/src/main/java/org/orcid/activitiesindexer/listener/UpdatedOrcidWorker.java

@@ -16,7 +16,7 @@
  */
 package org.orcid.activitiesindexer.listener;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.orcid.activitiesindexer.s3.S3MessageProcessor;
 import org.orcid.utils.listener.LastModifiedMessage;

orcid-activities-indexer/src/main/java/org/orcid/activitiesindexer/orcid/Orcid20APIClient.java

@@ -19,8 +19,8 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.annotation.Resource;
-import javax.ws.rs.core.MediaType;
+import jakarta.annotation.Resource;
+import jakarta.ws.rs.core.MediaType;
 
 import org.orcid.activitiesindexer.exception.DeprecatedRecordException;
 import org.orcid.activitiesindexer.exception.LockedRecordException;

orcid-activities-indexer/src/main/java/org/orcid/activitiesindexer/s3/ExceptionHandler.java

@@ -18,8 +18,8 @@
 
 import java.io.IOException;
 
-import javax.annotation.Resource;
-import javax.xml.bind.JAXBException;
+import jakarta.annotation.Resource;
+import jakarta.xml.bind.JAXBException;
 
 import org.orcid.jaxb.model.error_v2.OrcidError;
 import org.orcid.jaxb.model.message.OrcidDeprecated;