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

Author: larsgrefer

.github/workflows/gradle-publish.yml

@@ -18,14 +18,16 @@ jobs:
           distribution: 'temurin'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v3
-      - name: Publish package
-        run: ./gradlew --no-parallel publishToSonatype uploadDocumentation closeAndReleaseSonatypeStagingRepository
+      - name: Publish local
+        run: ./gradlew publish
         env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }}
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.FREEFAIR_SIGNING_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.FREEFAIR_SIGNING_PASSWORD }}
-          GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
-          GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
+      - name: Publish package
+        run: ./gradlew --no-parallel uploadDocumentation jreleaserFullRelease
+        env:
+          JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.MAVENCENTRAL_USERNAME }}
+          JRELEASER_MAVENCENTRAL_PASSWORD: ${{ 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 }}

build.gradle

@@ -2,11 +2,11 @@ import io.freefair.gradle.plugins.okhttp.tasks.UploadFile
 
 plugins {
     id "org.springframework.boot" version "4.0.0-M1" apply false
-    id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
     id "io.freefair.git-version"
     id "io.freefair.okhttp"
     id "io.freefair.maven-central.validate-poms" apply false
     id "io.freefair.aggregate-javadoc"
+    id 'org.jreleaser' version '1.19.0'
 }
 
 allprojects {
@@ -90,20 +90,19 @@ allprojects {
                     }
                 }
             }
+
+            repositories {
+                maven {
+                    name = "mavenCentralStaging"
+                    url = rootProject.layout.buildDirectory.dir('staging-deploy')
+                }
+            }
         }
     }
 }
 
 apply plugin: "maven-publish"
 
-nexusPublishing {
-    repositories {
-        sonatype {
-            stagingProfileId = '7e6204597a774f'
-        }
-    }
-}
-
 dependencies {
     javadoc project(":okhttp-spring-client")
     javadoc project(":okhttp-spring-boot-autoconfigure")
@@ -132,3 +131,45 @@ tasks.register('uploadDocumentation', UploadFile) {
 tasks.named('wrapper') {
     distributionType = Wrapper.DistributionType.BIN
 }
+
+jreleaser {
+    project {
+        license = 'MIT'
+        inceptionYear = '2016'
+    }
+    signing {
+        active = 'NEVER'
+    }
+    release {
+        github {
+            repoOwner = "freefair"
+            name = "okhttp-spring-boot"
+            tagName = "$version"
+            skipTag = true
+            overwrite = false
+            update {
+                enabled = true
+            }
+            releaseNotes {
+                enabled = false
+            }
+            changelog {
+                enabled = true
+            }
+        }
+    }
+    deploy {
+        maven {
+            mavenCentral {
+                sonatype {
+                    active = 'RELEASE'
+                    namespace = "io.freefair"
+                    url = 'https://central.sonatype.com/api/v1/publisher'
+                    sign = false //Already done by Gradle
+                    checksums = false //Already done by Gradle
+                    stagingRepository('build/staging-deploy')
+                }
+            }
+        }
+    }
+}