summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--heat/OpenECOMP/openecomp_rackspace.env2
-rw-r--r--heat/OpenECOMP/openecomp_rackspace.yaml2
-rwxr-xr-xpom.xml2
-rwxr-xr-xscripts/deploy.sh2
-rw-r--r--version.properties2
-rw-r--r--vnfs/VES/pom.xml2
-rw-r--r--vnfs/VESreporting_vFW/pom.xml2
-rw-r--r--vnfs/VESreporting_vLB/pom.xml2
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml2
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml2
-rw-r--r--vnfs/vFW/pg_streams/pom.xml2
-rw-r--r--vnfs/vLB/DNSClient/pom.xml2
-rw-r--r--vnfs/vLB/DNSManager/pom.xml2
-rw-r--r--vnfs/vLB/dns_streams/pom.xml2
14 files changed, 14 insertions, 14 deletions
diff --git a/heat/OpenECOMP/openecomp_rackspace.env b/heat/OpenECOMP/openecomp_rackspace.env
index 90e67f98..3e8e09c2 100644
--- a/heat/OpenECOMP/openecomp_rackspace.env
+++ b/heat/OpenECOMP/openecomp_rackspace.env
@@ -22,7 +22,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.0.0-SNAPSHOT
+ artifacts_version: 1.0.0
# Parameters for DCAE instantiation
diff --git a/heat/OpenECOMP/openecomp_rackspace.yaml b/heat/OpenECOMP/openecomp_rackspace.yaml
index f5431276..613fb13c 100644
--- a/heat/OpenECOMP/openecomp_rackspace.yaml
+++ b/heat/OpenECOMP/openecomp_rackspace.yaml
@@ -983,7 +983,7 @@ resources:
cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
ZONE: __dcae_zone__
STATE: __dcae_state__
- DCAE-VERSION: 0.1.0-SNAPSHOT
+ DCAE-VERSION: __artifacts_version__
HORIZON-URL: https://mycloud.rackspace.com/cloud/__tenant_id__
KEYSTONE-URL: https://identity.api.rackspacecloud.com/v2.0
OPENSTACK-TENANT-ID: __tenant_id__
diff --git a/pom.xml b/pom.xml
index d16b6818..737a4b7c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>demo-aggregator</name>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 0c703486..c53d5e9d 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -3,7 +3,7 @@
set -x
########## Define parameters ##########
-VERSION="1.0.0-SNAPSHOT"
+VERSION="1.0.0"
PATH_TO_BOOT="/w/workspace/demo-master-merge-java/boot"
PATH_TO_HEAT="/w/workspace/demo-master-merge-java/heat"
diff --git a/version.properties b/version.properties
index d2812bbb..1c6eb43a 100644
--- a/version.properties
+++ b/version.properties
@@ -2,7 +2,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=1
-minor=0
+minor=1
patch=0
base_version=${major}.${minor}.${patch}
diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml
index 27ef16f3..ca996880 100644
--- a/vnfs/VES/pom.xml
+++ b/vnfs/VES/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml
index 5140b747..9b89913e 100644
--- a/vnfs/VESreporting_vFW/pom.xml
+++ b/vnfs/VESreporting_vFW/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml
index 125b9bfd..65ee26b6 100644
--- a/vnfs/VESreporting_vLB/pom.xml
+++ b/vnfs/VESreporting_vLB/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index 9299f059..8304b473 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
index 6e408b67..e582fa21 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>hc-openecomp</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../parent-pom/pom.xml</relativePath>
</parent>
diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml
index 6969d465..7a60ae39 100644
--- a/vnfs/vFW/pg_streams/pom.xml
+++ b/vnfs/vFW/pg_streams/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml
index eee23a6e..d4d60f8d 100644
--- a/vnfs/vLB/DNSClient/pom.xml
+++ b/vnfs/vLB/DNSClient/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml
index 51b09433..2dda1f82 100644
--- a/vnfs/vLB/DNSManager/pom.xml
+++ b/vnfs/vLB/DNSManager/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml
index 45ec40ec..8a508f60 100644
--- a/vnfs/vLB/dns_streams/pom.xml
+++ b/vnfs/vLB/dns_streams/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>