From 024bb0b1b2820d8c1974eaf98e1c2d3839850b09 Mon Sep 17 00:00:00 2001
From: Les Hazlewood <121180+lhazlewood@users.noreply.github.com>
Date: Tue, 26 Apr 2022 17:11:35 -0400
Subject: [PATCH] 3rd party version upgrades where feasible

---
 README.md                                     |  6 ++--
 .../orgjson/io/OrgJsonDeserializerTest.groovy |  2 +-
 pom.xml                                       | 35 ++++++++++---------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 99f557a9f..7349ef596 100644
--- a/README.md
+++ b/README.md
@@ -283,7 +283,7 @@ If you're building a (non-Android) JDK project, you will want to define the foll
 <dependency>
     <groupId>org.bouncycastle</groupId>
     <artifactId>bcprov-jdk15on</artifactId>
-    <version>1.60</version>
+    <version>1.70</version>
     <scope>runtime</scope>
 </dependency>
 -->
@@ -298,7 +298,7 @@ dependencies {
     compile 'io.jsonwebtoken:jjwt-api:0.11.3'
     runtime 'io.jsonwebtoken:jjwt-impl:0.11.3',
     // Uncomment the next line if you want to use RSASSA-PSS (PS256, PS384, PS512) algorithms:
-    //'org.bouncycastle:bcprov-jdk15on:1.60',
+    //'org.bouncycastle:bcprov-jdk15on:1.70',
     'io.jsonwebtoken:jjwt-jackson:0.11.3' // or 'io.jsonwebtoken:jjwt-gson:0.11.3' for gson
 }
 ```
@@ -321,7 +321,7 @@ dependencies {
         exclude group: 'org.json', module: 'json' //provided by Android natively
     }
     // Uncomment the next line if you want to use RSASSA-PSS (PS256, PS384, PS512) algorithms:
-    //runtimeOnly 'org.bouncycastle:bcprov-jdk15on:1.60'
+    //runtimeOnly 'org.bouncycastle:bcprov-jdk15on:1.70'
 }
 ```
 
diff --git a/extensions/orgjson/src/test/groovy/io/jsonwebtoken/orgjson/io/OrgJsonDeserializerTest.groovy b/extensions/orgjson/src/test/groovy/io/jsonwebtoken/orgjson/io/OrgJsonDeserializerTest.groovy
index cae5134a2..7d3e13ae1 100644
--- a/extensions/orgjson/src/test/groovy/io/jsonwebtoken/orgjson/io/OrgJsonDeserializerTest.groovy
+++ b/extensions/orgjson/src/test/groovy/io/jsonwebtoken/orgjson/io/OrgJsonDeserializerTest.groovy
@@ -87,7 +87,7 @@ class OrgJsonDeserializerTest {
         def d = new OrgJsonDeserializer();
         def b = '3.14159'.getBytes(Strings.UTF_8)
         def value = d.deserialize(b)
-        assert value instanceof Double
+        assert value instanceof BigDecimal
         assertEquals 3.14159 as Double, value, 0d
     }
 
diff --git a/pom.xml b/pom.xml
index c52500a7a..0955b74c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.jsonwebtoken</groupId>
@@ -115,34 +117,34 @@
         <jjwt.root>${basedir}</jjwt.root>
         <jjwt.previousVersion>0.10.7</jjwt.previousVersion>
 
-        <maven.jar.version>3.0.2</maven.jar.version>
-        <maven.compiler.version>3.8.0</maven.compiler.version>
-        <maven.javadoc.version>3.1.1</maven.javadoc.version>
-        <maven.source.version>3.0.1</maven.source.version>
-        <maven.gpg.version>1.6</maven.gpg.version>
-        <maven.japicmp.version>0.13.1</maven.japicmp.version>
-        <gmavenplus.version>1.6.1</gmavenplus.version>
+        <maven.jar.version>3.2.2</maven.jar.version>
+        <maven.compiler.version>3.8.1</maven.compiler.version> <!-- max version allowed for JDK 7 builds -->
+        <maven.javadoc.version>3.1.1</maven.javadoc.version> <!-- max version allowed for JDK 7 builds -->
+        <maven.source.version>3.2.1</maven.source.version>
+        <maven.gpg.version>1.6</maven.gpg.version> <!-- max version allowed for JDK 7 builds -->
+        <maven.japicmp.version>0.13.1</maven.japicmp.version> <!-- max version allowed for JDK 7 builds -->
+        <gmavenplus.version>1.6.1</gmavenplus.version> <!-- higher version used in jdk8AndLater profile below -->
 
         <jdk.version>1.7</jdk.version>
         <buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
 
         <jackson.version>2.12.6.1</jackson.version>
-        <orgjson.version>20180130</orgjson.version>
-        <gson.version>2.8.9</gson.version>
+        <orgjson.version>20220320</orgjson.version>
+        <gson.version>2.9.0</gson.version>
 
         <maven.javadoc.additionalOptions></maven.javadoc.additionalOptions>
 
         <!-- Optional Runtime Dependencies: -->
-        <bouncycastle.version>1.67</bouncycastle.version>
+        <bouncycastle.version>1.70</bouncycastle.version>
 
         <!-- Test Dependencies: Only required for testing when building.  Not required by users at runtime: -->
-        <groovy.version>2.5.16</groovy.version>
-        <easymock.version>3.6</easymock.version>
+        <groovy.version>2.5.16</groovy.version> <!-- higher version used in jdk8AndLater profile below -->
+        <easymock.version>3.6</easymock.version> <!-- higher version used in jdk8AndLater profile below -->
         <junit.version>4.12</junit.version>
-        <powermock.version>2.0.0-beta.5</powermock.version> <!-- necessary for Java 9 support -->
+        <powermock.version>2.0.0-beta.5</powermock.version> <!-- higher version used in jdk8AndLater profile below -->
         <failsafe.plugin.version>3.0.0-M5</failsafe.plugin.version>
         <surefire.plugin.version>3.0.0-M5</surefire.plugin.version>
-        <clover.version>4.2.1</clover.version>
+        <clover.version>4.3.1</clover.version> <!-- max version allowed for JDK 7 builds -->
         <clover.db>${jjwt.root}/target/clover/clover.db</clover.db>
         <surefire.argLine/>
 
@@ -382,7 +384,8 @@
                         </oldVersion>
                         <parameter>
                             <onlyModified>true</onlyModified>
-                            <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+                            <breakBuildOnBinaryIncompatibleModifications>true
+                            </breakBuildOnBinaryIncompatibleModifications>
                             <!-- TODO: enable after 1.0 -->
                             <!-- <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>-->
                         </parameter>