PL-712: Updated release script

navikt · Jun 22, 2020 · b46a665 · b46a665
1 parent 8c570ee
commit b46a665
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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>