X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fdistribution%2Fopendaylight-karaf%2Fpom.xml;h=977fab1334ae48791f9901aedbc1420eabb1e2e7;hb=8dfb1b7e0d6490bfd64502027785204c113d0044;hp=ade907044527acc18f9561b12da0c796339c4811;hpb=b1ad47e987f7e73ebcd44f2076f57550715f75d6;p=controller.git
diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml
index ade9070445..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-file
- ${yangtools.version}
+ org.opendaylight.controller
+ features-restconf
+ 1.2.0-SNAPSHOT
features
xml
runtime
+
+
+ org.opendaylight.controller
+ features-netconf-connector
+ features
+ xml
+
+
@@ -202,32 +229,84 @@
org.apache.maven.plugins
maven-checkstyle-plugin
- ${checkstyle.version}
**\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/
- 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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+