diff --git a/pom.xml b/pom.xml index 93f1966..d47869c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,39 +4,44 @@ com.traitify traitify-jersey2 jar - 0.0.1-SNAPSHOT + 0.0.2 traitify-java https://github.com/woofound/traitify-java org.glassfish.jersey.core jersey-client - 2.21 + 2.31 org.glassfish.jersey.media jersey-media-json-jackson - 2.21 + 2.31 + + + org.glassfish.jersey.inject + jersey-hk2 + 2.31 com.fasterxml.jackson.core jackson-core - 2.5.4 + 2.10.1 com.fasterxml.jackson.core jackson-databind - 2.5.4 + 2.10.1 com.fasterxml.jackson.jaxrs jackson-jaxrs-base - 2.5.4 + 2.10.1 com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.5.4 + 2.10.1 @@ -114,8 +119,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.5 - 1.5 + 1.8 + 1.8 diff --git a/src/main/java/com/traitify/net/ApiModel.java b/src/main/java/com/traitify/net/ApiModel.java index e878b6f..3ab4523 100644 --- a/src/main/java/com/traitify/net/ApiModel.java +++ b/src/main/java/com/traitify/net/ApiModel.java @@ -1,7 +1,7 @@ package com.traitify.net; import com.traitify.Traitify; -import org.glassfish.jersey.internal.util.Base64; +import java.util.Base64; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; @@ -24,7 +24,6 @@ public static Invocation.Builder baseResource(String path) { } public static String authHeader() { - return "Basic " + new String(Base64.encode((Traitify.apiKey + ":x").getBytes())); + return "Basic " + new String(Base64.getEncoder().encode((Traitify.apiKey + ":x").getBytes())); } - }