BUG-2345 Move bouncycastle bundles from netconf-connector to netconf feature 17/12817/1
authorMaros Marsalek <mmarsale@cisco.com>
Thu, 13 Nov 2014 15:30:23 +0000 (16:30 +0100)
committerMaros Marsalek <mmarsale@cisco.com>
Thu, 13 Nov 2014 15:30:23 +0000 (16:30 +0100)
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>
features/netconf-connector/src/main/resources/features.xml
features/netconf/src/main/resources/features.xml

index 614c9d0..863833b 100644 (file)
         -->
         <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>
index fb668ae..9de1563 100644 (file)
@@ -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>