From: Marcus Williams Date: Thu, 9 Nov 2017 16:50:21 +0000 (+0000) Subject: Merge "vGW VF HEAT Parameters" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ca2f8ad39af9591a98212a1a1ba77490594e2a1e;hp=744cbc430faa713bc77361fe57e4814b96fe492f;p=sdnc%2Foam.git Merge "vGW VF HEAT Parameters" --- diff --git a/admportal/pom.xml b/admportal/pom.xml index 6bb2f6bc..d007cd15 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 @@ -13,7 +13,7 @@ org.onap.sdnc.oam admportal - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Admin Portal Admin Portal diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 5f5056eb..3f25364b 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam sdnc-oam - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 @@ -13,7 +13,7 @@ org.onap.sdnc.oam dgbuilder - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Directed Graph Builder Directed Graph Builder diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index bb607147..909b271a 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -5,14 +5,14 @@ org.onap.sdnc.oam installation - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-admportal - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Installation - admportal Creates admportal Docker container diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 9b589656..8cc725d9 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam installation - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom installation-dmaap-listener - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Installation - dmaap-listener Creates dmaap-listener Docker container diff --git a/installation/pom.xml b/installation/pom.xml index 12035bf1..a0dcb68d 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,14 +5,14 @@ org.onap.sdnc.oam sdnc-oam - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Installation Installs SDN-C on local file system diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index f609fbb6..85fdef57 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,14 +5,14 @@ org.onap.sdnc.oam installation - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-sdnc - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Installation - sdnc Creates SDN Controller Docker container diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 60c9c029..ad7f8a09 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam installation - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom installation-ueb-listener - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Installation - ueb-listener Creates ueb-listener Docker container diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index e3ac7b1f..c5a34c55 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,11 +5,11 @@ org.onap.sdnc.oam platform-logic - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT platform-logic-generic-resource-api - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT pom Platform Logic : Generic Resource API diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index e9a2ce6e..4726202f 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,14 +5,14 @@ org.onap.sdnc.oam platform-logic - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam platform-logic-installer - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Platform Logic Installer Contains platform-level service logic installer diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 198f24ab..69ba116d 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,14 +5,14 @@ org.onap.sdnc.oam sdnc-oam - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam platform-logic - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Platform Logic Contains platform-level service logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 784a80f5..37aff9d3 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,11 +5,11 @@ org.onap.sdnc.oam platform-logic - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT platform-logic-restapi-templates - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT pom Platform Logic : REST API templates diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index a2062328..fb3a9a94 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,11 +5,11 @@ org.onap.sdnc.oam platform-logic - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT platform-logic-setup - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT pom Platform Logic : Setup diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 0e0dc124..ea433886 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,14 +5,14 @@ org.onap.sdnc.oam platform-logic - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam platform-logic-vnfapi - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT Platform Logic : VNF-API Contains platform-level service logic for the VNF-API diff --git a/pom.xml b/pom.xml index c2311817..b7a75a55 100755 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ AT&T - 1.2.0-SNAPSHOT + 1.2.1-SNAPSHOT diff --git a/version.properties b/version.properties index fa084543..1291f242 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 -feature_revision=2 +sprint_number=2 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision}