X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=b6cd62a31bf3cf441bb29736a03e5558e80032af;hb=8aaa4edff22a1e3c64852b9535eb269af8f6b7f6;hp=0f5792afbd91837f2ed8d6903e9a30ece7c07837;hpb=185a849076f7d604b62d9ee7fd49cacf95657e3c;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

diff --git a/pom.xml b/pom.xml
index 0f5792af..b6cd62a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,16 +14,17 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+<!-- trigger merge -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>1.1.0</version>
+    <version>2.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
   <artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.3.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>vfc-nfvo-driver-vnfm-svnfm</name>
   <description>vfc-nfvo-driver-vnfm-svnfm</description>
@@ -35,8 +36,11 @@
       </activation>
       <modules>
         <module>huawei</module>
+		<!-- nokia driver remove from Guilin Release -->
+		<!--
         <module>nokia</module>
         <module>nokiav2</module>
+		-->
         <module>zte</module>
       </modules>
     </profile>