Restore master distribution

We have to remove lisp and netvirt to restore distribution build.

Change-Id: Iad01baabda6c357c26c9e8a621552f8bddca128c
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 03c43405f31dc0faaaae36a5e83b6ea1b255d1e3..fed91695f39f776edc8703d66d2b2a3342c9f290 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -162,7 +162,7 @@
         <profile>
             <id>lispflowmapping</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
@@ -221,7 +221,7 @@
         <profile>
             <id>netvirt</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index a24ecf5a76faf7ef6c8559af9806f70831892d75..68382902024c106558fee0bfc9a2b4527a1093c5 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -197,7 +197,7 @@
         <profile>
             <id>lispflowmapping</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -260,7 +260,7 @@
         <profile>
             <id>netvirt</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 12c7efb99327e6adb93f600c5e3696f460b476c2..2801b9b667e07c312fcd4aaea5f655cda1a54674 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -117,7 +117,7 @@
         <profile>
             <id>netvirt</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 7a92d1a382a2352f64621fa82310d36bb514cd84..30feabcd3b14db8f5a00f976e7eec92f40ff5c40 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -148,7 +148,7 @@
         <profile>
             <id>lispflowmapping</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>