From 367cc7c7af7a4b760a0f2c4cf6b95eda34e7a542 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Fri, 30 Jun 2017 23:03:16 +0200
Subject: HONEYCOMB-374: remove BGP distribution for vpp

After HONEYCOMB-358 was fixed,
BGP northbound interface was included
in Honeycomb's minimal distro:

https://gerrit.fd.io/r/#/c/7363/

Change-Id: I8164747502b3612f540aa008007ceda445b89cb6
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 .../bgp-distribution/asciidoc/Readme.adoc          |  3 -
 vpp-integration/bgp-distribution/pom.xml           | 80 ----------------------
 vpp-integration/minimal-distribution/pom.xml       | 10 ++-
 vpp-integration/pom.xml                            |  3 +-
 4 files changed, 10 insertions(+), 86 deletions(-)
 delete mode 100644 vpp-integration/bgp-distribution/asciidoc/Readme.adoc
 delete mode 100644 vpp-integration/bgp-distribution/pom.xml

diff --git a/vpp-integration/bgp-distribution/asciidoc/Readme.adoc b/vpp-integration/bgp-distribution/asciidoc/Readme.adoc
deleted file mode 100644
index deff42c1c..000000000
--- a/vpp-integration/bgp-distribution/asciidoc/Readme.adoc
+++ /dev/null
@@ -1,3 +0,0 @@
-= bgp-distribution
-
-Adds bgp to vpp-integration-distribution (preserving all features).
\ No newline at end of file
diff --git a/vpp-integration/bgp-distribution/pom.xml b/vpp-integration/bgp-distribution/pom.xml
deleted file mode 100644
index 59892d4e4..000000000
--- a/vpp-integration/bgp-distribution/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2017 Cisco and/or its affiliates.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at:
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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>io.fd.hc2vpp.common</groupId>
-        <artifactId>minimal-distribution-parent</artifactId>
-        <version>1.17.07-SNAPSHOT</version>
-        <relativePath>../../common/minimal-distribution-parent</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>io.fd.hc2vpp.integration</groupId>
-    <artifactId>bgp-distribution</artifactId>
-    <name>${project.artifactId}</name>
-    <version>1.17.07-SNAPSHOT</version>
-
-    <properties>
-        <main.class>io.fd.honeycomb.infra.bgp.distro.Main</main.class>
-        <honeycomb.min.distro.version>${project.version}</honeycomb.min.distro.version>
-        <distribution.modules>
-            io.fd.hc2vpp.bgp.inet.BgpInetModule
-        </distribution.modules>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.fd.hc2vpp.bgp</groupId>
-            <artifactId>bgp-inet</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.fd.honeycomb</groupId>
-            <artifactId>bgp-distribution</artifactId>
-            <version>${honeycomb.min.distro.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.fd.hc2vpp.integration</groupId>
-            <artifactId>vpp-integration-distribution</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/vpp-integration/minimal-distribution/pom.xml b/vpp-integration/minimal-distribution/pom.xml
index a8616f535..a8d5ef1cf 100644
--- a/vpp-integration/minimal-distribution/pom.xml
+++ b/vpp-integration/minimal-distribution/pom.xml
@@ -45,6 +45,7 @@
     <l3-impl.version>1.17.07-SNAPSHOT</l3-impl.version>
     <vpp-management-impl.version>1.17.07-SNAPSHOT</vpp-management-impl.version>
     <iface.role.version>1.17.07-SNAPSHOT</iface.role.version>
+    <hc2vpp.bgp.version>1.17.07-SNAPSHOT</hc2vpp.bgp.version>
 
     <distribution.modules>
       io.fd.hc2vpp.common.integration.VppCommonModule,
@@ -66,8 +67,10 @@
       io.fd.hc2vpp.policer.PolicerModule,
       // io.fd.hc2vpp.vppnsh.impl.VppNshModule,
       <!-- Nsh module by default disabled, because it needs vpp-nsh plugin, which is not part of vpp codebase.-->
-      // io.fd.hc2vpp.vppioam.impl.VppIoamModule
+      // io.fd.hc2vpp.vppioam.impl.VppIoamModule,
       <!-- iOAM module by default disabled, because it needs ioam plugin (not part of vpp codebase.)-->
+      // io.fd.hc2vpp.bgp.inet.BgpInetModule
+      <!-- BgpInetModule by default disabled, because it BGP northbound interface is not enabled by default -->
     </distribution.modules>
   </properties>
 
@@ -165,5 +168,10 @@
       <artifactId>impl</artifactId>
       <version>${iface.role.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.fd.hc2vpp.bgp</groupId>
+      <artifactId>bgp-inet</artifactId>
+      <version>${hc2vpp.bgp.version}</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/vpp-integration/pom.xml b/vpp-integration/pom.xml
index 0221bb09f..39ebdd10a 100644
--- a/vpp-integration/pom.xml
+++ b/vpp-integration/pom.xml
@@ -29,11 +29,10 @@
     <version>1.17.07-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
-    <description>Aggregator for Honeycomb's VPP distributions. Aggregating all Hc2vpp plugins.</description>
+    <description>Aggregator for Honeycomb's VPP distribution. Aggregating all Hc2vpp plugins.</description>
 
     <modules>
         <module>minimal-distribution</module>
-        <module>bgp-distribution</module>
     </modules>
 
     <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-- 
cgit 1.2.3-korg