Merge "fix get job error"

diff --git a/gvnfmadapter/docker/Dockerfile b/gvnfmadapter/docker/Dockerfile
index 1bb00c5..d27ed1f 100644 (file)
--- a/gvnfmadapter/docker/Dockerfile
+++ b/gvnfmadapter/docker/Dockerfile
@@ -26,7 +26,7 @@ ADD . /service
 WORKDIR /service
 
 # get binary zip from nexus
-RUN wget -q -O vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter&a=vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter&v=LATEST&e=zip' && \
+RUN wget -q -O vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter&a=vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter&v=LATEST&e=zip' && \
     unzip vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter.zip && \
     rm -rf vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter.zip
 

diff --git a/gvnfmadapter/docker/build_image.sh b/gvnfmadapter/docker/build_image.sh
index f8771f9..b6b43dc 100755 (executable)
--- a/gvnfmadapter/docker/build_image.sh
+++ b/gvnfmadapter/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.2.0"
+VERSION="1.2.1"
 PROJECT="vfc"
 IMAGE="gvnfmdriver"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/gvnfmadapter/pom.xml b/gvnfmadapter/pom.xml
index fa41525..31b8ef7 100644 (file)
--- a/gvnfmadapter/pom.xml
+++ b/gvnfmadapter/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
         <artifactId>vfc-nfvo-driver-vnfm-gvnfm</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter</name>
     <properties>

diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml
index a69c9aa..458eaf0 100644 (file)
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
         <artifactId>juju-vnfmadapter-service-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>juju-vnfmadapterservice-deployment</artifactId>

diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
index 0431e62..78883ce 100644 (file)
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
 
 BUILD_ARGS="--no-cache"
 ORG="onap"
-VERSION="1.2.0"
+VERSION="1.2.1"
 PROJECT="vfc"
 IMAGE="jujudriver"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"

diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml
index 2590e0a..f72701c 100644 (file)
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
         <artifactId>juju-vnfmadapter</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <artifactId>juju-vnfmadapter-service-root</artifactId>
     <name>vfc-nfvo-driver-vnfm-gvnfm-juju-vnfmadapter-vnfmadapterService</name>

diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml
index 2aceb94..0f64081 100644 (file)
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
         <artifactId>juju-vnfmadapter-service-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>juju-vnfmadapter-service</artifactId>

diff --git a/juju/juju-vnfmadapter/pom.xml b/juju/juju-vnfmadapter/pom.xml
index 09aa57f..472151c 100644 (file)
--- a/juju/juju-vnfmadapter/pom.xml
+++ b/juju/juju-vnfmadapter/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
         <artifactId>juju</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>juju-vnfmadapter</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-driver-vnfm-gvnfm-juju-vnfmadapter</name>
     <description>nfvo juju-vnfmadapter</description>

diff --git a/juju/pom.xml b/juju/pom.xml
index ae6f41e..c4454a5 100644 (file)
--- a/juju/pom.xml
+++ b/juju/pom.xml
@@ -18,12 +18,12 @@
     <parent>
         <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
         <artifactId>vfc-nfvo-driver-vnfm-gvnfm</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>juju</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-driver-vnfm-gvnfm-juju</name>
     <description>nfvo juju-vnfmadapter</description>

diff --git a/pom.xml b/pom.xml
index 6fc388d..d18d997 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId>
     <artifactId>vfc-nfvo-driver-vnfm-gvnfm</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>vfc-nfvo-driver-vnfm-gvnfm</name>
     <description>vfc nfvo drivers-vnfm-gvnfm</description>

diff --git a/version.properties b/version.properties
index 2cddbb0..502454f 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 
 major=1
 minor=2
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}