X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fdistribution%2Fopendaylight-karaf%2Fpom.xml;h=e44b569759d3b611d35fa730778ca7a16d565a00;hb=4206a55cd7724e15e3c5b7b5b7c12f78481384cf;hp=473dd8ee398b70856669193e3baaa5601ce8e0a2;hpb=3a487a410546572686d260c763998bfbf366a47e;p=controller.git
diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml
index 473dd8ee39..e44b569759 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
@@ -52,31 +52,59 @@
down with testing... ie, no broken feature repos
-->
-
+
org.opendaylight.controller
features-base
features
xml
+ runtime
org.opendaylight.controller
features-adsal
features
xml
+ runtime
+
+ org.opendaylight.controller
+ features-nsf
+ features
+ xml
+ runtime
+
+
org.opendaylight.controller
features-mdsal
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
+
+
@@ -193,7 +221,6 @@
org.apache.maven.plugins
maven-checkstyle-plugin
- ${checkstyle.version}
**\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/
@@ -219,6 +246,14 @@
target/assembly/lib
karaf.branding-${branding.version}.jar
+
+
+ org.bouncycastle
+ bcprov-jdk15on
+ ${bouncycastle.version}
+ target/assembly/lib/ext
+ bcprov-jdk15on-${bouncycastle.version}.jar
+
@@ -254,6 +289,11 @@
+
+
+
+
+