X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fdistribution%2Fopendaylight-karaf%2Fpom.xml;h=221bfa78e8972822b43894cd039b306456839e3b;hb=be852eb7b2d122da61cad918a4f8cc672ecb5af5;hp=1414fac2f33999f02ed9f5c7877530b51d47d7ac;hpb=a25b22f4ffd549acf1d50ecff77abe8519096a4c;p=controller.git
diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml
index 1414fac2f3..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,48 +24,65 @@
org.opendaylight.controller
- config-features
- ${config.version}
- features
- xml
- runtime
+ karaf.branding
+ compile
-
-
+
+ org.opendaylight.controller
+ opendaylight-karaf-resources
+ ${project.version}
+
+
+
org.apache.karaf.features
standard
${karaf.version}
features
xml
- runtime
+
+
+
+
+
+
+ org.opendaylight.controller
+ features-base
+ features
+ xml
org.opendaylight.controller
- controller-features
- ${project.version}
+ features-adsal
features
xml
- runtime
- -->
org.opendaylight.controller
- mdsal-features
- ${mdsal.version}
+ features-nsf
features
xml
- runtime
+
- org.opendaylight.yangtools
- features-file
- ${yangtools.version}
+ org.opendaylight.controller
+ features-mdsal
+ features
+ xml
+
+
+ org.opendaylight.controller
+ features-flow
features
xml
- runtime
@@ -189,26 +206,79 @@
- maven-resources-plugin
+ org.apache.maven.plugins
+ maven-dependency-plugin
2.6
- copy-resources
+ copy
- copy-resources
+ copy
- process-resources
+ generate-resources
- ${basedir}/target/assembly
- true
-
-
- ${basedir}/src/main/resources
-
-
+
+
+ org.opendaylight.controller
+ karaf.branding
+ ${karaf.branding.version}
+ 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+