From 6f916edc2038522e0e9c9c23659b76db9a2e269d Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 20 Sep 2024 00:31:04 +0200
Subject: [PATCH] Fixing nexus upload issue

---
 Jenkinsfile          |  5 ++++-
 build.gradle         |  4 ++++
 build_publish.gradle | 27 +++++++++++----------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7b43043..c572531 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,10 @@ pipeline {
                     configFileProvider([configFile(fileId: '70cb2022-0bc2-4b25-98a4-e1526dbf2735', variable: 'GRADLE_PROPERTIES')]) {
                         sh './gradlew ${gradleParams} publishToMavenLocal'
 
-                        sh './gradlew ${gradleParams} -Prelease -PcustomProperties=${GRADLE_PROPERTIES} publish'
+                        sh './gradlew ${gradleParams} -Prelease -PcustomProperties=${GRADLE_PROPERTIES} ' +
+                            'publishToSonatype ' +
+                                //'closeAndReleaseSonatypeStagingRepository'
+                                'closeSonatypeStagingRepository'
                     }
                 }
             }
diff --git a/build.gradle b/build.gradle
index 71abd1d..90fd935 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,10 @@
 plugins {
     id 'java-library'
     id 'jacoco'
+
+    id 'maven-publish'
+    id 'signing'
+    id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 }
 
 // Load custom properties
diff --git a/build_publish.gradle b/build_publish.gradle
index 722079e..01fafb0 100644
--- a/build_publish.gradle
+++ b/build_publish.gradle
@@ -1,25 +1,21 @@
 // Documentation: https://jreleaser.org/guide/latest/examples/maven/maven-central.html#_gradle
 
-apply plugin: 'maven-publish'
-apply plugin: 'signing'
-
-publishing {
+nexusPublishing {
     repositories {
-        maven {
-            def snapshotsRepoUrl = 'http://oss.sonatype.org/content/repositories/snapshots/'
-            def releaseRepoUrl =   'http://oss.sonatype.org/service/local/staging/deploy/maven2/'
-            url = project.hasProperty('release') ? releaseRepoUrl : snapshotsRepoUrl
+        sonatype {
+            //nexusUrl.set(uri("https://oss.sonatype.org/service/local/"))
+            //snapshotRepositoryUrl.set(uri("https://oss.sonatype.org/content/repositories/snapshots/"))
 
-            credentials {
-                def repositoryUsername = project.hasProperty('mavenCentralUsername') ? mavenCentralUsername : "unknown"
-                project.logger.info("Setting Maven Central Credentials: ${repositoryUsername}")
+            def repositoryUsername = project.hasProperty('mavenCentralUsername') ? mavenCentralUsername : "unknown"
+            project.logger.info("Setting Maven Central Credentials: ${repositoryUsername}")
 
-                username(repositoryUsername)
-                password( project.hasProperty('mavenCentralPassword') ? mavenCentralPassword : "unknown")
-            }
+            username = repositoryUsername
+            password = project.hasProperty('mavenCentralPassword') ? mavenCentralPassword : "unknown"
         }
     }
+}
 
+publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
@@ -55,8 +51,7 @@ publishing {
 
 signing {
     required { hasProperty("signing.secretKeyRingFile") }
-    //sign publishing.publications.mavenJava
-    sign configurations.archives
+    sign publishing.publications.mavenJava
 }
 
 // Generate version.txt