From 3d9229c8bb77ec440446c482c399f2e661eaaed0 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Mon, 18 Sep 2023 12:20:39 -0500
Subject: [PATCH] Fine tune looking up current version.

---
 .mvn/wrapper/maven-wrapper.properties |  2 +-
 Jenkinsfile                           |  4 ++++
 ci/version.sh                         | 12 ++++--------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index c3150437..869f9d17 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
diff --git a/Jenkinsfile b/Jenkinsfile
index e7e7ba27..f77b7796 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -178,6 +178,8 @@ pipeline {
 								returnStdout: true
 						).trim()
 
+						echo "Releasing Spring WS ${PROJECT_VERSION}..."
+
 						if (PROJECT_VERSION.matches(/.*-RC[0-9]+$/) || PROJECT_VERSION.matches(/.*-M[0-9]+$/)) {
 							RELEASE_TYPE = "milestone"
 						} else if (PROJECT_VERSION.endsWith('SNAPSHOT')) {
@@ -188,6 +190,8 @@ pipeline {
 							RELEASE_TYPE = 'snapshot'
 						}
 
+						echo "Release type: ${RELEASE_TYPE}"
+
 						if (RELEASE_TYPE == 'release') {
 
 							STAGING_REPOSITORY_ID = sh(
diff --git a/ci/version.sh b/ci/version.sh
index 3e9fb1ba..aae179c3 100755
--- a/ci/version.sh
+++ b/ci/version.sh
@@ -2,13 +2,9 @@
 
 set -euo pipefail
 
-RAW_VERSION=`MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
-  org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
-  -Dexpression=project.version -q -DforceStdout`
+VERSION=`MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
+  org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate \
+  -Dexpression=project.version -q -DforceStdout | tail -1`
 
-# Split things up
-VERSION_PARTS=($RAW_VERSION)
-
-# Grab the last part, which is the actual version number.
-echo ${VERSION_PARTS[${#VERSION_PARTS[@]}-1]}
+echo $VERSION