Commit Graph

409 Commits

Author SHA1 Message Date
Les Hazlewood 29172608a9
Merge pull request #344 from jwtk/issue-335-custom-json
Pluggable JSON serialization
2018-07-11 17:58:57 -04:00
Les Hazlewood 8afca0d0df 335: initial pluggable JSON (de)serialization support with Jackson and org.json as the first implementations, with Jackson being the default. Added tests to retain 100% code coverage. 2018-07-11 16:36:09 -04:00
Les Hazlewood bae78f03f4
Merge pull request #341 from jwtk/issue-333-base64
Deterministic Base64 Behavior
2018-07-08 22:19:34 -04:00
Les Hazlewood 6e1415c441 - Implemented new Base64 encoder forked from MigBase64 to guarantee deterministic behavior on all JDK and Android platforms
- Allowed pluggable Encoder/Decoder for JWT building and parsing via new Encoder/Decoder and JwtBuilder#base64UrlEncodeWith
  and JwtParser#base64UrlDecodeWith methods respectively
- added RFC 4648 Base64 test vectors per code review
- Added tests for all new code to retain 100% code coverage, verified by Clover and Coveralls
- Enabled oraclejdk10 and openjdk10 builds in TravisCI
- Replaced gmaven plugin with gmavenplus to work on JDK >= 9
- Upgraded surefire and failsafe plugins to 2.22.0 to ensure build works on JDK >= 10
- Ensured JavaDoc linter wouldn't fail the build for JDK >= 8 (was previously only 1.8)
- Updated changelog doc to reflect new Base64 functionality
2018-07-08 20:29:49 -04:00
Les Hazlewood 130a841011
Merge pull request #343 from jwtk/fix-master-pom-project-version
Fix master branch pom project version
2018-07-08 20:15:28 -04:00
Les Hazlewood 47b6dad521 fixed master version - should always be a Maj.min.0-SNAPSHOT version. 2018-07-08 19:54:36 -04:00
Les Hazlewood bf6423b52d
Merge pull request #295 from jokoframework/roskoff-patch-1
Add Proguard setup section on README
2018-07-05 18:39:11 -04:00
Les Hazlewood 3ec0d1c8a0 merged from 0.9.x to pickup jackson upgrade 2018-07-05 18:31:37 -04:00
Les Hazlewood 4a62a56855
Merge pull request #338 from jwtk/issue-337
Upgraded Jackson to latest stable 2.9.6.  Fixes #337.
2018-07-05 18:24:45 -04:00
Les Hazlewood d0e9e7a2bd Modified docs to reflect upcoming 0.9.1 release 2018-07-05 18:22:23 -04:00
Les Hazlewood 15f5f253e7 Upgraded Jackson to latest stable 2.9.6. Fixes #337. 2018-07-05 17:59:23 -04:00
Les Hazlewood caa2a64cd5
Merge pull request #306 from RyanBard/Issue302_UpdateJackson
closes #302: Update jackson version
2018-07-05 13:03:42 -04:00
Les Hazlewood 3a9fecfd06
Merge branch '0.9.x' into Issue302_UpdateJackson 2018-07-05 12:46:11 -04:00
Les Hazlewood d8da276d9d updating for 0.9.x development 2018-07-05 12:42:08 -04:00
John Bard c7561b639b closes #302: Update jackson version
* Updates jackson-databind version to 2.8.11.1 to fix CVE-2017-17485

Signed-off-by: John Bard <jbard@vmware.com>
2018-03-02 10:17:08 -05:00
Eliseo Ocampos b1001f6e7c
Add Proguard setup section on README
Add Proguard rules for Android projects so it can be referenced right away.
2018-01-04 10:09:37 -03:00
Les Hazlewood 44faaca422
Merge pull request #272 from mkempster/master
Add project.url to satisfy the dependency-check-maven plugin
2017-10-30 17:35:49 -04:00
Mark Kempster e9ea740c4b Add project.url to satisfy the dependency-check-maven plugin
The MANIFEST.MF contains an Implementation-URL key, that comes from
project.url if defined. If not defined, jjwt's url comes from sonatype
which seems to falsely associate it with a sonatype/nexus CVE and
fails the project build.

https://github.com/jwtk/jjwt/issues/234
2017-10-19 22:47:26 -04:00
Les Hazlewood f9376df96c Updated to reflect 0.9.0 release 2017-10-11 19:15:15 -04:00
Micah Silverman 07f3388d08 [maven-release-plugin] prepare for next development iteration 2017-10-10 15:11:27 -04:00
Micah Silverman 6f4086d7f1 [maven-release-plugin] prepare release jjwt-0.9.0 2017-10-10 15:11:23 -04:00
Micah Silverman 314fe4d8c8 Updated changelog. 2017-10-10 15:04:34 -04:00
Micah Silverman 389552787f Merge pull request #267 from jwtk/support_java_9
Support java 9
2017-10-10 13:07:55 -04:00
Micah Silverman d229631af4 Added Java 9 build to Travis file. 2017-10-09 20:25:57 -04:00
Micah Silverman 91fd0fd3b4 Added support for Java 9 build and test run. Does not impact Java 8 build and test. Overrode some OSS version dependency version defaults to support Java 9. Updated javadocs in code to pass java 9 linter. 2017-10-09 20:15:18 -04:00
Micah Silverman 395128eae6 updated changelog 2017-09-26 13:08:01 -04:00
Micah Silverman 8248b6a38a [maven-release-plugin] prepare for next development iteration 2017-09-26 12:05:22 -04:00
Micah Silverman 50187e0d08 [maven-release-plugin] prepare release 0.8.0 2017-09-26 12:05:18 -04:00
Micah Silverman a21480a885 Merge pull request #257 from jwtk/readme_update
Updated readme to reflect Okta's stewardship and to indicate updated version of jackson
2017-09-26 11:57:55 -04:00
Micah Silverman 0bedf238d0 Updated readme to reflect Okta's stewardship and to indicate updated version of jackson 2017-09-19 12:03:26 -04:00
Micah Silverman fda4d4e4e1 Merge pull request #251 from jwtk/switch_to_clover
Switch to clover
2017-09-14 09:07:39 -04:00
Micah Silverman 15ac672734 Referenced jwtk version of coveralls-maven-plugin. Temp fix until its formally released. 2017-09-09 23:17:36 -04:00
Micah Silverman 5ffee1e3ac Switched from jacoco to open-clover. Updated GzipCompressionCodec to improve coverage report. 2017-09-09 23:17:36 -04:00
Ledenel fb847212d7 Update README.md
Add notice in examples.
2017-08-12 22:44:44 +08:00
Micah Silverman 8797f1d04f Merge pull request #239 from jwtk/travis_fix
Travis fix
2017-07-25 10:53:22 -04:00
Micah Silverman d298940405 updated oraclejdk7 to openjdk7 per https://github.com/travis-ci/travis-ci/issues/7884#issuecomment-308451879 2017-07-25 10:32:22 -04:00
Micah Silverman f62c7cee00 Updated travis file to reference jdk per https://docs.travis-ci.com/user/languages/java/ 2017-07-25 10:26:37 -04:00
Les Hazlewood ac73b1caa9 Merge pull request #232 from msymons/master
Update jackson.version to 2.8.9
2017-06-24 11:35:39 -04:00
Mark Symons 6563e4f1d0 Update jackson.version to 2.8.9
Addresses Jackson Deserializer security vulnerability: FasterXML/jackson-databind#1599
2017-06-24 15:51:03 +01:00
Les Hazlewood bc9e9c7c06 Merge pull request #224 from woody77/master
Test for instanceof PrivateKey and instanceof ECKey when signing
2017-05-25 12:38:44 -07:00
Aaron Wood 2b8ad0c05a Similar to issue #68 (https://github.com/jwtk/jjwt/issues/68), EC keys on Android do not implement ECPrivateKey. This changes the check in EllipticCurveSigner.java to use the same test as was used to solve issue #68 for RSA keys. 2017-05-24 15:33:50 -07:00
Les Hazlewood 8a6f588e81 Merge pull request #200 from roberterdin/master
Added addClaims function to JwtBuilder as described in Issue #196.
2017-05-16 12:46:48 -07:00
Les Hazlewood cb9e24a06f Merge pull request #207 from jwtk/issue/206
Removed redundant/incorrect docs
2017-05-16 12:41:05 -07:00
Les Hazlewood cb5a99265f Merge pull request #209 from arlemi/master
Update README.md
2017-05-16 12:39:24 -07:00
Les Hazlewood 879ed12ee1 Merge pull request #222 from aadrian/patch_1
update bouncycastle and logback versions
2017-05-16 12:38:52 -07:00
aadrian 65463328be fix Travis again. 2017-05-13 17:58:47 +02:00
aadrian a473dc4be1 try using a build matrix for Travis 2017-05-13 17:55:00 +02:00
aadrian 4bb111b327 try updating other dependencies too. 2017-05-13 17:43:43 +02:00
aadrian e780c224c8 update bouncycastle and logback versions 2017-05-13 17:28:01 +02:00
Arlemi 9b944fc999 Update README.md
Added missing Variable Declarator for the IncorrectClaimException catch
2017-02-15 16:01:11 +01:00