From b46a6653a3376103b432194358b5aa27644407e8 Mon Sep 17 00:00:00 2001
From: Ingleiv Johansen <ingleiv.halvard.johansen@nav.no>
Date: Mon, 22 Jun 2020 10:33:32 +0200
Subject: [PATCH] PL-712: Updated release script

---
 release.sh                    | 3 ++-
 stelvio-consumer-java/pom.xml | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/release.sh b/release.sh
index 564e67fd36..67d8fade0b 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,8 @@ set -e
 
 TIME=$(TZ="Europe/Oslo" date +%Y.%m.%d-%H.%M)
 COMMIT=$(git rev-parse --short=12 HEAD)
-VERSION="6.0.0-beta-6-$COMMIT"
+BASEVERSION=`mvn org.apache.maven.plugins:maven-help-plugin:3.1.1:evaluate -Dexpression=project.version -q -DforceStdout | sed 's/-SNAPSHOT//g'`
+VERSION="$BASEVERSION-$COMMIT"
 echo "Setting version $VERSION"
 
 mvn -B versions:set -DnewVersion="$VERSION"
diff --git a/stelvio-consumer-java/pom.xml b/stelvio-consumer-java/pom.xml
index 232ad64c08..f03b901674 100644
--- a/stelvio-consumer-java/pom.xml
+++ b/stelvio-consumer-java/pom.xml
@@ -40,11 +40,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 		</dependency>
-<!--		<dependency>-->
-<!--			<groupId>websphere</groupId>-->
-<!--			<artifactId>com.ibm.ws.webservices.thinclient</artifactId>-->
-<!--			<scope>provided</scope>-->
-<!--		</dependency>-->
 
 		<!-- Test -->
 		<dependency>