From fabb77b0f02a1b7e7b343cef3e8ba4a181662a72 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Tue, 17 Sep 2024 23:11:32 +0200 Subject: [PATCH] Fixing version from commandline --- Jenkinsfile | 2 +- build.gradle | 2 +- build_publish.gradle | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c958da0..1d26b51 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { } environment { - gradleParams = "--info -Pversion=1.0.${BUILD_NUMBER}" // --no-daemon + gradleParams = "--info -PreleaseVersion=1.0.${BUILD_NUMBER}" // --no-daemon } stages { diff --git a/build.gradle b/build.gradle index a449489..80c2758 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ dependencies { } group = 'se.koc' -version = project.hasProperty('version') ? project.property('version') : '1.0.0-SNAPSHOT' +version = project.hasProperty('releaseVersion') ? releaseVersion : '1.0.0-SNAPSHOT' sourceCompatibility = 1.8 targetCompatibility = 1.8 compileJava.options.encoding = 'UTF-8' diff --git a/build_publish.gradle b/build_publish.gradle index e9432c8..149877d 100644 --- a/build_publish.gradle +++ b/build_publish.gradle @@ -13,8 +13,8 @@ publishing { if (project.hasProperty('mavenCentralUsername') && project.hasProperty('mavenCentralPassword')) { credentials { - username project.property("mavenCentralUsername") as String - password project.property("mavenCentralPassword") as String + username mavenCentralUsername + password mavenCentralPassword } } }