Code Review / demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: aa1bbe6)
Merge "Fix bug with vm_image_name in robot VM"
authorMarco Platania <platania@research.att.com>
Wed, 16 May 2018 20:34:21 +0000 (20:34 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 16 May 2018 20:34:21 +0000 (20:34 +0000)
16 files changed:
heat/ONAP/onap_openstack.env patch | blob | history
pom.xml patch | blob | history
version.properties patch | blob | history
vnfs/VES/pom.xml patch | blob | history
vnfs/VES5.0/pom.xml patch | blob | history
vnfs/VESreporting_vFW/pom.xml patch | blob | history
vnfs/VESreporting_vFW5.0/pom.xml patch | blob | history
vnfs/VESreporting_vLB/pom.xml patch | blob | history
vnfs/VESreporting_vLB5.0/pom.xml patch | blob | history
vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml patch | blob | history
vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml patch | blob | history
vnfs/vCPE/kea-sdnc-notify-mod/pom.xml patch | blob | history
vnfs/vFW/pg_streams/pom.xml patch | blob | history
vnfs/vLB/DNSClient/pom.xml patch | blob | history
vnfs/vLB/DNSManager/pom.xml patch | blob | history
vnfs/vLB/dns_streams/pom.xml patch | blob | history

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index fa87e42..0d42937 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -40,7 +40,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.2.0-SNAPSHOT
+  artifacts_version: 1.2.0
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
@@ -145,7 +145,7 @@ parameters:
   so_docker: 1.2.1
   policy_docker: 1.2.0
   portal_docker: v2.2.0
-  robot_docker: 1.2-STAGING-latest
+  robot_docker: 1.2.0
   sdc_docker: 1.2-STAGING-latest
   sdnc_docker: 1.3-STAGING-latest
   vid_docker: 1.2.1
diff --git a/pom.xml b/pom.xml
index b5c633e..b73334b 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
   <groupId>org.onap.demo.vnf</groupId>
   <artifactId>demo-aggregator</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <name>demo</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
diff --git a/version.properties b/version.properties
index 6ef50aa..a32a56d 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,7 +3,7 @@
 
 major=1
 minor=2
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}
 
diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml
index 554786d..fc3f90b 100644 (file)
--- a/vnfs/VES/pom.xml
+++ b/vnfs/VES/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/VES5.0/pom.xml b/vnfs/VES5.0/pom.xml
index cabebf6..4b150e9 100644 (file)
--- a/vnfs/VES5.0/pom.xml
+++ b/vnfs/VES5.0/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml
index 5afc23e..113319b 100644 (file)
--- a/vnfs/VESreporting_vFW/pom.xml
+++ b/vnfs/VESreporting_vFW/pom.xml
@@ -28,7 +28,7 @@
 <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/VESreporting_vFW5.0/pom.xml b/vnfs/VESreporting_vFW5.0/pom.xml
index 2e0df62..216ad3a 100644 (file)
--- a/vnfs/VESreporting_vFW5.0/pom.xml
+++ b/vnfs/VESreporting_vFW5.0/pom.xml
@@ -28,7 +28,7 @@
 <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml
index 9a52a67..d9ffd0d 100644 (file)
--- a/vnfs/VESreporting_vLB/pom.xml
+++ b/vnfs/VESreporting_vLB/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/VESreporting_vLB5.0/pom.xml b/vnfs/VESreporting_vLB5.0/pom.xml
index 70c906c..cd2f77d 100644 (file)
--- a/vnfs/VESreporting_vLB5.0/pom.xml
+++ b/vnfs/VESreporting_vLB5.0/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-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 f0656b7..c561dca 100644 (file)
--- 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.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-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 ed3b2c0..3bfe58b 100755 (executable)
--- 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.onap.demo.vnf</groupId>
     <artifactId>hc-onap</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../parent-pom/pom.xml</relativePath>
 </parent>
 
diff --git a/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml b/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml
index 8e0b3a4..ea86f7b 100644 (file)
--- a/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml
+++ b/vnfs/vCPE/kea-sdnc-notify-mod/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml
index fcbd871..b6fd63e 100644 (file)
--- a/vnfs/vFW/pg_streams/pom.xml
+++ b/vnfs/vFW/pg_streams/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml
index 497922f..fe2eec1 100644 (file)
--- a/vnfs/vLB/DNSClient/pom.xml
+++ b/vnfs/vLB/DNSClient/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml
index 2b94858..3cace65 100644 (file)
--- a/vnfs/vLB/DNSManager/pom.xml
+++ b/vnfs/vLB/DNSManager/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml
index 000736c..fee7792 100644 (file)
--- a/vnfs/vLB/dns_streams/pom.xml
+++ b/vnfs/vLB/dns_streams/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
Demo applications and templates for ONAP platform instantiation.