Skip to content

Commit afcd889

Browse files
authored
0.12.4 staging (#913)
Released 0.12.4, with the following additional changes: - Added 0.12.4 release version references - Added CI 'workflow_dispatch' event trigger - Changed git url from ssh to https
1 parent dd10b12 commit afcd889

File tree

17 files changed

+41
-25
lines changed

17 files changed

+41
-25
lines changed

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: CI
22

33
on:
4+
workflow_dispatch:
45
pull_request: # all pull requests
56
push:
67
branches:

README.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -543,18 +543,18 @@ If you're building a (non-Android) JDK project, you will want to define the foll
543543
<dependency>
544544
<groupId>io.jsonwebtoken</groupId>
545545
<artifactId>jjwt-api</artifactId>
546-
<version>0.12.3</version>
546+
<version>0.12.4</version>
547547
</dependency>
548548
<dependency>
549549
<groupId>io.jsonwebtoken</groupId>
550550
<artifactId>jjwt-impl</artifactId>
551-
<version>0.12.3</version>
551+
<version>0.12.4</version>
552552
<scope>runtime</scope>
553553
</dependency>
554554
<dependency>
555555
<groupId>io.jsonwebtoken</groupId>
556556
<artifactId>jjwt-jackson</artifactId> <!-- or jjwt-gson if Gson is preferred -->
557-
<version>0.12.3</version>
557+
<version>0.12.4</version>
558558
<scope>runtime</scope>
559559
</dependency>
560560
<!-- Uncomment this next dependency if you are using:
@@ -577,9 +577,9 @@ If you're building a (non-Android) JDK project, you will want to define the foll
577577

578578
```groovy
579579
dependencies {
580-
implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
581-
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3'
582-
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.3' // or 'io.jsonwebtoken:jjwt-gson:0.12.3' for gson
580+
implementation 'io.jsonwebtoken:jjwt-api:0.12.4'
581+
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.4'
582+
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.4' // or 'io.jsonwebtoken:jjwt-gson:0.12.4' for gson
583583
/*
584584
Uncomment this next dependency if you are using:
585585
- JDK 10 or earlier, and you want to use RSASSA-PSS (PS256, PS384, PS512) signature algorithms.
@@ -604,9 +604,9 @@ Add the dependencies to your project:
604604

605605
```groovy
606606
dependencies {
607-
api('io.jsonwebtoken:jjwt-api:0.12.3')
608-
runtimeOnly('io.jsonwebtoken:jjwt-impl:0.12.3')
609-
runtimeOnly('io.jsonwebtoken:jjwt-orgjson:0.12.3') {
607+
api('io.jsonwebtoken:jjwt-api:0.12.4')
608+
runtimeOnly('io.jsonwebtoken:jjwt-impl:0.12.4')
609+
runtimeOnly('io.jsonwebtoken:jjwt-orgjson:0.12.4') {
610610
exclude(group: 'org.json', module: 'json') //provided by Android natively
611611
}
612612
/*
@@ -3040,7 +3040,7 @@ scope which is the typical JJWT default). That is:
30403040
<dependency>
30413041
<groupId>io.jsonwebtoken</groupId>
30423042
<artifactId>jjwt-jackson</artifactId>
3043-
<version>0.12.3</version>
3043+
<version>0.12.4</version>
30443044
<scope>compile</scope> <!-- Not runtime -->
30453045
</dependency>
30463046
```
@@ -3049,7 +3049,7 @@ scope which is the typical JJWT default). That is:
30493049

30503050
```groovy
30513051
dependencies {
3052-
implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'
3052+
implementation 'io.jsonwebtoken:jjwt-jackson:0.12.4'
30533053
}
30543054
```
30553055

@@ -3157,7 +3157,7 @@ scope which is the typical JJWT default). That is:
31573157
<dependency>
31583158
<groupId>io.jsonwebtoken</groupId>
31593159
<artifactId>jjwt-gson</artifactId>
3160-
<version>0.12.3</version>
3160+
<version>0.12.4</version>
31613161
<scope>compile</scope> <!-- Not runtime -->
31623162
</dependency>
31633163
```
@@ -3166,7 +3166,7 @@ scope which is the typical JJWT default). That is:
31663166
31673167
```groovy
31683168
dependencies {
3169-
implementation 'io.jsonwebtoken:jjwt-gson:0.12.3'
3169+
implementation 'io.jsonwebtoken:jjwt-gson:0.12.4'
31703170
}
31713171
```
31723172

api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>io.jsonwebtoken</groupId>
2323
<artifactId>jjwt-root</artifactId>
24-
<version>0.12.4-SNAPSHOT</version>
24+
<version>0.12.5-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

extensions/gson/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>io.jsonwebtoken</groupId>
2323
<artifactId>jjwt-root</artifactId>
24-
<version>0.12.4-SNAPSHOT</version>
24+
<version>0.12.5-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

extensions/jackson/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>io.jsonwebtoken</groupId>
2323
<artifactId>jjwt-root</artifactId>
24-
<version>0.12.4-SNAPSHOT</version>
24+
<version>0.12.5-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

extensions/jackson/src/test/groovy/io/jsonwebtoken/jackson/io/JacksonDeserializerTest.groovy

+1
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ class JacksonDeserializerTest {
123123

124124
/**
125125
* Asserts https://github.com/jwtk/jjwt/issues/877
126+
* @since 0.12.4
126127
*/
127128
@Test
128129
void testStrictDuplicateDetection() {

extensions/orgjson/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>io.jsonwebtoken</groupId>
2323
<artifactId>jjwt-root</artifactId>
24-
<version>0.12.4-SNAPSHOT</version>
24+
<version>0.12.5-SNAPSHOT</version>
2525
<relativePath>../../pom.xml</relativePath>
2626
</parent>
2727

extensions/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>io.jsonwebtoken</groupId>
2323
<artifactId>jjwt-root</artifactId>
24-
<version>0.12.4-SNAPSHOT</version>
24+
<version>0.12.5-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

impl/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>io.jsonwebtoken</groupId>
2323
<artifactId>jjwt-root</artifactId>
24-
<version>0.12.4-SNAPSHOT</version>
24+
<version>0.12.5-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

impl/src/main/java/io/jsonwebtoken/impl/DelegatingClaimsMutator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <F> T put(Parameter<F> param, F value) {
4747
return self();
4848
}
4949

50-
@Override
50+
@Override // override starting in 0.12.4
5151
public Object put(String key, Object value) {
5252
if (AUDIENCE_STRING.getId().equals(key)) { // https://github.com/jwtk/jjwt/issues/890
5353
if (value instanceof String) {
@@ -63,7 +63,7 @@ public Object put(String key, Object value) {
6363
return super.put(key, value);
6464
}
6565

66-
@Override
66+
@Override // overridden starting in 0.12.4
6767
public void putAll(Map<? extends String, ?> m) {
6868
if (m == null) return;
6969
for (Map.Entry<? extends String, ?> entry : m.entrySet()) {

impl/src/main/java/io/jsonwebtoken/impl/lang/Services.java

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ private Services() {
6565
* @param <T> The type of the SPI
6666
* @return The first available instance of the service.
6767
* @throws UnavailableImplementationException When no implementation of the SPI class can be found.
68+
* @since 0.12.4
6869
*/
6970
public static <T> T get(Class<T> spi) {
7071
// TODO: JDK8, replace this find/putIfAbsent logic with ConcurrentMap.computeIfAbsent

impl/src/main/java/io/jsonwebtoken/impl/security/AesAlgorithm.java

+5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ abstract class AesAlgorithm extends CryptoAlgorithm implements KeyBuilderSupplie
5555
protected final int tagBitLength;
5656
protected final boolean gcm;
5757

58+
/**
59+
* Ensures {@code keyBitLength is a valid AES key length}
60+
* @param keyBitLength the key length (in bits) to check
61+
* @since 0.12.4
62+
*/
5863
static void assertKeyBitLength(int keyBitLength) {
5964
if (keyBitLength == 128 || keyBitLength == 192 || keyBitLength == 256) return; // valid
6065
String msg = "Invalid AES key length: " + Bytes.bitsMsg(keyBitLength) + ". AES only supports " +

impl/src/test/groovy/io/jsonwebtoken/impl/security/AbstractEcJwkFactoryTest.groovy

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ class AbstractEcJwkFactoryTest {
4444

4545
/**
4646
* Asserts correct behavior per https://github.com/jwtk/jjwt/issues/901
47+
* @since 0.12.4
4748
*/
4849
@Test
4950
void fieldElementByteArrayLength() {

impl/src/test/groovy/io/jsonwebtoken/impl/security/Pbes2HsAkwAlgorithmTest.groovy

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ class Pbes2HsAkwAlgorithmTest {
5353
}
5454
}
5555

56+
/**
57+
* @since 0.12.4
58+
*/
5659
@Test
5760
void testExceedsMaxIterations() {
5861
for (Pbes2HsAkwAlgorithm alg : ALGS) {

impl/src/test/groovy/io/jsonwebtoken/impl/security/SecretJwkFactoryTest.groovy

+4
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ class SecretJwkFactoryTest {
131131
assertEquals 'AES', result.toKey().getAlgorithm()
132132
}
133133

134+
/**
135+
* @since 0.12.4
136+
*/
134137
@Test
135138
// 'oct' type, but 'alg' value is not a secret key algorithm (and therefore malformed)
136139
void testMismatchedAlgorithm() {
@@ -176,6 +179,7 @@ class SecretJwkFactoryTest {
176179
*
177180
* This test asserts this allowed behavior per https://github.com/jwtk/jjwt/issues/905
178181
* @see <a href="https://github.com/jwtk/jjwt/issues/905">JJWT Issue 905</a>
182+
* @since 0.12.4
179183
*/
180184
@Test
181185
void testAllowedKeyLengths() {

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<groupId>io.jsonwebtoken</groupId>
2121
<artifactId>jjwt-root</artifactId>
22-
<version>0.12.4-SNAPSHOT</version>
22+
<version>0.12.5-SNAPSHOT</version>
2323
<name>JJWT</name>
2424
<description>JSON Web Token support for the JVM and Android</description>
2525
<packaging>pom</packaging>
@@ -50,8 +50,8 @@
5050

5151
<scm>
5252
<connection>scm:git:https://github.com/jwtk/jjwt.git</connection>
53-
<developerConnection>scm:git:git@github.com:jwtk/jjwt.git</developerConnection>
54-
<url>git@github.com:jwtk/jjwt.git</url>
53+
<developerConnection>scm:git:https://github.com/jwtk/jjwt.git</developerConnection>
54+
<url>https://github.com/jwtk/jjwt.git</url>
5555
<tag>HEAD</tag>
5656
</scm>
5757
<issueManagement>

tdjar/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>io.jsonwebtoken</groupId>
2323
<artifactId>jjwt-root</artifactId>
24-
<version>0.12.4-SNAPSHOT</version>
24+
<version>0.12.5-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

0 commit comments

Comments
 (0)