Skip to content

Commit

Permalink
Merge branch 'release/4.6.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
bratkartoffel committed May 19, 2022
2 parents e0f582f + abec381 commit 8e59c5b
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ jobs:
- 2.2.13.RELEASE
- 2.3.12.RELEASE
- 2.4.13
- 2.5.10
- 2.6.4
- 2.7.0-M2
- 2.5.14
- 2.6.8
- 2.7.0
# 3.0.0 will not be supported for now due to:
# * requires java 17
# * needs other imports for servlet classes (javax.servlet -> jakarta.servlet)
Expand Down
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# Changelog

### [unreleased]
* no changes yet
* (all) upgrade jackson to 2.13.3
* (all) upgrade nimbus-jose-jwt to 9.22
* (all) upgrade openapi to 1.6.8
* (redis) upgrade jedis to 4.2.3

### [4.6.1] (2022-02-25)
* (all) remove runtime dependency on mockito (used for tests only of course)
Expand Down Expand Up @@ -154,7 +157,8 @@
* Initial release to github and maven central


[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/4.6.0...develop
[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/4.6.1...develop
[4.6.1]: https://github.com/bratkartoffel/security-jwt/compare/4.6.0...4.6.1
[4.6.0]: https://github.com/bratkartoffel/security-jwt/compare/4.5.2...4.6.0
[4.5.2]: https://github.com/bratkartoffel/security-jwt/compare/4.5.1...4.5.2
[4.5.1]: https://github.com/bratkartoffel/security-jwt/compare/4.5.0...4.5.1
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ should be sufficient for the most use cases.
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-base</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
<!-- or -->
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-base-spring-boot-starter</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
</dependencies>
```
Expand All @@ -68,27 +68,27 @@ When you want to add refresh token support, then choose one of the following dep
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-internal</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-memcache</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-hibernate</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-redis</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-files</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
</dependencies>
```
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,9 @@ subprojects {
}

// Signature of artifacts
if (project.hasProperty('signing.keyId')) {
if (project.hasProperty('signing.gnupg.keyName')) {
signing {
useGpgCmd()
required = !rootProject.version.endsWith('-SNAPSHOT')
sign publishing.publications.mavenJava
}
Expand Down
2 changes: 1 addition & 1 deletion files/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This module adds support for storing refresh tokens within an simple json docume
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-files</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
```

Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
# the lowest version of spring boot we support is 2.0, so just use that for compilation
# hope that spring boot strictly adheres to semantic versioning
springBootVersion=2.0.0.RELEASE
lombokPluginVersion=6.4.1
testLoggerPluginVersion=3.1.0
lombokPluginVersion=6.4.3
testLoggerPluginVersion=3.2.0
versionsPluginVersion=0.42.0
# dependencies
bouncyCastleVersion=1.70
commonsCodecVersion=1.15
expiringMapVersion=0.5.10
jacksonVersion=2.13.1
jedisVersion=4.1.1
nimbusJwtVersion=9.20
openApiVersion=1.6.6
jacksonVersion=2.13.3
jedisVersion=4.2.3
nimbusJwtVersion=9.22
openApiVersion=1.6.8
spyMemcachedVersion=2.12.3
# test only (internal) dependencies
h2Version=1.4.200
jacocoVersion=0.8.7
jupiterVersion=5.8.2
mockitoVersion=4.3.1
mockitoVersion=4.5.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion hibernate/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ for rows you have to regularly cleanup the token table, e.g. by using a cronjob.
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-hibernate</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion internal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This module adds support for storing refresh tokens within an in-memory storage.
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-internal</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion memcache/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Please note that the memcache-plugin needs an external memcached server.
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-memcache</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion redis/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Please note that the redis-plugin needs an external redisd server.
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-redis</artifactId>
<version>4.6.1</version>
<version>4.6.2</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.6.1
4.6.2

0 comments on commit 8e59c5b

Please sign in to comment.