From 88931e3e48b335b3f552e0b14df45b2b1e81a813 Mon Sep 17 00:00:00 2001 From: David Canos Date: Mon, 28 Aug 2023 12:57:35 +0200 Subject: [PATCH 1/6] upgrade javadoc dep --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4c9d07..3c4b74a 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 2.14 2.14 2.1.2 - 2.9 + 3.5.0 2.7 From a5576d27e31a8b5891f13937f8f8263a1ee039e5 Mon Sep 17 00:00:00 2001 From: David Canos Date: Mon, 28 Aug 2023 12:57:49 +0200 Subject: [PATCH 2/6] Upgrade jackson to 2.14.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c4b74a..b04ce50 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 2.25 - 2.9.8 + 2.14.3 18.0 3.0.0 1.7.23 From 2f24afdbaa4de463865da56f67420d91c081c1d3 Mon Sep 17 00:00:00 2001 From: David Canos Date: Mon, 28 Aug 2023 13:00:59 +0200 Subject: [PATCH 3/6] Upgrade slf4j to 2.0.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b04ce50..89ddcdf 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 2.14.3 18.0 3.0.0 - 1.7.23 + 2.0.7 4.12 3.9.17 From e0299a3ee61aa93d0425eb606d47e19b5ef6383a Mon Sep 17 00:00:00 2001 From: David Canos Date: Mon, 28 Aug 2023 13:01:13 +0200 Subject: [PATCH 4/6] upgrade guava to 32.1.2-jre --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 89ddcdf..f484628 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 2.25 2.14.3 - 18.0 + 32.1.2-jre 3.0.0 2.0.7 From ae3fb3496af3604a990e6c51e392ef5cfa5e6836 Mon Sep 17 00:00:00 2001 From: David Canos Date: Mon, 28 Aug 2023 13:12:56 +0200 Subject: [PATCH 5/6] Upgrade the project from javax.* to jakarta.* --- pom.xml | 7 ++++--- .../client/impl/DefaultKrakenIoClient.java | 18 +++++++++--------- .../kraken/client/model/resize/FillResize.java | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index f484628..5ff2378 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ 1.7 - 2.25 + 3.1.3 2.14.3 32.1.2-jre @@ -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} 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; From c6eb2ee605c645c9259941e83608d0cfa2f28de5 Mon Sep 17 00:00:00 2001 From: David Canos Date: Mon, 28 Aug 2023 13:31:28 +0200 Subject: [PATCH 6/6] Minor update in test deps --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5ff2378..9a29208 100644 --- a/pom.xml +++ b/pom.xml @@ -41,9 +41,9 @@ 3.0.0 2.0.7 - 4.12 + 4.13.2 3.9.17 - 1.10.17 + 1.10.19 1.3 1.4.7 @@ -110,7 +110,7 @@ org.mockito mockito-core - 3.2.0 + ${mockito.version} test @@ -146,7 +146,7 @@ commons-fileupload commons-fileupload - 1.4 + 1.5 test