From 36568915c80f68a35f403820b9323042d4e05017 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Tue, 10 Sep 2024 23:52:35 +0200
Subject: [PATCH] bugfix

---
 Jenkinsfile          | 11 +++++++++--
 build_publish.gradle |  6 ++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 92b3ef5..c44b0f4 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ node {
         checkout scm
     }
 
-    withMaven(mavenConfiguration) {
+    withGradle {
         def gradleParams = "--no-daemon -Pversion=1.0.${BUILD_NUMBER}"
 
         stage('Build') {
@@ -26,8 +26,15 @@ node {
         }
 
         stage('Deploy') {
+            withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId:'gpg_key', usernameVariable: 'KEY_ID', passwordVariable: 'KEY_PASSWORD']]) {
+                sh "./gradlew ${gradleParams} -Psigning.homeDir=/var/jenkins_home/.gnupg_ci -psigning.keyId=${KEY_ID} -Psigning.password=${KEY_PASSWORD} sign"
+            }
+
             sh "./gradlew ${gradleParams} publishToMavenLocal"
-            sh "./gradlew ${gradleParams} -Prelease publish"
+
+            withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId:'36795fd4-6f0a-491b-b869-b26ec9c06996', usernameVariable: 'SONATYPE_NEXUS_USERNAME', passwordVariable: 'SONATYPE_NEXUS_PASSWORD']]) {
+                sh "./gradlew ${gradleParams} -PSONATYPE_NEXUS_USERNAME=${SONATYPE_NEXUS_USERNAME} -PSONATYPE_NEXUS_PASSWORD=${SONATYPE_NEXUS_PASSWORD}  -Prelease publish"
+            }
 
             sh "mvn ${mvnParams} scm:tag"
         }
diff --git a/build_publish.gradle b/build_publish.gradle
index c04f371..1eb16d5 100644
--- a/build_publish.gradle
+++ b/build_publish.gradle
@@ -10,6 +10,11 @@ publishing {
             def snapshotsRepoUrl = 'http://oss.sonatype.org/content/repositories/snapshots/'
             def releasesRepoUrl = 'http://oss.sonatype.org/service/local/staging/deploy/maven2/'
             url = project.hasProperty('release') && !version.endsWith('SNAPSHOT') ? releasesRepoUrl : snapshotsRepoUrl
+
+            credentials {
+                username System.getenv('SONATYPE_NEXUS_USERNAME')
+                password System.getenv('SONATYPE_NEXUS_PASSWORD')
+            }
         }
     }
 
@@ -49,6 +54,7 @@ publishing {
 // Signing
 
 signing {
+    useGpgCmd()
     sign publishing.publications.mavenJava
 }