Skip to content

Commit

Permalink
Merge branch 'release/4.5.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
bratkartoffel committed Feb 8, 2022
2 parents 4524d3a + 654c1f5 commit 74ee777
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 29 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
### [unreleased]
* no changes yet

### [4.5.2] (2022-02-08)
* (all) upgrade openapi to 1.6.6
* (all) upgrade nimbus-jose-jwt to 9.19
* (redis) upgrade jedis to 4.1.1

### [4.5.1] (2022-01-25)
* (all) upgrade bouncycastle to 1.70
* (all) upgrade openapi to 1.6.5
Expand Down Expand Up @@ -142,7 +147,8 @@
* Initial release to github and maven central


[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/4.5.0...develop
[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/4.5.2...develop
[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
[4.5.0]: https://github.com/bratkartoffel/security-jwt/compare/4.4.2...4.5.0
[4.4.2]: https://github.com/bratkartoffel/security-jwt/compare/4.4.1...4.4.2
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.5.1</version>
<version>4.5.2</version>
</dependency>
<!-- or -->
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-base-spring-boot-starter</artifactId>
<version>4.5.1</version>
<version>4.5.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.5.1</version>
<version>4.5.2</version>
</dependency>
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-memcache</artifactId>
<version>4.5.1</version>
<version>4.5.2</version>
</dependency>
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-hibernate</artifactId>
<version>4.5.1</version>
<version>4.5.2</version>
</dependency>
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-redis</artifactId>
<version>4.5.1</version>
<version>4.5.2</version>
</dependency>
<dependency>
<groupId>eu.fraho.spring</groupId>
<artifactId>security-jwt-files</artifactId>
<version>4.5.1</version>
<version>4.5.2</version>
</dependency>
</dependencies>
```
Expand Down
22 changes: 12 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -176,15 +176,17 @@ task jacocoRootReport(type: JacocoReport) {
}

// dependencyUpdates should only suggest released versions
dependencyUpdates.resolutionStrategy {
componentSelection { rules ->
rules.all { ComponentSelection selection ->
boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'preview'].any { qualifier ->
selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
}
if (rejected) {
selection.reject('Release candidate')
}
}
static boolean isStable(String version) {
boolean result = ['alpha', 'beta', 'rc', 'cr', 'm', 'preview', 'snapshot'].any {
version ==~ /(?i).*[.-]$it[.\-\d]*/
}
return !result
}

tasks.named("dependencyUpdates").configure {
gradleReleaseChannel = 'current'
revision = 'integration'
rejectVersionIf {
!isStable(it.candidate.version) && isStable(it.currentVersion)
}
}
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.5.1</version>
<version>4.5.2</version>
</dependency>
```

Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
springBootVersion=2.0.0.RELEASE
lombokPluginVersion=6.3.0
testLoggerPluginVersion=3.1.0
versionsPluginVersion=0.41.0
versionsPluginVersion=0.42.0
# dependencies
bouncyCastleVersion=1.70
commonsCodecVersion=1.15
expiringMapVersion=0.5.10
jacksonVersion=2.13.1
jedisVersion=4.0.1
nimbusJwtVersion=9.16
openApiVersion=1.6.5
jedisVersion=4.1.1
nimbusJwtVersion=9.19
openApiVersion=1.6.6
spyMemcachedVersion=2.12.3
# test only (internal) dependencies
h2Version=1.4.200
jacocoVersion=0.8.7
jupiterVersion=5.8.2
mockitoVersion=4.3.0
mockitoVersion=4.3.1
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.5.1</version>
<version>4.5.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.5.1</version>
<version>4.5.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.5.1</version>
<version>4.5.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.5.1</version>
<version>4.5.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.5.1
4.5.2

0 comments on commit 74ee777

Please sign in to comment.