Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3rd party version upgrades where feasible #730

Merged
merged 1 commit into from
Apr 26, 2022
Merged

3rd party version upgrades where feasible #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
-->
Expand All @@ -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
}
```
Expand All @@ -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'
}
```

Expand Down
2 changes: 1 addition & 1 deletion extensions/orgjson/src/test/groovy/io/jsonwebtoken/orgjson/io/OrgJsonDeserializerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
35 changes: 19 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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/>

Expand Down Expand Up @@ -382,7 +384,8 @@
</oldVersion>
<parameter>
<onlyModified>true</onlyModified>
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
<breakBuildOnBinaryIncompatibleModifications>true
</breakBuildOnBinaryIncompatibleModifications>
<!-- TODO: enable after 1.0 -->
<!-- <breakBuildBasedOnSemanticVersioning>true</breakBuildBasedOnSemanticVersioning>-->
</parameter>
Expand Down