Commit Graph

494 Commits

Author SHA1 Message Date
Les Hazlewood 1839ebf5e8 # This is a combination of 2 commits.
# This is the 1st commit message:

[maven-release-plugin] prepare for next development iteration

# This is the commit message #2:

rebased from master before merge
2018-08-07 13:59:15 -04:00
Les Hazlewood d7071faeae [maven-release-plugin] prepare release 0.10.2 2018-08-07 13:43:48 -04:00
Les Hazlewood f19c34a763 Ensured JJWT's org.json use is compatible with Android's org.json API as defined in https://developer.android.com/reference/org/json/package-summary. Resolves #380. 2018-08-07 13:32:20 -04:00
Les Hazlewood 5e5f29d8b1 [maven-release-plugin] prepare release 0.10.1 2018-08-02 17:30:09 -04:00
Les Hazlewood 1520ae8a21
Merge pull request #373 from jwtk/375-bc-optional
Ensure BouncyCastle is optional
2018-08-02 17:27:42 -04:00
Les Hazlewood 7f662627cc Ensured BouncyCastle was optional. Also ensured EllipticCurve algorithms could be used without BouncyCastle since the JDK supports EC by default. Moved RuntimeEnvironment.enableBouncyCastleIfPossible() call out of SignatureAlgorithm into RsaProvider since BC is only necessary for RSASSA-PSS algorithms (PS256, PS384, PS512) and nothing else in JJWT's codebase.
Resolves #372
2018-08-02 16:59:59 -04:00
Les Hazlewood b58e1b6dc5 [maven-release-plugin] prepare for next development iteration 2018-08-01 18:10:41 -04:00
Les Hazlewood 6b980553cf [maven-release-plugin] prepare release 0.10.0 2018-08-01 18:10:34 -04:00
Les Hazlewood 17af933665 [maven-release-plugin] rollback the release of 0.10.0 2018-08-01 18:02:51 -04:00
Les Hazlewood 9cfd861250 [maven-release-plugin] prepare for next development iteration 2018-08-01 18:00:33 -04:00
Les Hazlewood cd62ed1bbf [maven-release-plugin] prepare release 0.10.0 2018-08-01 18:00:27 -04:00
Les Hazlewood 59d6a7bd27
Merge pull request #371 from jwtk/355-documentation
Documentation revamp
2018-08-01 17:51:27 -04:00
Les Hazlewood 8b3f6cac53 Finally proper documentation! Updated changelog as well. Resolves #355. 2018-08-01 16:41:41 -04:00
Les Hazlewood 4085229152
Merge pull request #370 from jwtk/364-jdk9-module-testing
Re-enable builds on JDK 9+
2018-07-30 15:53:01 -04:00
Les Hazlewood 3237b720bd - Enabled maven profile for JDK >= 9 that will add a surefire <argLine> with '--add-opens java.base/jdk.internal.loader=ALL-UNNAMED' to ensure module reflection can occur during tests.
- Disabled travis openjdk11 and oraclejdk-ea builds - those build environments are not currently stable

Resolves #364
2018-07-30 14:52:11 -04:00
Les Hazlewood f26831cf16
Merge pull request #368 from jwtk/366-builder-signing-key
Added JwtBuilder#signWith(Key) with tests and refactoring.
2018-07-28 00:13:23 -04:00
Les Hazlewood a669cad29b - Added JwtBuilder#signWith(Key) with tests and refactoring. Deprecated additional signWith methods that can lead to confusion.
- Made some tests more deterministic with mocks instead of relying on Random number generator - BigInteger values were non-deterministic because of a random leading sign bit being there (or not) during test runs.

Resolves #366
2018-07-27 23:57:22 -04:00
Les Hazlewood 711d0d5556
Merge pull request #367 from jwtk/334-key-length-assertions
Key strength assertions during signing and verification
2018-07-27 15:27:31 -04:00
Les Hazlewood 9189253668 334: key strength assertions and signature validation. Resolves #334 2018-07-27 15:17:01 -04:00
Les Hazlewood 45f83d0cb1
Merge pull request #363 from jwtk/350-key-factories
Add Key generators to the public API
2018-07-25 13:00:11 -04:00
Les Hazlewood 9d244b9fca Added new io.jsonwebtoken.crypto.Keys utility class for generating SecretKeys and KeyPairs. Resolves #350 2018-07-24 22:55:02 -04:00
Les Hazlewood c9d05361fa
Merge pull request #361 from jwtk/304-spec-date-claims
Claims specification date enhancments
2018-07-23 17:22:41 -04:00
Les Hazlewood d330f2d4cc Updated Claims implementation as well as put/putAll to better handle specification dates. 2018-07-23 17:08:00 -04:00
Les Hazlewood 56f507fb59
Merge pull request #360 from jwtk/285-throws-clause
Base64 update throws clause
2018-07-23 15:55:40 -04:00
Les Hazlewood 3549cf48db 285: added throws clause and updated javadoc 2018-07-23 15:53:54 -04:00
Les Hazlewood fbcc9ab931
Merge pull request #359 from jwtk/285-base64-exceptions
Descriptive exception when decoding illegal Base64(Url) input
2018-07-23 15:50:46 -04:00
Les Hazlewood bbfabb54a7 Implementation with tests. Resolves #285 2018-07-23 15:38:30 -04:00
Les Hazlewood ac6703541e
Merge pull request #357 from jwtk/291-sdf-utc
Fix claim assertion exception message to reflect UTC timestamps
2018-07-20 19:58:58 -04:00
Les Hazlewood 7404fd130b Resolves #291 (regression tests added) 2018-07-20 19:47:47 -04:00
Les Hazlewood 2eeca41a61
Merge pull request #246 from Ledenel/master
Update README.md
2018-07-20 19:38:23 -04:00
Les Hazlewood 54ddbedbec Resolves #275 2018-07-20 17:23:23 -04:00
Les Hazlewood 1914ddd262
Merge pull request #356 from jwtk/353-upgrade-bc
Upgrade BouncyCastle to 1.60
2018-07-20 16:47:16 -04:00
Les Hazlewood f756408c60 353: upgraded bouncycastle to the latest stable 1.60 release. 2018-07-20 15:55:43 -04:00
Les Hazlewood b4e5e03152
Merge pull request #351 from jwtk/348-multi-module-project
Migrate to multi-module project
2018-07-20 12:50:16 -04:00
Les Hazlewood 439c027c2e 348: Reorganize into a multi-module project. Includes test enhancements and code reorganization 2018-07-20 12:18:40 -04:00
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