Remove unneeded references to ODL blueprint extension

We have a few blueprints which are not using ODL extensions, yet
they are declaring a dependency on it. Remove such references, making
future migration more obvious.

JIRA: BGPCEP-881
Change-Id: I4c5fffb4806f0beade7f7d9533b5ff6cef48f3d0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/topology-provider/src/main/resources/OSGI-INF/blueprint/bgp-topology-provider.xml b/bgp/topology-provider/src/main/resources/OSGI-INF/blueprint/bgp-topology-provider.xml
index b0276c435caf86007300fc5f54fb6a36b54ed175..2250ab2ec1823267b17221139c00947b098291cb 100644 (file)
--- a/bgp/topology-provider/src/main/resources/OSGI-INF/blueprint/bgp-topology-provider.xml
+++ b/bgp/topology-provider/src/main/resources/OSGI-INF/blueprint/bgp-topology-provider.xml
@@ -6,8 +6,7 @@
   terms of the Eclipse Public License v1.0 which accompanies this distribution,
   and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
   <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
   <reference id="clusterSingletonServiceProvider" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>

diff --git a/pcep/server/server-provider/src/main/resources/OSGI-INF/blueprint/pce-server.xml b/pcep/server/server-provider/src/main/resources/OSGI-INF/blueprint/pce-server.xml
index a4f5962c9d0ed1cd15bda9bf6a77fc50c54bc6e2..7b3439dd9750e93156b035594a94564c70b7cb84 100644 (file)
--- a/pcep/server/server-provider/src/main/resources/OSGI-INF/blueprint/pce-server.xml
+++ b/pcep/server/server-provider/src/main/resources/OSGI-INF/blueprint/pce-server.xml
@@ -6,8 +6,7 @@
   terms of the Eclipse Public License v1.0 which accompanies this distribution,
   and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
     <reference id="pathComputationProvider" interface="org.opendaylight.algo.PathComputationProvider"/>
     <reference id="connectedGraphProvider" interface="org.opendaylight.graph.ConnectedGraphProvider" />

diff --git a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
index 9055be4d8668981403d7d25a727d6551db767ccf..3fa2cfdddbb16165b50a90c679232b3cd05f4505 100644 (file)
--- a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
+++ b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml
@@ -6,8 +6,7 @@
   terms of the Eclipse Public License v1.0 which accompanies this distribution,
   and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
     <bean id="PCEPTopologySessionListenerFactory"
           class="org.opendaylight.bgpcep.pcep.topology.provider.PCEPTopologySessionListenerFactory"/>

diff --git a/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml b/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml
index 26bb4b902c6416c82a93dd94e0742f7783134f7c..1272b8c6613a55a13b0a418f1737f2428f52bfaa 100644 (file)
--- a/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml
+++ b/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml
@@ -6,8 +6,7 @@
   terms of the Eclipse Public License v1.0 which accompanies this distribution,
   and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<blueprint xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
     <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
     <reference id="rpcProviderService" interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
     <reference id="rpcConsumerRegistry" interface="org.opendaylight.mdsal.binding.api.RpcConsumerRegistry"/>