From: Luis Gomez <ecelgp@gmail.com>
Date: Tue, 26 May 2020 21:58:35 +0000 (-0700)
Subject: Restore master distribution
X-Git-Tag: release/aluminium~14
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F72%2F89972%2F1;p=integration%2Fdistribution.git

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 03c43405..fed91695 100644
--- 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 a24ecf5a..68382902 100644
--- 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 12c7efb9..2801b9b6 100644
--- 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 7a92d1a3..30feabcd 100644
--- 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>