diff --git a/pom.xml b/pom.xml index ab93381..af2ad0f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.akamai edgeauth - 1.0.1-SNAPSHOT + 1.1.0-SNAPSHOT EdgeAuth-Token-Java Akamai Edge Authorization Token for Java https://github.com/akamai/EdgeAuth-Token-Java @@ -33,11 +33,6 @@ scm:git@github.com:akamai/EdgeAuth-Token-Java.git - - jakarta.xml.bind - jakarta.xml.bind-api - 3.0.1 - junit junit @@ -211,6 +206,10 @@ org.apache.maven.plugins maven-compiler-plugin 3.12.1 + + ${java.version} + ${java.version} + @@ -222,7 +221,8 @@ [9,) - 8 + 17 + 17 diff --git a/src/main/java/com/akamai/edgeauth/EdgeAuth.java b/src/main/java/com/akamai/edgeauth/EdgeAuth.java index fa8a75e..14af615 100644 --- a/src/main/java/com/akamai/edgeauth/EdgeAuth.java +++ b/src/main/java/com/akamai/edgeauth/EdgeAuth.java @@ -25,12 +25,12 @@ import java.security.NoSuchAlgorithmException; import java.security.InvalidKeyException; import java.util.Calendar; +import java.util.HexFormat; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -import jakarta.xml.bind.DatatypeConverter; /** @@ -298,7 +298,7 @@ private String generateToken(String path, boolean isUrl) throws EdgeAuthExceptio try { Mac hmac = Mac.getInstance(this.algorithm); - byte[] keyBytes = DatatypeConverter.parseHexBinary(this.key); + byte[] keyBytes = HexFormat.of().parseHex(this.key); SecretKeySpec secretKey = new SecretKeySpec(keyBytes, this.algorithm); hmac.init(secretKey);