X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=c2689f5d63687ee89108cad68a3a8fd8ae485e71;hb=588272759296eaa280a42b175dc2ff7af76b9009;hp=ffe5bc6adfc6d329cb21ac85270df11c7aaef772;hpb=f5b1c07d03b2c85b8bd8d9c30bfb8d97a4a67b65;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

diff --git a/pom.xml b/pom.xml
index ffe5bc6a..c2689f5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,23 +14,40 @@
     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>0.1.1</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>
-    <packaging>pom</packaging>
-    <name>vfc-nfvo-driver-vnfm-svnfm</name>
-    <description>vfc-nfvo-driver-vnfm-svnfm</description>
-    <modules>
-        <module>zte</module>
+  <parent>
+    <groupId>org.onap.oparent</groupId>
+    <artifactId>oparent</artifactId>
+    <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.4.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>vfc-nfvo-driver-vnfm-svnfm</name>
+  <description>vfc-nfvo-driver-vnfm-svnfm</description>
+  <profiles>
+    <profile>
+      <id>all</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
         <module>huawei</module>
+		<!-- nokia driver remove from Guilin Release -->
+		<!--
         <module>nokia</module>
         <module>nokiav2</module>
-    </modules>
+		-->
+        <module>zte</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>rootOnly</id>
+      <modules>
+        </modules>
+    </profile>
+  </profiles>
 </project>