Skip to content

Upgrade deps #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Upgrade deps #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88931e3
upgrade javadoc dep
davidcanos Aug 28, 2023
a5576d2
Upgrade jackson to 2.14.3
davidcanos Aug 28, 2023
2f24afd
Upgrade slf4j to 2.0.7
davidcanos Aug 28, 2023
e0299a3
upgrade guava to 32.1.2-jre
davidcanos Aug 28, 2023
ae3fb34
Upgrade the project from javax.* to jakarta.*
davidcanos Aug 28, 2023
c6eb2ee
Minor update in test deps
davidcanos Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@
<java.version>1.7</java.version>
<arguments />

<jersey.version>2.25</jersey.version>
<jersey.version>3.1.3</jersey.version>
<!--<jackson.version>2.8.6</jackson.version>-->
<jackson.version>2.9.8</jackson.version>
<guava.version>18.0</guava.version>
<jackson.version>2.14.3</jackson.version>
<guava.version>32.1.2-jre</guava.version>
<findbugs.version>3.0.0</findbugs.version>
<slf4j.version>1.7.23</slf4j.version>
<slf4j.version>2.0.7</slf4j.version>

<junit.version>4.12</junit.version>
<junit.version>4.13.2</junit.version>
<mockserver.version>3.9.17</mockserver.version>
<mockito.version>1.10.17</mockito.version>
<mockito.version>1.10.19</mockito.version>
<hemcrest.version>1.3</hemcrest.version>

<unirest.version>1.4.7</unirest.version>
Expand All @@ -58,7 +58,7 @@
<maven.failsafe.plugin.version>2.14</maven.failsafe.plugin.version>
<maven.surefire.report.plugin.version>2.14</maven.surefire.report.plugin.version>
<maven.source.plugin.version>2.1.2</maven.source.plugin.version>
<maven.javadoc.plugin.version>2.9</maven.javadoc.plugin.version>
<maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
<maven.versions-maven-plugin>2.7</maven.versions-maven-plugin>
</properties>

Expand Down Expand Up @@ -99,17 +99,18 @@
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.2.0</version>
<version>${mockito.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -145,7 +146,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.4</version>
<version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/io/kraken/client/impl/DefaultKrakenIoClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/kraken/client/model/resize/FillResize.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down