add warnings for subprocess execution in Java version switch scripts and update script syntax for consistency

Author: BraisVQ

be-java-springboot/Jenkinsfile.template

@@ -26,7 +26,7 @@ def stageBuild(def context) {
   }
   stage('Build and Unit Test') {
     withEnv(["TAGVERSION=${context.tagversion}", "NEXUS_HOST=${context.nexusHost}", "NEXUS_USERNAME=${context.nexusUsername}", "NEXUS_PASSWORD=${context.nexusPassword}", "JAVA_OPTS=${javaOpts}","GRADLE_TEST_OPTS=${gradleTestOpts}","ENVIRONMENT=${springBootEnv}"]) {
-      def status = sh(script: "source use-j25.sh && ./gradlew clean build --stacktrace --no-daemon && source use-j21.sh", returnStatus: true)
+      def status = sh(script: 'source use-j25.sh && ./gradlew clean build --stacktrace --no-daemon && source use-j21.sh', returnStatus: true)
       if (status != 0) {
         error "Build failed!"
       }

be-scala-play/Jenkinsfile

@@ -19,7 +19,7 @@ odsQuickstarterPipeline(
 ) { context ->
 
   stage("init scala play project") {
-    sh "source use-j11.sh && sbt -no-colors -v new file://${context.sourceDir}/be-scala-play.g8 --name=${context.componentId} --secret=\$(uuidgen) && source use-j21.sh"
+    sh 'source use-j11.sh && sbt -no-colors -v new file://${context.sourceDir}/be-scala-play.g8 --name=${context.componentId} --secret=\$(uuidgen) && source use-j21.sh'
   }
 
   odsQuickstarterStageCopyFiles(context)

be-scala-play/Jenkinsfile.template

@@ -22,7 +22,7 @@ odsComponentPipeline(
 def stageBuild(def context) {
   stage('Build and Unit Test') {
     withEnv(["TAGVERSION=${context.tagversion}"]){
-      def status = sh(script: "source use-j11.sh && sbt -v clean scalafmtSbtCheck scalafmtCheckAll coverage test coverageReport coverageOff compile:clean copyDockerFiles && source use-j21.sh", returnStatus: true)
+      def status = sh(script: 'source use-j11.sh && sbt -v clean scalafmtSbtCheck scalafmtCheckAll coverage test coverageReport coverageOff compile:clean copyDockerFiles && source use-j21.sh', returnStatus: true)
       if (status != 0) {
         error "Build failed!"
       }

common/jenkins-agents/scala/docker/use-j11.sh

@@ -36,3 +36,16 @@ else
   msg_and_exit "Cannot configure JAVA_HOME environment variable to ${JAVA_HOME}"
 fi
 echo "JAVA_HOME: $JAVA_HOME"
+
+# If not sourced, print the export command so parent shell can eval it
+if [ "${BASH_SOURCE[0]}" == "${0}" ]; then
+  echo ""
+  echo "================================================================================="
+  echo "WARNING: Script executed as subprocess - JAVA_HOME will NOT persist!"
+  echo "-----"
+  echo "Usage Options:"
+  echo "  Option 1 (source):   source ${BASH_SOURCE[0]}"
+  echo "  Option 2 (dot):      . ${BASH_SOURCE[0]}"
+  echo "================================================================================="
+  echo ""
+fi

common/jenkins-agents/scala/docker/use-j17.sh

@@ -35,4 +35,17 @@ if [ -d ${JAVA_HOME}/bin/ ]; then
 else
   msg_and_exit "Cannot configure JAVA_HOME environment variable to ${JAVA_HOME}"
 fi
-echo "JAVA_HOME: $JAVA_HOME"
+echo "JAVA_HOME: $JAVA_HOME"
+
+# If not sourced, print the export command so parent shell can eval it
+if [ "${BASH_SOURCE[0]}" == "${0}" ]; then
+  echo ""
+  echo "================================================================================="
+  echo "WARNING: Script executed as subprocess - JAVA_HOME will NOT persist!"
+  echo "-----"
+  echo "Usage Options:"
+  echo "  Option 1 (source):   source ${BASH_SOURCE[0]}"
+  echo "  Option 2 (dot):      . ${BASH_SOURCE[0]}"
+  echo "================================================================================="
+  echo ""
+fi