X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight-karaf%2Fpom.xml;h=f4ca2217cead1947d1f43db90461b2e0a6db7925;hb=0230f37066dfd974accaf36bc712d6f1e60637d0;hp=cdc592428f9d685ab0e715a6e9f762e5a743cc83;hpb=e5a5a73c0ed9f298f539cfda61aa6ba8d3f65c9e;p=controller.git
diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml
index cdc592428f..f4ca2217ce 100644
--- a/opendaylight/distribution/opendaylight-karaf/pom.xml
+++ b/opendaylight/distribution/opendaylight-karaf/pom.xml
@@ -4,7 +4,7 @@
org.opendaylight.controller
commons.opendaylight
- 1.4.2-SNAPSHOT
+ 1.5.0-SNAPSHOT
../../commons/opendaylight
distribution.opendaylight-karaf
@@ -58,18 +58,21 @@
features-base
features
xml
+ runtime
org.opendaylight.controller
features-adsal
features
xml
+ runtime
org.opendaylight.controller
features-nsf
features
xml
+ runtime
@@ -77,13 +80,39 @@
features-mdsal
features
xml
+ runtime
+
+ org.opendaylight.controller
+ features-extras
+ ${project.version}
+ features
+ xml
+ runtime
+
org.opendaylight.controller
features-flow
features
xml
+ runtime
+
+ org.opendaylight.controller
+ features-restconf
+ 1.2.0-SNAPSHOT
+ features
+ xml
+ runtime
+
+
+
+ org.opendaylight.controller
+ features-netconf-connector
+ features
+ xml
+
+
@@ -200,7 +229,6 @@
org.apache.maven.plugins
maven-checkstyle-plugin
- ${checkstyle.version}
**\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/
@@ -226,6 +254,14 @@
target/assembly/lib
karaf.branding-${branding.version}.jar
+
+
+ org.bouncycastle
+ bcprov-jdk15on
+ ${bouncycastle.version}
+ target/assembly/lib/ext
+ bcprov-jdk15on-${bouncycastle.version}.jar
+