diff --git a/pom.xml b/pom.xml index a4c9d07..9a29208 100644 --- a/pom.xml +++ b/pom.xml @@ -34,16 +34,16 @@ 1.7 - 2.25 + 3.1.3 - 2.9.8 - 18.0 + 2.14.3 + 32.1.2-jre 3.0.0 - 1.7.23 + 2.0.7 - 4.12 + 4.13.2 3.9.17 - 1.10.17 + 1.10.19 1.3 1.4.7 @@ -58,7 +58,7 @@ 2.14 2.14 2.1.2 - 2.9 + 3.5.0 2.7 @@ -99,9 +99,10 @@ jersey-media-multipart ${jersey.version} + - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider ${jackson.version} @@ -109,7 +110,7 @@ org.mockito mockito-core - 3.2.0 + ${mockito.version} test @@ -145,7 +146,7 @@ commons-fileupload commons-fileupload - 1.4 + 1.5 test diff --git a/src/main/java/io/kraken/client/impl/DefaultKrakenIoClient.java b/src/main/java/io/kraken/client/impl/DefaultKrakenIoClient.java index 3b03527..4ab4e71 100644 --- a/src/main/java/io/kraken/client/impl/DefaultKrakenIoClient.java +++ b/src/main/java/io/kraken/client/impl/DefaultKrakenIoClient.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import io.kraken.client.KrakenIoClient; import io.kraken.client.exception.KrakenIoException; import io.kraken.client.exception.KrakenIoRequestException; @@ -40,13 +40,13 @@ import org.glassfish.jersey.media.multipart.file.FileDataBodyPart; import org.glassfish.jersey.media.multipart.file.StreamDataBodyPart; -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.Feature; -import javax.ws.rs.core.MediaType; -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.Feature; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.text.MessageFormat; import java.util.UUID; import java.util.logging.Level; @@ -70,7 +70,7 @@ public class DefaultKrakenIoClient implements KrakenIoClient { private static final int CLIENT_TIMEOUT = 3000; - private final javax.ws.rs.client.Client client; + private final jakarta.ws.rs.client.Client client; private final String apiKey; private final String apiSecret; private final String directUploadUrl; diff --git a/src/main/java/io/kraken/client/model/resize/FillResize.java b/src/main/java/io/kraken/client/model/resize/FillResize.java index 8b86bb7..2c46c1e 100644 --- a/src/main/java/io/kraken/client/model/resize/FillResize.java +++ b/src/main/java/io/kraken/client/model/resize/FillResize.java @@ -22,7 +22,7 @@ import io.kraken.client.model.Strategy; import io.kraken.client.serializer.RGBASerializer; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import static com.google.common.base.Preconditions.checkNotNull;