[Merge] Removed dependency on javax.xml.bind.Datatypeconverter (#830) by Miclebrick

This commit is contained in:
Risto Lahtela 2018-12-03 15:11:29 +02:00 committed by GitHub
commit 4c95f695a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -20,7 +20,7 @@ import com.djrapitops.plan.api.exceptions.PassEncryptException;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.PBEKeySpec;
import javax.xml.bind.DatatypeConverter;
import java.util.Base64;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.spec.InvalidKeySpecException;
@ -177,11 +177,11 @@ public class PassEncryptUtil {
}
private static byte[] fromBase64(String hex) {
return DatatypeConverter.parseBase64Binary(hex);
return Base64.getDecoder().decode(hex);
}
private static String toBase64(byte[] array) {
return DatatypeConverter.printBase64Binary(array);
return Base64.getEncoder().encodeToString(array);
}
@SuppressWarnings("serial")

View File

@ -1,3 +1,4 @@
REL|4.5.2|https://github.com/Rsl1122/Plan-PlayerAnalytics/releases/download/4.5.2-REL/Plan-4.5.2.jar|https://github.com/Rsl1122/Plan-PlayerAnalytics/releases/tag/4.5.2-REL
REL|4.5.1|https://github.com/Rsl1122/Plan-PlayerAnalytics/releases/download/4.5.1-REL/Plan-4.5.1-bukkit-bungee.jar|https://github.com/Rsl1122/Plan-PlayerAnalytics/releases/tag/4.5.1-REL
REL|4.5.0|https://github.com/Rsl1122/Plan-PlayerAnalytics/releases/download/4.5.0-RELEASE/Plan-4.5.0-bukkit-bungee.jar|https://github.com/Rsl1122/Plan-PlayerAnalytics/releases/tag/4.5.0-RELEASE
DEV|4.4.7-b4|https://github.com/Rsl1122/Plan-PlayerAnalytics/releases/download/4.5.0-DEV4/Plan-4.4.7-b4-bukkit-bungee.jar|https://github.com/Rsl1122/Plan-PlayerAnalytics/releases/tag/4.5.0-DEV4