aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-09-14 09:52:32 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-09-14 09:54:06 -0400
commited392ceaf7b2acc47d7b2211d2dc2ff90128d6d2 (patch)
tree15d0258dbe154b014adea3914bbcfec038b2d2fb
parentde557ed526f0ba2e8d6adcc88c2bdc2e6532fd14 (diff)
Fix parent node
For release build to work properly, parent node must either be outside the project altogether OR must be one directory above OR relativePath must be specified. Changed controllerblueprint to use pom in directory above as parent. Change-Id: Ib3152f7cf90dd2a6628ab4631b387f1f0b51baad Issue-ID: CCSDK-570 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
-rw-r--r--ms/controllerblueprints/pom.xml2
-rw-r--r--version.properties4
2 files changed, 3 insertions, 3 deletions
diff --git a/ms/controllerblueprints/pom.xml b/ms/controllerblueprints/pom.xml
index 798bdae4..5c190db5 100644
--- a/ms/controllerblueprints/pom.xml
+++ b/ms/controllerblueprints/pom.xml
@@ -19,7 +19,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<groupId>org.onap.ccsdk.apps</groupId>
- <artifactId>ccsdk-apps</artifactId>
+ <artifactId>ccsdk-apps-ms</artifactId>
<version>0.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/version.properties b/version.properties
index 60a8d1ca..4c1c6c69 100644
--- a/version.properties
+++ b/version.properties
@@ -4,8 +4,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
-release_name=1
-sprint_number=1
+release_name=0
+sprint_number=3
feature_revision=0
base_version=${release_name}.${sprint_number}.${feature_revision}