From: Maros Marsalek <mmarsale@cisco.com>
Date: Thu, 13 Nov 2014 15:30:23 +0000 (+0100)
Subject: BUG-2345 Move bouncycastle bundles from netconf-connector to netconf feature
X-Git-Tag: release/lithium~878^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=39e75ee0a85e686cf2a4fea4a3ea67df5dd9f01b

BUG-2345 Move bouncycastle bundles from netconf-connector to netconf feature

Apache mina sshd bundle is located in features-netconf and bouncycastle in features-netconf-connector.
This is wrong because mina sshd depends directly on bouncycastle but marks the dependency as optional which is probably not correct because this can result in runtime errors instead of resolution problems.

Change-Id: Ic9ef61294069859788fd10366e50b71f5bac9a43
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---

diff --git a/features/netconf-connector/src/main/resources/features.xml b/features/netconf-connector/src/main/resources/features.xml
index 614c9d013a..863833bcc0 100644
--- a/features/netconf-connector/src/main/resources/features.xml
+++ b/features/netconf-connector/src/main/resources/features.xml
@@ -108,8 +108,6 @@
         -->
         <feature version='${aaa.version}'>odl-aaa-netconf-plugin</feature>
         <bundle>mvn:org.opendaylight.controller/netconf-ssh/${netconf.version}</bundle>
-        <bundle>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
-        <bundle>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
       </feature>
       <feature name='odl-netconf-tcp' version='${netconf.version}' description="OpenDaylight :: Netconf Connector :: TCP">
         <feature version='${netconf.version}'>odl-netconf-impl</feature>
diff --git a/features/netconf/src/main/resources/features.xml b/features/netconf/src/main/resources/features.xml
index fb668ae15a..9de15630c3 100644
--- a/features/netconf/src/main/resources/features.xml
+++ b/features/netconf/src/main/resources/features.xml
@@ -57,6 +57,8 @@
     <feature version='${project.version}'>odl-netconf-mapping-api</feature>
     <feature version='${project.version}'>odl-netconf-util</feature>
     <bundle>mvn:org.opendaylight.controller/netconf-netty-util/${project.version}</bundle>
+    <bundle>mvn:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version}</bundle>
+    <bundle>mvn:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version}</bundle>
     <bundle>mvn:org.apache.sshd/sshd-core/${sshd-core.version}</bundle>
     <bundle>mvn:org.openexi/nagasena/${exi.nagasena.version}</bundle>
     <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>