X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight-karaf%2Fpom.xml;h=a09d550c36145c541f7be76ca2b41758db98a69b;hp=b3c3f20ba80bb5cc829c5a208669a239ec8a1981;hb=be852eb7b2d122da61cad918a4f8cc672ecb5af5;hpb=b725fdb758008195a98f7fad0fd3804c363170aa
diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml
index b3c3f20ba8..a09d550c36 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
@@ -24,74 +24,65 @@
org.opendaylight.controller
- base-features
- ${project.version}
- kar
+ karaf.branding
+ compile
+
+
org.opendaylight.controller
- karaf.branding
- compile
+ opendaylight-karaf-resources
+ ${project.version}
-
+
+
org.apache.karaf.features
standard
${karaf.version}
features
xml
- runtime
+
+
+
+
org.opendaylight.controller
- base-features
- ${project.parent.version}
+ features-base
features
xml
- runtime
-
-
-
- org.opendaylight.controller
- extras-features
- ${project.version}
- kar
- runtime
-
org.opendaylight.controller
features-adsal
features
xml
- runtime
org.opendaylight.controller
features-nsf
- ${project.version}
features
xml
- runtime
-
org.opendaylight.controller
features-mdsal
features
xml
- runtime
org.opendaylight.controller
features-flow
features
xml
- runtime
@@ -235,30 +226,61 @@
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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- org.apache.maven.plugins
- maven-antrun-plugin
-
-
- prepare-package
-
- run
-
-
-
-
-
-
-
-
-
-
-