From 6418db99da8fc8dfcfb8698ed770c3979b739652 Mon Sep 17 00:00:00 2001
From: Chad Redman <chad_redman@unc.edu>
Date: Wed, 16 Feb 2022 11:31:07 -0500
Subject: [PATCH] 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"
                     }
                 }
             }