From e723927de987e68bba4d29a05280982ddf04741d Mon Sep 17 00:00:00 2001 From: thomasmonext <48686647+thomasmonext@users.noreply.github.com> Date: Tue, 27 Feb 2024 18:25:07 +0100 Subject: [PATCH] - fix duplicate dependencies - enable deploy task --- Jenkinsfile | 18 +++++++++--------- pom.xml | 10 ++-------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f911668..00af2ec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,14 +47,14 @@ pipeline { } } -// stage('Deploy') { -// when { branch 'master' } -// steps { -// withCredentials([string(credentialsId: 'KEY_GPG_PASSPHRASE', variable: 'KEY_GPG_PASSPHRASE'), -// usernamePassword(credentialsId: 'OSSRH', usernameVariable: 'OSSRH_USER', passwordVariable: 'OSSRH_PWD')]) { -// sh 'mvn -Psign deploy' -// } -// } -// } + stage('Deploy') { + when { branch 'master' } + steps { + withCredentials([string(credentialsId: 'KEY_GPG_PASSPHRASE', variable: 'KEY_GPG_PASSPHRASE'), + usernamePassword(credentialsId: 'OSSRH', usernameVariable: 'OSSRH_USER', passwordVariable: 'OSSRH_PWD')]) { + sh 'mvn -Psign deploy' + } + } + } } } diff --git a/pom.xml b/pom.xml index b30347c..0495d7f 100644 --- a/pom.xml +++ b/pom.xml @@ -305,12 +305,12 @@ com.sun.xml.bind jaxb-impl - 2.3.0 + 2.3.0.1 com.sun.xml.bind jaxb-core - 2.3.0 + 2.3.0.1 javax.xml.bind @@ -332,12 +332,6 @@ jaxws-rt 2.3.7 - - - com.sun.xml.bind - jaxb-core - 2.3.0.1 -