Merge branch 'release/5.0.6'

.github/workflows/build.yaml

@@ -18,7 +18,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+      - uses: step-security/harden-runner@55d479fb1c5bcad5a4f9099a5d9f37c8857b2845 # v2.4.1
         with:
           disable-sudo: true
           egress-policy: block
@@ -40,7 +40,7 @@ jobs:
             repo.maven.apache.org:443
             services.gradle.org:443
             uploader.codecov.io:443
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
         with:
           lfs: true
       - uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
@@ -56,7 +56,7 @@ jobs:
       - uses: supercharge/redis-github-action@f63fe516254d0af5df91755a4488274c2e71e38c # v1.5.0
       - uses: gradle/wrapper-validation-action@8d49e559aae34d3e0eb16cde532684bc9702762b # v1.0.6
       - run: ./gradlew --no-daemon check publishToMavenLocal
-      - uses: codecov/codecov-action@894ff025c7b54547a9a2a1e9f228beae737ad3c2 # v3.1.3
+      - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - id: output_version
@@ -77,12 +77,12 @@ jobs:
     strategy:
       matrix:
         springBootVersion:
-          - 3.0.7
-          - 3.1.0
+          - 3.0.8
+          - 3.1.1
     runs-on: ubuntu-latest
     needs: build
     steps:
-      - uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+      - uses: step-security/harden-runner@55d479fb1c5bcad5a4f9099a5d9f37c8857b2845 # v2.4.1
         with:
           disable-sudo: true
           egress-policy: block
@@ -107,7 +107,7 @@ jobs:
             services.gradle.org:443
             storage.googleapis.com:443
             uploader.codecov.io:443
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
         with:
           repository: 'bratkartoffel/security-jwt-examples'
           ref: 'master'

CHANGELOG.md

@@ -3,6 +3,9 @@
 ### [unreleased]
 * no changes yet
 
+### [5.0.6] (2023-07-17)
+* (all) fix invalid generated pom files with self-referential dependencies
+
 ### [5.0.5] (2023-05-19)
 * (base) upgrade openapi dependency to 2.2.10
 * (base) upgrade jackson to 2.15.1
@@ -207,7 +210,8 @@
 * Initial release to github and maven central
 
 
-[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/5.0.5...develop
+[unreleased]: https://github.com/bratkartoffel/security-jwt/compare/5.0.6...develop
+[5.0.6]: https://github.com/bratkartoffel/security-jwt/compare/5.0.5...5.0.6
 [5.0.5]: https://github.com/bratkartoffel/security-jwt/compare/5.0.4...5.0.5
 [4.6.7]: https://github.com/bratkartoffel/security-jwt/compare/4.6.6...4.6.7
 [5.0.4]: https://github.com/bratkartoffel/security-jwt/compare/5.0.3...5.0.4

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

base-spring-boot-starter/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
     api project(':base')
-    implementation group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.73"
+    implementation group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.75"
     testImplementation testFixtures(project(':base'))
 }

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.1"
+    api group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jdk8", version: "2.15.2"
     api group: "com.nimbusds", name: "nimbus-jose-jwt", version: "9.31"
-    api group: "commons-codec", name: "commons-codec", version: "1.15"
-    api(group: "io.swagger.core.v3", name: "swagger-annotations-jakarta", version: "2.2.10")
-    api(group: "eu.fraho.libs", name: "libtotp", version: "1.0.0")
+    api group: "commons-codec", name: "commons-codec", version: "1.16.0"
+    api(group: "io.swagger.core.v3", name: "swagger-annotations-jakarta", version: "2.2.15")
+    api(group: "eu.fraho.libs", name: "libtotp", version: "1.1.0")
 
-    implementation group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.73"
-    testFixturesApi group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.73"
-    testImplementation group: "org.mockito", name: "mockito-core", version: "5.3.1"
-    testFixturesApi group: "org.mockito", name: "mockito-core", version: "5.3.1"
+    implementation group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.75"
+    testFixturesApi group: "org.bouncycastle", name: "bcprov-jdk18on", version: "1.75"
+    testImplementation group: "org.mockito", name: "mockito-core", version: "5.4.0"
+    testFixturesApi group: "org.mockito", name: "mockito-core", version: "5.4.0"
 }

build.gradle

@@ -1,8 +1,8 @@
 plugins {
-    id 'io.freefair.lombok' version "8.0.1" apply false
+    id 'io.freefair.lombok' version "8.1.0" apply false
     id 'com.adarshr.test-logger' version "3.2.0" apply false
-    id 'com.github.ben-manes.versions' version "0.46.0"
-    id 'org.springframework.boot' version "3.1.0" apply false
+    id 'com.github.ben-manes.versions' version "0.47.0"
+    id 'org.springframework.boot' version "3.1.1" apply false
 }
 
 subprojects {
@@ -48,11 +48,11 @@ subprojects {
     }
 
     dependencies {
-        annotationProcessor group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: "3.1.0"
+        annotationProcessor group: "org.springframework.boot", name: "spring-boot-configuration-processor", version: "3.1.1"
 
         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.1"
+        testFixturesApi group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jsr310", version: "2.15.2"
         testFixturesApi group: 'org.junit.jupiter', name: 'junit-jupiter', version: "5.9.3"
     }
 
@@ -110,6 +110,16 @@ subprojects {
                             email = '[email protected]'
                         }
                     }
+                    // workaround
+                    // https://stackoverflow.com/questions/69877418/why-does-every-pom-file-published-by-gradle-has-a-self-referential-dependency
+                    // https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/365
+                    withXml {
+                        asNode().dependencies.dependency.each { dep ->
+                            if(dep["artifactId"].last().value().last() == artifactId) {
+                                assert dep.parent().remove(dep)
+                            }
+                        }
+                    }
                 }
             }
         }

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.5</version>
+    <version>5.0.6</version>
 </dependency>
 ```
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

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.5</version>
+    <version>5.0.6</version>
 </dependency>
 ```
 

hibernate/build.gradle

@@ -3,5 +3,5 @@ dependencies {
     api group: "org.springframework.boot", name: "spring-boot-starter-data-jpa", version: "3.0.0"
 
     testImplementation testFixtures(project(':base'))
-    testImplementation group: "com.h2database", name: "h2", version: "2.1.214"
+    testImplementation group: "com.h2database", name: "h2", version: "2.2.220"
 }

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.5</version>
+    <version>5.0.6</version>
 </dependency>
 ```
 

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.5</version>
+    <version>5.0.6</version>
 </dependency>
 ```
 

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.5</version>
+    <version>5.0.6</version>
 </dependency>
 ```
 

redis/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
     api project(':base')
-    api group: "redis.clients", name: "jedis", version: "4.4.1"
+    api group: "redis.clients", name: "jedis", version: "4.4.3"
 
     testImplementation testFixtures(project(':base'))
 }

version.txt

@@ -1 +1 @@
-5.0.5
+5.0.6