More Maven Central updates

Author: hedgecrw

.github/workflows/build_snapshot.yml

@@ -45,16 +45,18 @@ jobs:
           gradle-version: 8.14.2
 
       - name: Build SNAPSHOT using Gradle
-        run: gradle build
+        run: gradle publish
         env:
           LIB_VERSION: ${{ steps.gitversion.outputs.version }}-SNAPSHOT
 
       - name: Publish SNAPSHOT using Gradle
-        run: gradle publish
+        run: gradle jreleaserDeploy
         env:
           LIB_VERSION: ${{ steps.gitversion.outputs.version }}-SNAPSHOT
           JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
           JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
+          JRELEASER_NEXUS2_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+          JRELEASER_NEXUS2_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
           JRELEASER_GPG_SECRET_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           JRELEASER_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 

.github/workflows/release_to_maven_central.yml

@@ -38,16 +38,18 @@ jobs:
           gradle-version: 8.14.2
 
       - name: Build library using Gradle
-        run: gradle build
+        run: gradle publish
         env:
           LIB_VERSION: ${{ steps.gitversion.outputs.version }}
 
       - name: Publish library using Gradle
-        run: gradle publish
+        run: gradle jreleaserDeploy
         env:
           LIB_VERSION: ${{ steps.gitversion.outputs.version }}
           JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
           JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
+          JRELEASER_NEXUS2_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+          JRELEASER_NEXUS2_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
           JRELEASER_GPG_SECRET_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           JRELEASER_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 

build.gradle

@@ -165,13 +165,7 @@ publishing {
 
   repositories {
     maven {
-      def releasesRepoUrl = layout.buildDirectory.dir('staging-deploy')
-      def snapshotsRepoUrl = "https://central.sonatype.com/repository/maven-snapshots/"
-      url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-      credentials {
-        username = project.findProperty("JRELEASER_MAVENCENTRAL_USERNAME") ?: System.getenv("JRELEASER_MAVENCENTRAL_USERNAME")
-        password = project.findProperty("JRELEASER_MAVENCENTRAL_PASSWORD") ?: System.getenv("JRELEASER_MAVENCENTRAL_PASSWORD")
-      }
+      url = layout.buildDirectory.dir('staging-deploy')
     }
   }
 }
@@ -188,11 +182,20 @@ jreleaser {
   deploy {
     maven {
       mavenCentral {
-        sonatype {
-          active = 'ALWAYS'
+        'release-deploy' {
+          active = 'RELEASE'
           url = 'https://central.sonatype.com/api/v1/publisher'
+          stagingRepository('build/staging-deploy')
+        }
+      }
+      nexus2 {
+        'snapshot-deploy' {
+          active = 'SNAPSHOT'
+          snapshotUrl = 'https://central.sonatype.com/repository/maven-snapshots/'
           applyMavenCentralRules = true
           snapshotSupported = true
+          closeRepository = true
+          releaseRepository = true
           stagingRepository('build/staging-deploy')
         }
       }