diff --git a/pom.xml b/pom.xml index 5598494..09eb952 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ - 1.8.0 + 1.8.0-jakarta-SNAPSHOT UTF-8 1.8 2.9.7 - 2.10.0 - 2.35 + 2.13.2 + 3.0.4 5.8.2 1.3.2 @@ -64,9 +64,9 @@ - javax.activation - activation - 1.1.1 + com.sun.activation + jakarta.activation + 2.0.1 diff --git a/src/main/java/com/wildbit/java/postmark/Postmark.java b/src/main/java/com/wildbit/java/postmark/Postmark.java index 2bab3ac..0db07fd 100644 --- a/src/main/java/com/wildbit/java/postmark/Postmark.java +++ b/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; diff --git a/src/main/java/com/wildbit/java/postmark/client/AccountApiClient.java b/src/main/java/com/wildbit/java/postmark/client/AccountApiClient.java index 064ca8e..4d80ec6 100644 --- a/src/main/java/com/wildbit/java/postmark/client/AccountApiClient.java +++ b/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; /** diff --git a/src/main/java/com/wildbit/java/postmark/client/ApiClient.java b/src/main/java/com/wildbit/java/postmark/client/ApiClient.java index 8166d37..012d395 100644 --- a/src/main/java/com/wildbit/java/postmark/client/ApiClient.java +++ b/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; diff --git a/src/main/java/com/wildbit/java/postmark/client/BaseApiClient.java b/src/main/java/com/wildbit/java/postmark/client/BaseApiClient.java index 9b28af3..5014c31 100644 --- a/src/main/java/com/wildbit/java/postmark/client/BaseApiClient.java +++ b/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 diff --git a/src/main/java/com/wildbit/java/postmark/client/HttpClient.java b/src/main/java/com/wildbit/java/postmark/client/HttpClient.java index 83f0620..e47bf66 100644 --- a/src/main/java/com/wildbit/java/postmark/client/HttpClient.java +++ b/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 diff --git a/src/main/java/com/wildbit/java/postmark/client/HttpClientHandler.java b/src/main/java/com/wildbit/java/postmark/client/HttpClientHandler.java index 06a7bed..e79ab26 100644 --- a/src/main/java/com/wildbit/java/postmark/client/HttpClientHandler.java +++ b/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; /** diff --git a/src/test/java/base/BaseTest.java b/src/test/java/base/BaseTest.java index 47da8e5..489376d 100644 --- a/src/test/java/base/BaseTest.java +++ b/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. */ diff --git a/src/test/java/unit/client/ApiClientTest.java b/src/test/java/unit/client/ApiClientTest.java index 1ba3c01..f7be730 100644 --- a/src/test/java/unit/client/ApiClientTest.java +++ b/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; diff --git a/src/test/java/unit/client/BaseApiClientTest.java b/src/test/java/unit/client/BaseApiClientTest.java index e81bc2a..e352bbc 100644 --- a/src/test/java/unit/client/BaseApiClientTest.java +++ b/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; /** diff --git a/src/test/java/unit/client/HttpClientTest.java b/src/test/java/unit/client/HttpClientTest.java index c578635..1ec266e 100644 --- a/src/test/java/unit/client/HttpClientTest.java +++ b/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;