From 783656f069c1ce1db3979b9f18e3e3d01fb88957 Mon Sep 17 00:00:00 2001 From: gueuselambix Date: Fri, 24 Feb 2023 15:30:08 +0100 Subject: [PATCH] upgrade dependencies - junit 3.8.1 -> 4.13.2 - nimbus-jose-jwt 8.19 -> 9.13 - guava 18.0 -> 31.1-jre --- pom.xml | 12 ++++++------ src/main/java/org/mitre/jose/jwk/Launcher.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index ebb09e9..0313b67 100644 --- a/pom.xml +++ b/pom.xml @@ -85,13 +85,13 @@ junit junit - 3.8.1 + 4.13.2 test com.nimbusds nimbus-jose-jwt - 8.19 + 9.31 commons-cli @@ -101,22 +101,22 @@ com.google.guava guava - 18.0 + 31.1-jre com.google.code.gson gson - 2.8.6 + 2.8.9 org.bouncycastle bcprov-jdk15on - 1.66 + 1.67 org.bouncycastle bcpkix-jdk15on - 1.66 + 1.67 diff --git a/src/main/java/org/mitre/jose/jwk/Launcher.java b/src/main/java/org/mitre/jose/jwk/Launcher.java index f494b85..c219e3b 100644 --- a/src/main/java/org/mitre/jose/jwk/Launcher.java +++ b/src/main/java/org/mitre/jose/jwk/Launcher.java @@ -407,8 +407,8 @@ private static void writeKeyToFile(boolean keySet, String outFile, String pubOut List jwkList = new ArrayList<>(existingKeys); jwkList.add(jwk); JWKSet jwkSet = new JWKSet(jwkList); - json = JsonParser.parseString(jwkSet.toJSONObject(false).toJSONString()); - pubJson = JsonParser.parseString(jwkSet.toJSONObject(true).toJSONString()); + json = JsonParser.parseString(jwkSet.toString(false)); + pubJson = JsonParser.parseString(jwkSet.toString(true)); } else { json = JsonParser.parseString(jwk.toJSONString()); pubJson = JsonParser.parseString(jwk.toPublicJWK().toJSONString()); @@ -427,7 +427,7 @@ private static void writeKeyToFile(boolean keySet, String outFile, String pubOut private static void printKey(boolean keySet, JWK jwk, Gson gson) { if (keySet) { JWKSet jwkSet = new JWKSet(jwk); - JsonElement json = JsonParser.parseString(jwkSet.toJSONObject(false).toJSONString()); + JsonElement json = JsonParser.parseString(jwkSet.toString(false)); System.out.println(gson.toJson(json)); } else { JsonElement json = JsonParser.parseString(jwk.toJSONString());