Merge "mariadb container is outdated"

diff --git a/Dockerfile b/Dockerfile
index 0566534..fadacbe 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@
 FROM openjdk:8-jre-alpine
 
 ARG SERVER_PORT
-ARG PKG_FILENAME=nbi-rest-services-4.0.0.jar
+ARG PKG_FILENAME=nbi-rest-services-4.0.0-SNAPSHOT.jar
 ADD target/$PKG_FILENAME app.jar
 
 RUN addgroup -S appgroup

diff --git a/pom.xml b/pom.xml
index 72d2c75..f8d8c9a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
   <groupId>org.onap.externalapi-nbi</groupId>
   <artifactId>nbi-rest-services</artifactId>
-  <version>4.0.0</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>externalapi-nbi</name>

diff --git a/version.properties b/version.properties
index fb5c330..7a5aafd 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -18,13 +18,13 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support...
 
-major=3
-minor=0
-patch=1
+major            = 4
+minor            = 0
+patch            = 0
 
-base_version=${major}.${minor}.${patch}
+base_version     = ${major}.${minor}.${patch}
 
 # Release must be completed with git revision # in Jenkins
-release_version=${base_version}
-staging_version=${base_version}-STAGING
-snapshot_version=${base_version}-SNAPSHOT
+release_version  = ${base_version}
+staging_version  = ${base_version}-STAGING
+snapshot_version = ${base_version}-SNAPSHOT