Remove no longer required 31-bgp.xml for bgp feature

CSS configuration is not longer supported under nitrogen.
Therefore 31-bgp.xml is no longer required for bgp feature.

Change-Id: I43aa0a52d919a03e90133a2f908505941285773a
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/features/bgp/odl-bgpcep-bgp/pom.xml b/features/bgp/odl-bgpcep-bgp/pom.xml
index c4c10f94935f49a8441ae6d754b02278d6190635..832c890bd22fa3d9ee61487e2f1229d1b6788175 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp/pom.xml
@@ -121,12 +121,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-controller-config</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
     </dependencies>
 
     <!--

diff --git a/features/bgp/odl-bgpcep-bgp/src/main/feature/feature.xml b/features/bgp/odl-bgpcep-bgp/src/main/feature/feature.xml
deleted file mode 100644 (file)
index 6c0dcd7..0000000
--- a/features/bgp/odl-bgpcep-bgp/src/main/feature/feature.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014, 2016 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<features name="odl-bgpcep-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <feature name="odl-bgpcep-bgp" version="${project.version}">
-        <configfile finalname="etc/opendaylight/karaf/31-bgp.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/${project.version}/xml/config</configfile>
-    </feature>
-</features>
\ No newline at end of file