From cdb19030c37b40c0807f5951a0e77416c5d811b3 Mon Sep 17 00:00:00 2001
From: Daniel DeGroff <daniel@fusionauth.io>
Date: Thu, 19 Jan 2023 16:52:23 -0700
Subject: [PATCH] Bump Jackson, bump version to 5.2.2

---
 build.savant                                  | 23 +++++++++++--------
 fusionauth-jwt.iml                            | 12 +++++-----
 pom.xml                                       |  9 ++++----
 .../io/fusionauth/jwt/VulnerabilityTest.java  |  1 -
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/build.savant b/build.savant
index a86c0d6..ab0f8ff 100644
--- a/build.savant
+++ b/build.savant
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2022, FusionAuth, All Rights Reserved
+ * Copyright (c) 2016-2023, FusionAuth, All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,19 @@
  * language governing permissions and limitations under the License.
  */
 
-jacksonVersion = "2.13.3"
+jacksonVersion = "2.13.4"
 
-project(group: "io.fusionauth", name: "fusionauth-jwt", version: "5.2.1", licenses: ["ApacheV2_0"]) {
+project(group: "io.fusionauth", name: "fusionauth-jwt", version: "5.2.2", licenses: ["ApacheV2_0"]) {
 
   workflow {
     fetch {
+      // 1. Check local Savant and Maven cache
       cache()
+      mavenCache()
+      // 2. Check public Savant repo
       url(url: "https://repository.savantbuild.org")
+      // 3. Pull it from Maven central
+      maven()
     }
     publish {
       cache()
@@ -52,12 +57,12 @@ project(group: "io.fusionauth", name: "fusionauth-jwt", version: "5.2.1", licens
 /*
  * Define Plugins
  */
-dependency = loadPlugin(id: "org.savantbuild.plugin:dependency:1.0.2")
-java = loadPlugin(id: "org.savantbuild.plugin:java:1.2.0")
-javaTestNG = loadPlugin(id: "org.savantbuild.plugin:java-testng:1.0.12")
-groovy = loadPlugin(id: "org.savantbuild.plugin:groovy:1.0.3")
-idea = loadPlugin(id: "org.savantbuild.plugin:idea:1.0.1")
-release = loadPlugin(id: "org.savantbuild.plugin:release-git:1.0.0")
+dependency = loadPlugin(id: "org.savantbuild.plugin:dependency:2.0.0-RC.4")
+java = loadPlugin(id: "org.savantbuild.plugin:java:2.0.0-RC.4")
+javaTestNG = loadPlugin(id: "org.savantbuild.plugin:java-testng:2.0.0-RC.4")
+groovy = loadPlugin(id: "org.savantbuild.plugin:groovy:2.0.0-RC.4")
+idea = loadPlugin(id: "org.savantbuild.plugin:idea:2.0.0-RC.4")
+release = loadPlugin(id: "org.savantbuild.plugin:release-git:2.0.0-RC.4")
 
 /*
  * Plugin Settings
diff --git a/fusionauth-jwt.iml b/fusionauth-jwt.iml
index a5de5a7..5d26886 100644
--- a/fusionauth-jwt.iml
+++ b/fusionauth-jwt.iml
@@ -16,33 +16,33 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-databind/2.13.3/jackson-databind-2.13.3.jar!/" />
+          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-databind/2.13.4/jackson-databind-2.13.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-databind/2.13.3/jackson-databind-2.13.3-src.jar!/" />
+          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-databind/2.13.4/jackson-databind-2.13.4-src.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-annotations/2.13.3/jackson-annotations-2.13.3.jar!/" />
+          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-annotations/2.13.4/jackson-annotations-2.13.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-annotations/2.13.3/jackson-annotations-2.13.3-src.jar!/" />
+          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-annotations/2.13.4/jackson-annotations-2.13.4-src.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-core/2.13.3/jackson-core-2.13.3.jar!/" />
+          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-core/2.13.4/jackson-core-2.13.4.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-core/2.13.3/jackson-core-2.13.3-src.jar!/" />
+          <root url="jar://$USER_HOME$/.savant/cache/com/fasterxml/jackson/core/jackson-core/2.13.4/jackson-core-2.13.4-src.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/pom.xml b/pom.xml
index 7993c51..66c8136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.fusionauth</groupId>
   <artifactId>fusionauth-jwt</artifactId>
-  <version>5.2.1</version>
+  <version>5.2.2</version>
   <packaging>jar</packaging>
 
   <name>FusionAuth JWT</name>
@@ -55,23 +55,24 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <java.module.version>9</java.module.version>
+    <project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.13.3</version>
+      <version>2.13.4</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.13.3</version>
+      <version>2.13.4</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.13.3</version>
+      <version>2.13.4</version>
     </dependency>
 
     <!--  Testing Dependencies  -->
diff --git a/src/test/java/io/fusionauth/jwt/VulnerabilityTest.java b/src/test/java/io/fusionauth/jwt/VulnerabilityTest.java
index b32bb06..be06f24 100644
--- a/src/test/java/io/fusionauth/jwt/VulnerabilityTest.java
+++ b/src/test/java/io/fusionauth/jwt/VulnerabilityTest.java
@@ -63,7 +63,6 @@ public void test_ECDSA_CVE_2022_21449() {
 
     // Sign it using ECDSA 256
     for (String alg : Arrays.asList("256", "384", "521")) {
-      System.out.println("\n\n\n\n");
       Signer signer = alg.equals("256")
           ? ECSigner.newSHA256Signer(readFile("ec_private_key_p_" + alg + ".pem"))
           : alg.equals("384")