X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight-karaf%2Fpom.xml;h=efb7a374f3281056403001ca2466d4e90b1c8842;hp=377785ac41a21b4013587303cd64c68211baf1ea;hb=fe5ef8066b0dd57df46e5b8806020ceb41716efb;hpb=32674123f97aecb36a57927389fcc1bb9d92c3f8
diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml
index 377785ac41..efb7a374f3 100644
--- a/opendaylight/distribution/opendaylight-karaf/pom.xml
+++ b/opendaylight/distribution/opendaylight-karaf/pom.xml
@@ -24,11 +24,14 @@
org.opendaylight.controller
- config-features
- ${config.version}
- features
- xml
- runtime
+ base-features
+ ${project.version}
+ kar
+
+
+ org.opendaylight.controller
+ karaf.branding
+ compile
org.opendaylight.controller
base-features
- ${project.version}
- kar
+ ${project.parent.version}
+ features
+ xml
runtime
-
+
org.opendaylight.controller
- base-features
+ extras-features
${project.version}
- features
- xml
+ kar
runtime
- -->
-
org.opendaylight.controller
- mdsal-features
- ${mdsal.version}
+ features-adsal
+ ${sal.version}
features
xml
runtime
- org.opendaylight.yangtools
- features-file
- ${yangtools.version}
+ org.opendaylight.controller
+ mdsal-features
+ ${mdsal.version}
features
xml
runtime
@@ -205,24 +207,27 @@
- 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
+
+