Merge branch 'release/5.0.9'

bratkartoffel · Apr 29, 2024 · 6d9b155 · 6d9b155
2 parents bd34cae + 1bb3ece
commit 6d9b155
Show file tree

Hide file tree

Showing 19 changed files with 85 additions and 63 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -18,7 +18,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+      - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
         with:
           disable-sudo: true
           egress-policy: block
@@ -41,23 +41,23 @@ jobs:
             repo.maven.apache.org:443
             services.gradle.org:443
             uploader.codecov.io:443
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           lfs: true
-      - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'adopt'
           java-version: '17'
           cache: 'gradle'
-      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ github.run_id }}
       - uses: niden/actions-memcached@3b3ecd9d0d035ea92db716dc1540a7dbe9e56349 # v7
-      - uses: supercharge/redis-github-action@6dc7a5eeaf9a8f860b6464e05195a15f8b9f3bbb # v1.7.0
-      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
+      - uses: supercharge/redis-github-action@ea9b21c6ecece47bd99595c532e481390ea0f044 # v1.8.0
+      - uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
       - run: ./gradlew --no-daemon check publishToMavenLocal
-      - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+      - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - id: output_version
@@ -79,13 +79,14 @@ jobs:
       fail-fast: false
       matrix:
         springBootVersion:
-          - 3.0.12
-          - 3.1.5
-          - 3.2.0-RC2
+          - 3.0.13
+          - 3.1.11
+          - 3.2.5
+          - 3.3.0-RC1
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+      - uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
         with:
           disable-sudo: true
           egress-policy: block
@@ -106,25 +107,25 @@ jobs:
             repo.maven.apache.org:443
             repo.spring.io:443
             services.gradle.org:443
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           repository: 'bratkartoffel/security-jwt-examples'
           ref: 'master'
           fetch-depth: 1
           lfs: true
-      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ github.run_id }}
           restore-keys: |
             ${{ runner.os }}-maven-${{ github.run_id }}
-      - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'adopt'
           java-version: '17'
           cache: 'gradle'
       - uses: niden/actions-memcached@3b3ecd9d0d035ea92db716dc1540a7dbe9e56349 # v7
-      - uses: supercharge/redis-github-action@6dc7a5eeaf9a8f860b6464e05195a15f8b9f3bbb # v1.7.0
-      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
+      - uses: supercharge/redis-github-action@ea9b21c6ecece47bd99595c532e481390ea0f044 # v1.8.0
+      - uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
       - run: ./gradlew --no-daemon -PspringBootVersion=${{ matrix.springBootVersion }} -PsecurityJwtVersion=${{ needs.build.outputs.securityJwtVersion }} check
       - run: ./gradlew --no-daemon -PspringBootVersion=${{ matrix.springBootVersion }} -PsecurityJwtVersion=${{ needs.build.outputs.securityJwtVersion }} starter-hibernate:dependencies | egrep '(:spring|:security-jwt)' | grep -v -- '->' | sed -e 's/^[+-\\| ]\+//' -e 's/ ([n\*])$//' | sort | uniq
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,16 @@
-# Changelog
+# Chanegelog
 
 ### [unreleased]
-- no changes yet
+* no changes yet
+
+### [5.0.9] (2024-04-29)
+* (base) upgrade bouncycastle to 1.78.1
+* (base) upgrade nimbus-jose-jwt to 9.37.3
+* (base) upgrade commons-codec to 1.17.0
+* (base) upgrade swagger annotations to 2.2.21
+* (redis) upgrade jedis to 5.1.2
+* (memcache) fix memcache plugin with newer memcached versions
+  * The `lru_crawler` metadump seems to return more attributes now, handle this case
 
 ### [5.0.8] (2023-11-03)
 * (base) upgrade nimbus-jose-jwt to 9.37
@@ -237,7 +246,8 @@
 * Initial release to github and maven central
 
 
-[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/5.0.8...develop
+[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/5.0.9...develop
+[5.0.9]: https://github.com/bratkartoffel/security-jwt/compare/5.0.8...5.0.9
 [5.0.8]: https://github.com/bratkartoffel/security-jwt/compare/5.0.7...5.0.8
 [4.6.9]: https://github.com/bratkartoffel/security-jwt/compare/4.6.8...4.6.9
 [5.0.7]: https://github.com/bratkartoffel/security-jwt/compare/5.0.6...5.0.7

diff --git a/README.md b/README.md
@@ -49,13 +49,13 @@ should be sufficient for the most use cases.
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-base</artifactId>
-        <version>5.0.8</version>
+        <version>5.0.9</version>
     </dependency>
     <!-- or -->
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-base-spring-boot-starter</artifactId>
-        <version>5.0.8</version>
+        <version>5.0.9</version>
     </dependency>
 </dependencies>
 ```
@@ -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>5.0.8</version>
+        <version>5.0.9</version>
     </dependency>
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-memcache</artifactId>
-        <version>5.0.8</version>
+        <version>5.0.9</version>
     </dependency>
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-hibernate</artifactId>
-        <version>5.0.8</version>
+        <version>5.0.9</version>
     </dependency>
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-redis</artifactId>
-        <version>5.0.8</version>
+        <version>5.0.9</version>
     </dependency>
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-files</artifactId>
-        <version>5.0.8</version>
+        <version>5.0.9</version>
     </dependency>
 </dependencies>
 ```

diff --git a/base-spring-boot-starter/build.gradle b/base-spring-boot-starter/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
     api project(':base')
-    implementation group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.76"
+    implementation group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.78.1"
     testImplementation testFixtures(project(':base'))
 }
diff --git a/base/build.gradle b/base/build.gradle
@@ -1,14 +1,14 @@
 dependencies {
     api group: "org.springframework.boot", name: "spring-boot-starter-web", version: "3.0.0"
     api group: "org.springframework.boot", name: "spring-boot-starter-security", version: "3.0.0"
-    api group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jdk8", version: "2.15.3"
-    api group: "com.nimbusds", name: "nimbus-jose-jwt", version: "9.37"
-    api group: "commons-codec", name: "commons-codec", version: "1.16.0"
-    api(group: "io.swagger.core.v3", name: "swagger-annotations-jakarta", version: "2.2.18")
+    api group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jdk8", version: "2.17.0"
+    api group: "com.nimbusds", name: "nimbus-jose-jwt", version: "9.37.3"
+    api group: "commons-codec", name: "commons-codec", version: "1.17.0"
+    api(group: "io.swagger.core.v3", name: "swagger-annotations-jakarta", version: "2.2.21")
     api(group: "eu.fraho.libs", name: "libtotp", version: "1.1.0")
 
-    implementation group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.76"
-    testFixturesApi group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.76"
-    testImplementation group: "org.mockito", name: "mockito-core", version: "5.6.0"
-    testFixturesApi group: "org.mockito", name: "mockito-core", version: "5.6.0"
+    implementation group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.78.1"
+    testFixturesApi group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.78.1"
+    testImplementation group: "org.mockito", name: "mockito-core", version: "5.11.0"
+    testFixturesApi group: "org.mockito", name: "mockito-core", version: "5.11.0"
 }
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 plugins {
-    id 'io.freefair.lombok' version "8.4" apply false
+    id 'io.freefair.lombok' version "8.6" apply false
     id 'com.adarshr.test-logger' version "4.0.0" apply false
-    id 'com.github.ben-manes.versions' version "0.49.0"
-    id 'org.springframework.boot' version "3.1.5" apply false
+    id 'com.github.ben-manes.versions' version "0.51.0"
+    id 'org.springframework.boot' version "3.2.5" apply false
 }
 
 subprojects {
@@ -48,12 +48,12 @@ subprojects {
     }
 
     dependencies {
-        annotationProcessor group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: "3.1.5"
+        annotationProcessor group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: "3.2.5"
 
         testFixturesApi group: "org.springframework.boot", name: "spring-boot-starter-test", version: "3.0.0"
         testFixturesApi group: "org.springframework.boot", name: "spring-boot-starter-web", version: "3.0.0"
-        testFixturesApi group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jsr310", version: "2.15.3"
-        testFixturesApi group: 'org.junit.jupiter', name: 'junit-jupiter', version: "5.10.0"
+        testFixturesApi group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jsr310", version: "2.17.0"
+        testFixturesApi group: 'org.junit.jupiter', name: 'junit-jupiter', version: "5.10.2"
     }
 
     configurations.configureEach {

diff --git a/cicd/release.sh b/cicd/release.sh
@@ -16,7 +16,7 @@ git commit -m "Version updated from $current_version to version $release_version
 
 # update the changelog
 sed -i \
-  -e "/### \[unreleased/a - no changes yet\n\n### [$release_version] ($(date +%Y-%m-%d))" \
+  -e "/### \[unreleased/a * no changes yet\n\n### [$release_version] ($(date +%Y-%m-%d))" \
   -e "/^\[unreleased\]:/a [$release_version]: https://github.com/bratkartoffel/security-jwt/compare/${previous_version}...${release_version}" \
   -e "s|^\[unreleased\]:.\+develop$|[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/${release_version}...develop|" \
   CHANGELOG.md

diff --git a/files/README.md b/files/README.md
@@ -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>5.0.8</version>
+    <version>5.0.9</version>
 </dependency>
 ```
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/hibernate/README.md b/hibernate/README.md
@@ -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>5.0.8</version>
+    <version>5.0.9</version>
 </dependency>
 ```
 

diff --git a/internal/README.md b/internal/README.md
@@ -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>5.0.8</version>
+    <version>5.0.9</version>
 </dependency>
 ```
 

diff --git a/memcache/README.md b/memcache/README.md
@@ -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>5.0.8</version>
+    <version>5.0.9</version>
 </dependency>
 ```
 

diff --git a/memcache/src/main/java/eu/fraho/spring/securityJwt/memcache/dto/LruMetadumpEntry.java b/memcache/src/main/java/eu/fraho/spring/securityJwt/memcache/dto/LruMetadumpEntry.java
@@ -19,4 +19,5 @@ public class LruMetadumpEntry {
     Boolean fetch;
     Integer cls;
     Integer size;
+    Integer flags;
 }
diff --git a/...in/java/eu/fraho/spring/securityJwt/memcache/service/LruCrawlerMetadumpOperationImpl.java b/...in/java/eu/fraho/spring/securityJwt/memcache/service/LruCrawlerMetadumpOperationImpl.java
@@ -80,14 +80,15 @@ public void handleLine(String line) {
             return;
         }
 
-        String[] parts = line.split(" ", 7);
+        String[] parts = line.split(" ");
         String key = null;
         Integer exp = null;
         Integer la = null;
         Integer cas = null;
         Boolean fetch = null;
         Integer cls = null;
         Integer size = null;
+        Integer flags = null;
         for (String part : parts) {
             String[] kv = part.split("=", 2);
 
@@ -119,12 +120,21 @@ public void handleLine(String line) {
                 case "size":
                     size = Integer.parseInt(kv[1]);
                     break;
+                case "flags":
+                    flags = Integer.parseInt(kv[1]);
+                    break;
             }
         }
 
         cb.gotMetadump(LruMetadumpEntry.builder()
-                .key(key).exp(exp).la(la).cas(cas)
-                .fetch(fetch).cls(cls).size(size)
+                .key(key)
+                .exp(exp)
+                .la(la)
+                .cas(cas)
+                .fetch(fetch)
+                .cls(cls)
+                .size(size)
+                .flags(flags)
                 .build());
     }
 

diff --git a/redis/README.md b/redis/README.md
@@ -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>5.0.8</version>
+    <version>5.0.9</version>
 </dependency>
 ```
 

diff --git a/redis/build.gradle b/redis/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
     api project(':base')
-    api group: "redis.clients", name: "jedis", version: "5.0.2"
+    api group: "redis.clients", name: "jedis", version: "5.1.2"
 
     testImplementation testFixtures(project(':base'))
 }

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-5.0.8
+5.0.9