X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=62f385788840bef10e6dc4f4f53bcef9378cd6b6;hb=bec679b3c9988e8e79973c55b2983d6024aae457;hp=f7f0830b0bf8857a6ab6c7a0b16e66b2fe665b2a;hpb=3d19b9878da531a05b8de46f9cc2d72f288838ab;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

diff --git a/pom.xml b/pom.xml
index f7f0830b..62f38578 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,21 +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>1.0.0-SNAPSHOT</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.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>vfc/nfvo/driver/vnfm/svnfm</name>
-    <description>vfc-nfvo-driver-vnfm-svnfm</description>
-    <modules>
+  <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.1-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>
+		-->
         <module>zte</module>
-    </modules>
+      </modules>
+    </profile>
+    <profile>
+      <id>rootOnly</id>
+      <modules>
+        </modules>
+    </profile>
+  </profiles>
 </project>