Merge branch '3.4.x' of github.com:freefair/okhttp-spring-boot into 3.5.x

Author: larsgrefer

.github/workflows/gradle-deploy.yml

@@ -12,7 +12,6 @@ jobs:
   deploy-docs:
     runs-on: ubuntu-latest
     env:
-      ORG_GRADLE_PROJECT_freefairBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
       ORG_GRADLE_PROJECT_freefairDocsUser: ${{ secrets.FREEFAIR_DOCS_USER }}
       ORG_GRADLE_PROJECT_freefairDocsPass: ${{ secrets.FREEFAIR_DOCS_PASS }}
     steps:
@@ -23,5 +22,5 @@ jobs:
           java-version: 17
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
       - run: ./gradlew uploadDocumentation -s

.github/workflows/gradle-publish.yml

@@ -7,8 +7,6 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    env:
-      ORG_GRADLE_PROJECT_freefairBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
     steps:
       - uses: actions/checkout@v5
       - name: Set up JDK 17
@@ -17,17 +15,17 @@ jobs:
           java-version: 17
           distribution: 'temurin'
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
       - name: Publish local
         run: ./gradlew publish
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.FREEFAIR_SIGNING_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.FREEFAIR_SIGNING_PASSWORD }}
       - name: Publish package
-        run: ./gradlew --no-parallel uploadDocumentation jreleaserFullRelease
+        run: ./gradlew --no-parallel uploadDocumentation jreleaserDeploy
         env:
           JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.MAVENCENTRAL_USERNAME }}
-          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.MAVENCENTRAL_PASSWORD }}
+          JRELEASER_MAVENCENTRAL_TOKEN: ${{ secrets.MAVENCENTRAL_PASSWORD }}
           JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ORG_GRADLE_PROJECT_freefairDocsUser: ${{ secrets.FREEFAIR_DOCS_USER }}
           ORG_GRADLE_PROJECT_freefairDocsPass: ${{ secrets.FREEFAIR_DOCS_PASS }}

.github/workflows/gradle.yml

@@ -11,8 +11,6 @@ jobs:
   build:
     name: build
     runs-on: ubuntu-latest
-    env:
-      ORG_GRADLE_PROJECT_freefairBuildCachePassword: ${{ secrets.BUILD_CACHE_PASSWORD }}
     strategy:
       fail-fast: false
       matrix:
@@ -27,7 +25,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - run: ./gradlew -V assemble -s
       - run: ./gradlew -V check -s

settings.gradle

@@ -20,17 +20,6 @@ develocity {
     }
 }
 
-buildCache {
-    remote(HttpBuildCache) {
-        url = 'https://build-cache.grefer-hosting.de/cache/'
-        push = isCiServer
-        credentials {
-            username = "freefair"
-            password = providers.gradleProperty('freefairBuildCachePassword').getOrElse(null)
-        }
-    }
-}
-
 dependencyResolutionManagement {
     repositories {
         mavenCentral()