From 5efec2c3cfcead17394beb825200e132f827eb31 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Tue, 30 Jul 2019 18:01:21 +0300
Subject: Fix /version endpoint

* Modify maven-replacer-plugin to set value in version.json
* Configure features.set.filename=onap.features.properties

Issue-ID: VID-507

Change-Id: I692ab3e9221118b836ae7249f483b5277a70bf6b
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 vid-app-common/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'vid-app-common/pom.xml')

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 28b17a373..8d32eda7a 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -54,7 +54,7 @@
         <npm.version>5.6.0</npm.version>
 
         <!-- override using -Drelease_version=foo -Dpatch_version=bar -->
-        <release_version>${env.RELEASE_VERSION}</release_version>
+        <release_version/>
         <patch_version/>
 
         <reportportal.argline>-javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar -Drp.enable=true -Drp.mode=DEFAULT -Drp.tags="CICD;BE_UNIT;BUILD_${env.BUILD_NUMBER}"</reportportal.argline>
@@ -268,7 +268,7 @@
                     <replacements>
                         <replacement>
                             <token>BUILD_NUMBER</token>
-                            <value>${release_version}.${patch_version}.${env.BUILD_NUMBER}</value>
+                            <value>${env.RELEASE_VERSION}${release_version}.${patch_version}.${env.BUILD_NUMBER}</value>
                         </replacement>
                     </replacements>
                 </configuration>
-- 
cgit 1.2.3-korg