Migrate from javax to jakarta

pom.xml

@@ -23,12 +23,12 @@
     </developers>
 
     <properties>
-        <postmark.version>1.8.0</postmark.version>
+        <postmark.version>1.8.0-jakarta-SNAPSHOT</postmark.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <jackson.minimum.version>2.9.7</jackson.minimum.version>
-        <jackson.version>2.10.0</jackson.version>
-        <jersey.version>2.35</jersey.version>
+        <jackson.version>2.13.2</jackson.version>
+        <jersey.version>3.0.4</jersey.version>
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
         <junit.platform.version>1.3.2</junit.platform.version>
     </properties>
@@ -64,9 +64,9 @@
 
         <!-- Jersey client requires this dependency -->
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>jakarta.activation</artifactId>
+            <version>2.0.1</version>
         </dependency>
 
         <!-- Serialization to JSON -->

src/main/java/com/wildbit/java/postmark/Postmark.java

@@ -3,8 +3,8 @@
 import com.wildbit.java.postmark.client.AccountApiClient;
 import com.wildbit.java.postmark.client.ApiClient;
 
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 import java.io.InputStream;
 import java.util.Properties;
 import java.util.logging.Logger;

src/main/java/com/wildbit/java/postmark/client/AccountApiClient.java

@@ -1,16 +1,19 @@
 package com.wildbit.java.postmark.client;
 
 import com.wildbit.java.postmark.client.data.model.RequestResponse;
-import com.wildbit.java.postmark.client.data.model.domains.*;
-import com.wildbit.java.postmark.client.data.model.senders.*;
+import com.wildbit.java.postmark.client.data.model.domains.Domain;
+import com.wildbit.java.postmark.client.data.model.domains.DomainDetails;
+import com.wildbit.java.postmark.client.data.model.domains.Domains;
+import com.wildbit.java.postmark.client.data.model.senders.SignatureDetails;
+import com.wildbit.java.postmark.client.data.model.senders.SignatureToCreate;
+import com.wildbit.java.postmark.client.data.model.senders.Signatures;
 import com.wildbit.java.postmark.client.data.model.server.Server;
 import com.wildbit.java.postmark.client.data.model.servers.Servers;
 import com.wildbit.java.postmark.client.data.model.templates.TemplatesPush;
-import com.wildbit.java.postmark.client.data.model.templates.TemplatesPushAction;
 import com.wildbit.java.postmark.client.data.model.templates.TemplatesPushRequest;
 import com.wildbit.java.postmark.client.exception.PostmarkException;
+import jakarta.ws.rs.core.MultivaluedMap;
 
-import javax.ws.rs.core.MultivaluedMap;
 import java.io.IOException;
 
 /**

src/main/java/com/wildbit/java/postmark/client/ApiClient.java

@@ -24,7 +24,7 @@
 import com.wildbit.java.postmark.client.data.model.webhooks.Webhooks;
 import com.wildbit.java.postmark.client.exception.PostmarkException;
 
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/com/wildbit/java/postmark/client/BaseApiClient.java

@@ -1,6 +1,6 @@
 package com.wildbit.java.postmark.client;
 
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 /**
  * Class that handles (on very high level) API requests. All Postmark public endpoints which

src/main/java/com/wildbit/java/postmark/client/HttpClient.java

@@ -3,12 +3,12 @@
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.HttpUrlConnectorProvider;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 
 /**
  * Base HTTP client class solely responsible for making

src/main/java/com/wildbit/java/postmark/client/HttpClientHandler.java

@@ -3,7 +3,7 @@
 import com.wildbit.java.postmark.client.data.DataHandler;
 import com.wildbit.java.postmark.client.exception.*;
 
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 import java.io.IOException;
 
 /**

src/test/java/base/BaseTest.java

@@ -6,11 +6,12 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Map;
 import java.util.Properties;
 
-import java.nio.file.*;
-
 /**
  * Created by bash on 11/14/17.
  */

src/test/java/unit/client/ApiClientTest.java

@@ -2,7 +2,7 @@
 
 import com.wildbit.java.postmark.Postmark;
 import com.wildbit.java.postmark.client.ApiClient;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

src/test/java/unit/client/BaseApiClientTest.java

@@ -5,7 +5,7 @@
 import com.wildbit.java.postmark.client.HttpClient;
 import org.junit.jupiter.api.Test;
 
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.MultivaluedMap;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**

src/test/java/unit/client/HttpClientTest.java

@@ -5,7 +5,7 @@
 import com.wildbit.java.postmark.client.exception.PostmarkException;
 import org.junit.jupiter.api.Test;
 
-import javax.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedHashMap;
 import java.io.IOException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;