honeymoose
/
jjwt
mirror of https://github.com/jwtk/jjwt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3rd party version upgrades where feasible (#730)

This commit is contained in:
Les Hazlewood 2022-04-26 17:17:09 -04:00 committed by GitHub
parent b35be95bf3
commit f32b350633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -283,7 +283,7 @@ If you're building a (non-Android) JDK project, you will want to define the foll
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<version>1.60</version> <version>1.70</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
--> -->
@ -298,7 +298,7 @@ dependencies {
compile 'io.jsonwebtoken:jjwt-api:0.11.3' compile 'io.jsonwebtoken:jjwt-api:0.11.3'
runtime 'io.jsonwebtoken:jjwt-impl: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: // 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 '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 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: // 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'
} }
``` ```

2
extensions/orgjson/src/test/groovy/io/jsonwebtoken/orgjson/io/OrgJsonDeserializerTest.groovy
View File

@ -87,7 +87,7 @@ class OrgJsonDeserializerTest {
def d = new OrgJsonDeserializer(); def d = new OrgJsonDeserializer();
def b = '3.14159'.getBytes(Strings.UTF_8) def b = '3.14159'.getBytes(Strings.UTF_8)
def value = d.deserialize(b) def value = d.deserialize(b)
assert value instanceof Double assert value instanceof BigDecimal
assertEquals 3.14159 as Double, value, 0d assertEquals 3.14159 as Double, value, 0d
} }

35
pom.xml
View File

@ -14,7 +14,9 @@
~ See the License for the specific language governing permissions and ~ See the License for the specific language governing permissions and
~ limitations under the License. ~ 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> <modelVersion>4.0.0</modelVersion>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
@ -115,34 +117,34 @@
<jjwt.root>${basedir}</jjwt.root> <jjwt.root>${basedir}</jjwt.root>
<jjwt.previousVersion>0.10.7</jjwt.previousVersion> <jjwt.previousVersion>0.10.7</jjwt.previousVersion>
<maven.jar.version>3.0.2</maven.jar.version> <maven.jar.version>3.2.2</maven.jar.version>
<maven.compiler.version>3.8.0</maven.compiler.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> <maven.javadoc.version>3.1.1</maven.javadoc.version> <!-- max version allowed for JDK 7 builds -->
<maven.source.version>3.0.1</maven.source.version> <maven.source.version>3.2.1</maven.source.version>
<maven.gpg.version>1.6</maven.gpg.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> <maven.japicmp.version>0.13.1</maven.japicmp.version> <!-- max version allowed for JDK 7 builds -->
<gmavenplus.version>1.6.1</gmavenplus.version> <gmavenplus.version>1.6.1</gmavenplus.version> <!-- higher version used in jdk8AndLater profile below -->
<jdk.version>1.7</jdk.version> <jdk.version>1.7</jdk.version>
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber> <buildNumber>${user.name}-${maven.build.timestamp}</buildNumber>
<jackson.version>2.12.6.1</jackson.version> <jackson.version>2.12.6.1</jackson.version>
<orgjson.version>20180130</orgjson.version> <orgjson.version>20220320</orgjson.version>
<gson.version>2.8.9</gson.version> <gson.version>2.9.0</gson.version>
<maven.javadoc.additionalOptions></maven.javadoc.additionalOptions> <maven.javadoc.additionalOptions></maven.javadoc.additionalOptions>
<!-- Optional Runtime Dependencies: --> <!-- 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: --> <!-- Test Dependencies: Only required for testing when building. Not required by users at runtime: -->
<groovy.version>2.5.16</groovy.version> <groovy.version>2.5.16</groovy.version> <!-- higher version used in jdk8AndLater profile below -->
<easymock.version>3.6</easymock.version> <easymock.version>3.6</easymock.version> <!-- higher version used in jdk8AndLater profile below -->
<junit.version>4.12</junit.version> <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> <failsafe.plugin.version>3.0.0-M5</failsafe.plugin.version>
<surefire.plugin.version>3.0.0-M5</surefire.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> <clover.db>${jjwt.root}/target/clover/clover.db</clover.db>
<surefire.argLine/> <surefire.argLine/>
@ -382,7 +384,8 @@
</oldVersion> </oldVersion>
<parameter> <parameter>
<onlyModified>true</onlyModified> <onlyModified>true</onlyModified>
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications> <breakBuildOnBinaryIncompatibleModifications>true
</breakBuildOnBinaryIncompatibleModifications>
<!-- TODO: enable after 1.0 --> <!-- TODO: enable after 1.0 -->
<!-- <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>--> <!-- <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>-->
</parameter> </parameter>