X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight-karaf%2Fpom.xml;h=f4ca2217cead1947d1f43db90461b2e0a6db7925;hb=13bc7fa54d688d59131c462c731fe6d0f59d83ec;hp=8a23a6b5e60e64a6baaf20fd9d7d9712894f57dd;hpb=5135f2d97f0886632f3ad3b7160a3be54909810f;p=controller.git
diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml
index 8a23a6b5e6..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
@@ -27,65 +27,92 @@
karaf.branding
compile
-
+
+
+
+ org.opendaylight.controller
+ opendaylight-karaf-resources
+ ${project.version}
+
+
+
org.apache.karaf.features
standard
${karaf.version}
features
xml
- runtime
+
+
+
+
org.opendaylight.controller
- base-features
- ${project.version}
- kar
+ features-base
+ features
+ xml
runtime
org.opendaylight.controller
- config-features
- ${config.version}
+ features-adsal
features
xml
runtime
-
-
+
org.opendaylight.controller
- controller-features
- ${project.version}
+ features-mdsal
features
xml
runtime
- -->
+
+ org.opendaylight.controller
+ features-extras
+ ${project.version}
+ features
+ xml
+ runtime
+
org.opendaylight.controller
- mdsal-features
- ${mdsal.version}
+ features-flow
features
xml
runtime
- org.opendaylight.yangtools
- features-yangtools
- ${yangtools.version}
+ org.opendaylight.controller
+ features-restconf
+ 1.2.0-SNAPSHOT
features
xml
runtime
+
+
+ org.opendaylight.controller
+ features-netconf-connector
+ features
+ xml
+
+
@@ -202,7 +229,6 @@
org.apache.maven.plugins
maven-checkstyle-plugin
- ${checkstyle.version}
**\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/
@@ -228,9 +254,59 @@
target/assembly/lib
karaf.branding-${branding.version}.jar
+
+
+ org.bouncycastle
+ bcprov-jdk15on
+ ${bouncycastle.version}
+ target/assembly/lib/ext
+ bcprov-jdk15on-${bouncycastle.version}.jar
+
+
+ unpack-karaf-resources
+
+ unpack-dependencies
+
+ prepare-package
+
+ ${project.build.directory}/assembly
+ org.opendaylight.controller
+ opendaylight-karaf-resources
+ META-INF\/**
+ true
+ false
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+ prepare-package
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+