Merge branch 'release/5.0.1'

bratkartoffel · Nov 25, 2022 · dc461db · dc461db
2 parents 32b8728 + f6f3b24
commit dc461db
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 25 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,13 +10,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: '17'
           cache: 'gradle'
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ github.run_id }}
@@ -36,25 +36,25 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           repository: 'bratkartoffel/security-jwt-examples'
           ref: 'master'
           fetch-depth: 1
           lfs: true
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ github.run_id }}
           restore-keys: |
             ${{ runner.os }}-maven-${{ github.run_id }}
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
           java-version: '17'
           cache: 'gradle'
       - uses: niden/actions-memcached@v7
-      - uses: supercharge/redis-github-action@1.2.0
+      - uses: supercharge/redis-github-action@1.4.0
       - uses: gradle/wrapper-validation-action@v1
       - run: ./gradlew --no-daemon -PspringBootVersion=${{ matrix.springBootVersion }} check
       - run: ./gradlew --no-daemon -PspringBootVersion=${{ matrix.springBootVersion }} 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
@@ -3,6 +3,9 @@
 ### [unreleased]
 * no changes yet
 
+### [5.0.1] (2022-11-25)
+* (base) remove openapi dependency, just use the annotations (2.2.7)
+
 ### [5.0.0] (2022-11-24)
 * add support for spring boot 3 (breaking, _not_ backwards compatible)
 * require java 17 (as of spring boot 3)
@@ -170,7 +173,8 @@
 * Initial release to github and maven central
 
 
-[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/5.0.0...develop
+[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/5.0.1...develop
+[5.0.1]: https://github.com/bratkartoffel/security-jwt/compare/5.0.0...5.0.1
 [5.0.0]: https://github.com/bratkartoffel/security-jwt/compare/4.6.3...5.0.0
 [4.6.3]: https://github.com/bratkartoffel/security-jwt/compare/4.6.2...4.6.3
 [4.6.2]: https://github.com/bratkartoffel/security-jwt/compare/4.6.1...4.6.2

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.0</version>
+        <version>5.0.1</version>
     </dependency>
     <!-- or -->
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-base-spring-boot-starter</artifactId>
-        <version>5.0.0</version>
+        <version>5.0.1</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.0</version>
+        <version>5.0.1</version>
     </dependency>
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-memcache</artifactId>
-        <version>5.0.0</version>
+        <version>5.0.1</version>
     </dependency>
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-hibernate</artifactId>
-        <version>5.0.0</version>
+        <version>5.0.1</version>
     </dependency>
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-redis</artifactId>
-        <version>5.0.0</version>
+        <version>5.0.1</version>
     </dependency>
     <dependency>
         <groupId>eu.fraho.spring</groupId>
         <artifactId>security-jwt-files</artifactId>
-        <version>5.0.0</version>
+        <version>5.0.1</version>
     </dependency>
 </dependencies>
 ```

diff --git a/base/build.gradle b/base/build.gradle
@@ -4,9 +4,7 @@ dependencies {
     api group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jdk8", version: jacksonVersion
     api group: "com.nimbusds", name: "nimbus-jose-jwt", version: nimbusJwtVersion
     api group: "commons-codec", name: "commons-codec", version: commonsCodecVersion
-    api(group: "org.springdoc", name: "springdoc-openapi-common", version: openApiVersion) {
-        exclude(group: "org.springframework.boot")
-    }
+    api(group: "io.swagger.core.v3", name: "swagger-annotations-jakarta", version: openApiVersion)
 
     implementation group: "org.bouncycastle", name: "bcprov-jdk15on", version: bouncyCastleVersion
     testFixturesApi group: "org.bouncycastle", name: "bcprov-jdk15on", version: bouncyCastleVersion

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.0</version>
+    <version>5.0.1</version>
 </dependency>
 ```
 

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ expiringMapVersion=0.5.10
 jacksonVersion=2.14.1
 jedisVersion=4.3.1
 nimbusJwtVersion=9.25.6
-openApiVersion=1.6.13
+openApiVersion=2.2.7
 spyMemcachedVersion=2.12.3
 # test only (internal) dependencies
 h2Version=2.1.214

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.0</version>
+    <version>5.0.1</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.0</version>
+    <version>5.0.1</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.0</version>
+    <version>5.0.1</version>
 </dependency>
 ```
 

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.0</version>
+    <version>5.0.1</version>
 </dependency>
 ```
 

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-5.0.0
+5.0.1