From 4d58adc252c727cb03006153b61659a77cfe92fb Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Thu, 13 Jan 2022 00:38:41 -0500 Subject: [PATCH 01/32] Release 2.6.6 --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index cb3fe80..68beed5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,8 @@ def tag_pattern = /^(\d+\.\d+\.\w+)$/ def grouper_src_branch = "GROUPER_RELEASE_${git_tag}" node('docker') { + sh 'env | sort' + if (git_tag ==~ tag_pattern ) { stage("PgpImport") { withCredentials([file(credentialsId: 'grouper-pgp', variable: 'GPG_KEYS')]) { From 200ae9a408ea9841e00ecaba397f70179ba40e15 Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Thu, 13 Jan 2022 00:41:38 -0500 Subject: [PATCH 02/32] Fix grouper pgp credentialId --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68beed5..fd8ebc8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ node('docker') { if (git_tag ==~ tag_pattern ) { stage("PgpImport") { - withCredentials([file(credentialsId: 'grouper-pgp', variable: 'GPG_KEYS')]) { + withCredentials([file(credentialsId: 'grouper-sonatype-login', variable: 'GPG_KEYS')]) { sh 'gpg --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS' } } From a40d3e139e409ee5de5aa84da61746b339369070 Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Thu, 13 Jan 2022 00:55:23 -0500 Subject: [PATCH 03/32] Fix credentialId references --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fd8ebc8..990ab3c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,9 @@ def repo = 'git@github.com:Internet2/grouper.git' -def gpg_key = '1D3F3E9E30C7F312' def jdk_id = 'Corretto-JDK8' def maven_id = 'Maven-3.8.4' +def gpg_cred_id = 'grouper-gpg-key' +def sonatype_cred_id = 'grouper-sonatype-login' +def gpg_key = '1D3F3E9E30C7F312' def git_tag = env.TAG_NAME ?: env.BRANCH_NAME def tag_pattern = /^(\d+\.\d+\.\w+)$/ @@ -12,7 +14,7 @@ node('docker') { if (git_tag ==~ tag_pattern ) { stage("PgpImport") { - withCredentials([file(credentialsId: 'grouper-sonatype-login', variable: 'GPG_KEYS')]) { + withCredentials([file(credentialsId: gpg_cred_id, variable: 'GPG_KEYS')]) { sh 'gpg --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS' } } @@ -56,7 +58,7 @@ node('docker') { } stage('Release') { - withCredentials([usernamePassword(credentialsId: 'grouper-sonatype-login', usernameVariable: 'SONATYPE_USER', passwordVariable: 'SONATYPE_PWD')]) { + withCredentials([usernamePassword(credentialsId: sonatype_cred_id, usernameVariable: 'SONATYPE_USER', passwordVariable: 'SONATYPE_PWD')]) { withMaven( maven: maven_id, mavenSettingsFilePath: "travis/mvn.settings.xml", From 30ae97ac1f2d6f1629d559cc6c31a1c1344b5849 Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Thu, 13 Jan 2022 01:15:32 -0500 Subject: [PATCH 04/32] Adjust git checkout --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 990ab3c..0b439b5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -def repo = 'git@github.com:Internet2/grouper.git' +def repo = 'https://github.com/Internet2/grouper.git' def jdk_id = 'Corretto-JDK8' def maven_id = 'Maven-3.8.4' def gpg_cred_id = 'grouper-gpg-key' @@ -24,8 +24,9 @@ node('docker') { $class: 'GitSCM', branches: [[name: grouper_src_branch]], extensions: [ - [$class: 'LocalBranch'], [$class: 'WipeWorkspace'], - [$class: 'CloneOption', depth: 1, noTags: false, reference: '', shallow: true], + [$class: 'LocalBranch'], + [$class: 'WipeWorkspace'], + [$class: 'CloneOption', noTags: false, shallow: true], ], userRemoteConfigs: [[url: repo]] ] From 60f28c9b8ce3863a7fca1eb984e030454ea53049 Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Thu, 13 Jan 2022 01:39:06 -0500 Subject: [PATCH 05/32] WIP gpg fails if importing an existing key --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0b439b5..b3a0b0a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,12 +10,11 @@ def tag_pattern = /^(\d+\.\d+\.\w+)$/ def grouper_src_branch = "GROUPER_RELEASE_${git_tag}" node('docker') { - sh 'env | sort' if (git_tag ==~ tag_pattern ) { stage("PgpImport") { withCredentials([file(credentialsId: gpg_cred_id, variable: 'GPG_KEYS')]) { - sh 'gpg --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS' + sh 'gpg --merge --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS' } } From e9d618952090f2ad1d0156f06508a5ccf837c705 Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Thu, 13 Jan 2022 01:42:01 -0500 Subject: [PATCH 06/32] WIP gpg fails if importing an existing key --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b3a0b0a..9cc79e3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,8 @@ node('docker') { if (git_tag ==~ tag_pattern ) { stage("PgpImport") { withCredentials([file(credentialsId: gpg_cred_id, variable: 'GPG_KEYS')]) { - sh 'gpg --merge --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS' + sh 'gpg --version' + sh 'gpg --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS || true' } } From d2681a50af25de74415df0c296b5d71f3d2ca5dc Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Wed, 16 Feb 2022 09:56:29 -0500 Subject: [PATCH 08/32] Change gpg key to last 8 characters for older gpg compatibility --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9cc79e3..6f3a902 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ def jdk_id = 'Corretto-JDK8' def maven_id = 'Maven-3.8.4' def gpg_cred_id = 'grouper-gpg-key' def sonatype_cred_id = 'grouper-sonatype-login' -def gpg_key = '1D3F3E9E30C7F312' +def gpg_key = '30C7F312' def git_tag = env.TAG_NAME ?: env.BRANCH_NAME def tag_pattern = /^(\d+\.\d+\.\w+)$/ From 541e0b2a913c3aee6764453d95d63e0243788082 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 16 Feb 2022 10:43:54 -0500 Subject: [PATCH 09/32] debug java --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 6f3a902..2f86ca1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,8 @@ node('docker') { withCredentials([file(credentialsId: gpg_cred_id, variable: 'GPG_KEYS')]) { sh 'gpg --version' sh 'gpg --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS || true' + sh 'java --version' + sh 'ls /tmp' } } From 760c66fc48190dcf662de6962d1a9213bf1fe4a2 Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Wed, 16 Feb 2022 10:54:49 -0500 Subject: [PATCH 10/32] Update maven id to match server --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6f3a902..5d5b0d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ def repo = 'https://github.com/Internet2/grouper.git' def jdk_id = 'Corretto-JDK8' -def maven_id = 'Maven-3.8.4' +def maven_id = 'maven' def gpg_cred_id = 'grouper-gpg-key' def sonatype_cred_id = 'grouper-sonatype-login' def gpg_key = '30C7F312' From db32fb15e4dd7c43e9e540b113a36a9bf9dbb7db Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Wed, 16 Feb 2022 11:27:31 -0500 Subject: [PATCH 11/32] Set JAVA_HOME --- Jenkinsfile | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3803551..a79a576 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,6 @@ def repo = 'https://github.com/Internet2/grouper.git' def jdk_id = 'Corretto-JDK8' +def java_home = '/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64' def maven_id = 'maven' def gpg_cred_id = 'grouper-gpg-key' def sonatype_cred_id = 'grouper-sonatype-login' @@ -50,25 +51,31 @@ node('docker') { } stage('Build') { - withMaven( - maven: maven_id, - mavenSettingsFilePath: "travis/mvn.settings.xml", - mavenOpts: '-Xmx2048m', - jdk: jdk_id - ) { - sh "mvn -f grouper-parent clean compile package" - } - } - - stage('Release') { - withCredentials([usernamePassword(credentialsId: sonatype_cred_id, usernameVariable: 'SONATYPE_USER', passwordVariable: 'SONATYPE_PWD')]) { + withEnv(["JAVA_HOME=${java_home}"]) { withMaven( maven: maven_id, mavenSettingsFilePath: "travis/mvn.settings.xml", mavenOpts: '-Xmx2048m', jdk: jdk_id ) { - sh "mvn -f grouper-parent deploy -Prelease -Dgpg.keyname=$GPG_KEY" + sh "echo JAVA_HOME=$JAVA_HOME" + sh "mvn -f grouper-parent clean compile package" + } + } + } + + stage('Release') { + withCredentials([usernamePassword(credentialsId: sonatype_cred_id, usernameVariable: 'SONATYPE_USER', passwordVariable: 'SONATYPE_PWD')]) { + withEnv(["JAVA_HOME=${java_home}"]) { + withMaven( + maven: maven_id, + mavenSettingsFilePath: "travis/mvn.settings.xml", + mavenOpts: '-Xmx2048m', + jdk: jdk_id + ) { + sh "echo JAVA_HOME=$JAVA_HOME" + sh "mvn -f grouper-parent deploy -Prelease -Dgpg.keyname=$GPG_KEY" + } } } } From 6418db99da8fc8dfcfb8698ed770c3979b739652 Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Wed, 16 Feb 2022 11:31:07 -0500 Subject: [PATCH 12/32] Set JAVA_HOME (commit 2) --- Jenkinsfile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a79a576..97679b2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,25 +40,27 @@ node('docker') { def grouper_version = (git_tag =~ tag_pattern)[0][1] println "Extracted grouper version '${grouper_version}' from input '${git_tag}'" - - withMaven( - maven: maven_id, - mavenSettingsFilePath: "travis/mvn.settings.xml", - jdk: jdk_id - ) { - sh "mvn -f grouper-parent versions:set -DnewVersion=${grouper_version}" + withEnv(["JAVA_HOME=${java_home}"]) { + sh "echo JAVA_HOME=$JAVA_HOME" + withMaven( + maven: maven_id, + mavenSettingsFilePath: "travis/mvn.settings.xml", + jdk: jdk_id + ) { + sh "mvn -f grouper-parent versions:set -DnewVersion=${grouper_version}" + } } } stage('Build') { withEnv(["JAVA_HOME=${java_home}"]) { + sh "echo JAVA_HOME=$JAVA_HOME" withMaven( maven: maven_id, mavenSettingsFilePath: "travis/mvn.settings.xml", mavenOpts: '-Xmx2048m', jdk: jdk_id ) { - sh "echo JAVA_HOME=$JAVA_HOME" sh "mvn -f grouper-parent clean compile package" } } @@ -67,14 +69,14 @@ node('docker') { stage('Release') { withCredentials([usernamePassword(credentialsId: sonatype_cred_id, usernameVariable: 'SONATYPE_USER', passwordVariable: 'SONATYPE_PWD')]) { withEnv(["JAVA_HOME=${java_home}"]) { - withMaven( + sh "echo JAVA_HOME=$JAVA_HOME" + withMaven( maven: maven_id, mavenSettingsFilePath: "travis/mvn.settings.xml", mavenOpts: '-Xmx2048m', jdk: jdk_id ) { - sh "echo JAVA_HOME=$JAVA_HOME" - sh "mvn -f grouper-parent deploy -Prelease -Dgpg.keyname=$GPG_KEY" + sh "mvn -f grouper-parent deploy -Prelease -Dgpg.keyname=$GPG_KEY" } } } From 7fd9dc3fc52ad3fc201f6a21f985ef517e5e77f8 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 16 Feb 2022 11:39:21 -0500 Subject: [PATCH 13/32] java_home try 3 --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 97679b2..1779562 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,9 @@ node('docker') { sh 'ls /tmp' } } - + environment { + JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 + } stage("Checkout") { checkout_result = checkout([ $class: 'GitSCM', From 60dd7a73c76cfbcd161fd00232e5f32715f27f80 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 16 Feb 2022 11:40:26 -0500 Subject: [PATCH 14/32] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1779562..357b6bf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ node('docker') { } } environment { - JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 + JAVA_HOME='/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64' } stage("Checkout") { checkout_result = checkout([ From 9d478f2bf4f4926a423fbecda0673146ea58bab3 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 16 Feb 2022 11:44:17 -0500 Subject: [PATCH 15/32] Update Jenkinsfile --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 357b6bf..493e479 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,17 +13,17 @@ def grouper_src_branch = "GROUPER_RELEASE_${git_tag}" node('docker') { if (git_tag ==~ tag_pattern ) { + environment { + JAVA_HOME='/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64' + } stage("PgpImport") { withCredentials([file(credentialsId: gpg_cred_id, variable: 'GPG_KEYS')]) { sh 'gpg --version' sh 'gpg --keyring=pubring.gpg --no-default-keyring --import $GPG_KEYS || true' + sh 'echo $JAVA_HOME' sh 'java --version' - sh 'ls /tmp' } } - environment { - JAVA_HOME='/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64' - } stage("Checkout") { checkout_result = checkout([ $class: 'GitSCM', From 957f3b702131798ddfa3b48090e494bc19af4e38 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 16 Feb 2022 11:49:07 -0500 Subject: [PATCH 16/32] Update Jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 493e479..72d0058 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,7 @@ def grouper_src_branch = "GROUPER_RELEASE_${git_tag}" node('docker') { +pipeline { if (git_tag ==~ tag_pattern ) { environment { JAVA_HOME='/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64' @@ -88,3 +89,4 @@ node('docker') { error "Aborting build since tag doesn't match pattern '${tag_pattern}'" } } +} From 5b6321b6609e43b1a8eac5be1aac702d277f5868 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 16 Feb 2022 11:49:58 -0500 Subject: [PATCH 17/32] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 72d0058..4451d90 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ def grouper_src_branch = "GROUPER_RELEASE_${git_tag}" node('docker') { -pipeline { + if (git_tag ==~ tag_pattern ) { environment { JAVA_HOME='/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64' @@ -89,4 +89,4 @@ pipeline { error "Aborting build since tag doesn't match pattern '${tag_pattern}'" } } -} + From 570f08862054619f5989f7756edfda81c52775b0 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 16 Feb 2022 14:41:42 -0500 Subject: [PATCH 18/32] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4451d90..2dbd54c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,7 +50,7 @@ node('docker') { mavenSettingsFilePath: "travis/mvn.settings.xml", jdk: jdk_id ) { - sh "mvn -f grouper-parent versions:set -DnewVersion=${grouper_version}" + sh "JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 mvn -f grouper-parent versions:set -DnewVersion=${grouper_version}" } } } From 3f59ce52d022fd61f5e6d56e76d03730b1960a33 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 16 Feb 2022 14:55:46 -0500 Subject: [PATCH 19/32] JAVA_HOME workaround for maven --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2dbd54c..7bf4328 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -64,7 +64,7 @@ node('docker') { mavenOpts: '-Xmx2048m', jdk: jdk_id ) { - sh "mvn -f grouper-parent clean compile package" + sh "JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 mvn -f grouper-parent clean compile package" } } } @@ -79,7 +79,7 @@ node('docker') { mavenOpts: '-Xmx2048m', jdk: jdk_id ) { - sh "mvn -f grouper-parent deploy -Prelease -Dgpg.keyname=$GPG_KEY" + sh "JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 mvn -f grouper-parent deploy -Prelease -Dgpg.keyname=$GPG_KEY" } } } From c12df30a8a060a38e7bfc6457feca7ba1c4d89dc Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Wed, 16 Feb 2022 15:06:26 -0500 Subject: [PATCH 20/32] Syntax error in GPG_KEY variable --- Jenkinsfile | 52 ++++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7bf4328..8fb9fc5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,11 +11,10 @@ def tag_pattern = /^(\d+\.\d+\.\w+)$/ def grouper_src_branch = "GROUPER_RELEASE_${git_tag}" node('docker') { - if (git_tag ==~ tag_pattern ) { environment { - JAVA_HOME='/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64' + JAVA_HOME=java_home } stage("PgpImport") { withCredentials([file(credentialsId: gpg_cred_id, variable: 'GPG_KEYS')]) { @@ -43,45 +42,39 @@ node('docker') { def grouper_version = (git_tag =~ tag_pattern)[0][1] println "Extracted grouper version '${grouper_version}' from input '${git_tag}'" - withEnv(["JAVA_HOME=${java_home}"]) { - sh "echo JAVA_HOME=$JAVA_HOME" - withMaven( - maven: maven_id, - mavenSettingsFilePath: "travis/mvn.settings.xml", - jdk: jdk_id - ) { - sh "JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 mvn -f grouper-parent versions:set -DnewVersion=${grouper_version}" - } + sh "echo JAVA_HOME=$JAVA_HOME" + withMaven( + maven: maven_id, + mavenSettingsFilePath: "travis/mvn.settings.xml", + jdk: jdk_id + ) { + sh "JAVA_HOME=${java_home} mvn -f grouper-parent versions:set -DnewVersion=${grouper_version}" } } stage('Build') { - withEnv(["JAVA_HOME=${java_home}"]) { - sh "echo JAVA_HOME=$JAVA_HOME" - withMaven( - maven: maven_id, - mavenSettingsFilePath: "travis/mvn.settings.xml", - mavenOpts: '-Xmx2048m', - jdk: jdk_id - ) { - sh "JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 mvn -f grouper-parent clean compile package" - } + sh "echo JAVA_HOME=$JAVA_HOME" + withMaven( + maven: maven_id, + mavenSettingsFilePath: "travis/mvn.settings.xml", + mavenOpts: '-Xmx2048m', + jdk: jdk_id + ) { + sh "JAVA_HOME=${java_home} mvn -f grouper-parent clean compile package" } } stage('Release') { withCredentials([usernamePassword(credentialsId: sonatype_cred_id, usernameVariable: 'SONATYPE_USER', passwordVariable: 'SONATYPE_PWD')]) { - withEnv(["JAVA_HOME=${java_home}"]) { sh "echo JAVA_HOME=$JAVA_HOME" withMaven( - maven: maven_id, - mavenSettingsFilePath: "travis/mvn.settings.xml", - mavenOpts: '-Xmx2048m', - jdk: jdk_id - ) { - sh "JAVA_HOME=/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64 mvn -f grouper-parent deploy -Prelease -Dgpg.keyname=$GPG_KEY" + maven: maven_id, + mavenSettingsFilePath: "travis/mvn.settings.xml", + mavenOpts: '-Xmx2048m', + jdk: jdk_id + ) { + sh "JAVA_HOME=${java_home} mvn -f grouper-parent deploy -Prelease -Dgpg.keyname='${gpg_key}'" } - } } } } else { @@ -89,4 +82,3 @@ node('docker') { error "Aborting build since tag doesn't match pattern '${tag_pattern}'" } } - From 3bc4418a699ff1ed34000ce9aba909490eca14f3 Mon Sep 17 00:00:00 2001 From: Chad Redman Date: Wed, 16 Feb 2022 15:11:13 -0500 Subject: [PATCH 21/32] Fix syntax --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8fb9fc5..7aa5042 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,7 @@ node('docker') { def grouper_version = (git_tag =~ tag_pattern)[0][1] println "Extracted grouper version '${grouper_version}' from input '${git_tag}'" - sh "echo JAVA_HOME=$JAVA_HOME" + sh 'echo JAVA_HOME=$JAVA_HOME' withMaven( maven: maven_id, mavenSettingsFilePath: "travis/mvn.settings.xml", @@ -53,7 +53,7 @@ node('docker') { } stage('Build') { - sh "echo JAVA_HOME=$JAVA_HOME" + sh 'echo JAVA_HOME=$JAVA_HOME' withMaven( maven: maven_id, mavenSettingsFilePath: "travis/mvn.settings.xml", @@ -66,7 +66,7 @@ node('docker') { stage('Release') { withCredentials([usernamePassword(credentialsId: sonatype_cred_id, usernameVariable: 'SONATYPE_USER', passwordVariable: 'SONATYPE_PWD')]) { - sh "echo JAVA_HOME=$JAVA_HOME" + sh 'echo JAVA_HOME=$JAVA_HOME' withMaven( maven: maven_id, mavenSettingsFilePath: "travis/mvn.settings.xml", From 1742da613c1b51c72b155e39c53cddf64d747041 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Fri, 18 Feb 2022 03:32:03 -0500 Subject: [PATCH 22/32] 2.6.7 --- temp.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 temp.txt diff --git a/temp.txt b/temp.txt new file mode 100644 index 0000000..ba5c9fc --- /dev/null +++ b/temp.txt @@ -0,0 +1 @@ +2.6.7 \ No newline at end of file From e1acf1343b27fdfd9cc2cc938f2ca80ce0f3bd59 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Wed, 2 Mar 2022 04:24:09 -0500 Subject: [PATCH 23/32] 2.6.8 --- temp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/temp.txt b/temp.txt index ba5c9fc..43238c7 100644 --- a/temp.txt +++ b/temp.txt @@ -1 +1 @@ -2.6.7 \ No newline at end of file +2.6.8 release \ No newline at end of file From ac1f8f91271ca44f4f4d69d58e6a6186be9253d3 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Tue, 7 Jun 2022 02:00:52 -0400 Subject: [PATCH 24/32] 2.6.9 --- temp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/temp.txt b/temp.txt index 43238c7..6362104 100644 --- a/temp.txt +++ b/temp.txt @@ -1 +1 @@ -2.6.8 release \ No newline at end of file +2.6.9 release \ No newline at end of file From cd7aa90e8ae57d7f0a4c5fc15fb80eb8c7ea9f18 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Tue, 7 Jun 2022 02:10:19 -0400 Subject: [PATCH 25/32] java version --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7aa5042..d932f6d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ def repo = 'https://github.com/Internet2/grouper.git' def jdk_id = 'Corretto-JDK8' -def java_home = '/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.322.06.2-linux-x64' +def java_home = '/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.332.08.1-linux-x64' def maven_id = 'maven' def gpg_cred_id = 'grouper-gpg-key' def sonatype_cred_id = 'grouper-sonatype-login' From bf4d9ff1f0bc34a505c9eae9a2858356fa59cdca Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Wed, 20 Jul 2022 02:55:58 -0400 Subject: [PATCH 26/32] 2.6.10 --- .project | 11 +++++++++++ Jenkinsfile | 2 +- temp.txt | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .project diff --git a/.project b/.project new file mode 100644 index 0000000..c74f60d --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + grouper_build_v2_6 + + + + + + + + diff --git a/Jenkinsfile b/Jenkinsfile index d932f6d..3f501f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ def repo = 'https://github.com/Internet2/grouper.git' def jdk_id = 'Corretto-JDK8' -def java_home = '/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.332.08.1-linux-x64' +def java_home = '/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.342.07.1-linux-x64' def maven_id = 'maven' def gpg_cred_id = 'grouper-gpg-key' def sonatype_cred_id = 'grouper-sonatype-login' diff --git a/temp.txt b/temp.txt index 6362104..571b7af 100644 --- a/temp.txt +++ b/temp.txt @@ -1 +1 @@ -2.6.9 release \ No newline at end of file +2.6.10 release \ No newline at end of file From 707babba0f64a03a760850e718b0a4d11cf9f114 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Tue, 26 Jul 2022 12:52:21 -0400 Subject: [PATCH 27/32] 2.6.11 --- Jenkinsfile | 2 +- temp.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3f501f5..7e4b1cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ def repo = 'https://github.com/Internet2/grouper.git' def jdk_id = 'Corretto-JDK8' -def java_home = '/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.342.07.1-linux-x64' +def java_home = '/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.342.07.3-linux-x64' def maven_id = 'maven' def gpg_cred_id = 'grouper-gpg-key' def sonatype_cred_id = 'grouper-sonatype-login' diff --git a/temp.txt b/temp.txt index 571b7af..de6f186 100644 --- a/temp.txt +++ b/temp.txt @@ -1 +1 @@ -2.6.10 release \ No newline at end of file +2.6.11 release \ No newline at end of file From 5fe33213b04041c90f82eb530091f7c2e3f4ce02 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Tue, 26 Jul 2022 15:42:41 -0400 Subject: [PATCH 28/32] release --- temp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/temp.txt b/temp.txt index de6f186..c8e8216 100644 --- a/temp.txt +++ b/temp.txt @@ -1 +1 @@ -2.6.11 release \ No newline at end of file +2.6.12 release \ No newline at end of file From 919f97fb368e36b0ec186063a528950248d5b277 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Wed, 27 Jul 2022 11:07:22 -0400 Subject: [PATCH 29/32] 2.6.13 --- temp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/temp.txt b/temp.txt index c8e8216..cb1537c 100644 --- a/temp.txt +++ b/temp.txt @@ -1 +1 @@ -2.6.12 release \ No newline at end of file +2.6.13 release \ No newline at end of file From 4ddedf56db56406824cb3c853c0cdf97c990b001 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Wed, 10 Aug 2022 15:17:13 -0400 Subject: [PATCH 30/32] build 2.6.14 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7e4b1cd..5e1139f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ def repo = 'https://github.com/Internet2/grouper.git' def jdk_id = 'Corretto-JDK8' -def java_home = '/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.342.07.3-linux-x64' +def java_home = '/home/centos/agent/tools/hudson.model.JDK/Corretto-JDK8/amazon-corretto-8.342.07.4-linux-x64' def maven_id = 'maven' def gpg_cred_id = 'grouper-gpg-key' def sonatype_cred_id = 'grouper-sonatype-login' From 60becf0e9af62a14e2f7c55785662fb9c5cc3482 Mon Sep 17 00:00:00 2001 From: Chris Hyzer Date: Mon, 15 Aug 2022 11:39:09 -0400 Subject: [PATCH 31/32] build --- temp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/temp.txt b/temp.txt index cb1537c..41b633d 100644 --- a/temp.txt +++ b/temp.txt @@ -1 +1 @@ -2.6.13 release \ No newline at end of file +2.6.15 release \ No newline at end of file From 05e48d8c88b648bf71c9a8d2aa73c52b7c3e2845 Mon Sep 17 00:00:00 2001 From: mchyzer Date: Wed, 21 Sep 2022 23:15:47 -0400 Subject: [PATCH 32/32] 2.6.16 --- .gitignore | 1 + temp.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d8fe4fa --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.project diff --git a/temp.txt b/temp.txt index 41b633d..56f9567 100644 --- a/temp.txt +++ b/temp.txt @@ -1 +1 @@ -2.6.15 release \ No newline at end of file +2.6.16 release \ No newline at end of file