X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fdistribution%2Fopendaylight-karaf%2Fpom.xml;h=e44b569759d3b611d35fa730778ca7a16d565a00;hb=4206a55cd7724e15e3c5b7b5b7c12f78481384cf;hp=06e0a92fa6cf3d1c0656736c65f2d0cc76d0cc09;hpb=723a9e90e2d36c55368f5b1801b8329ceba5c339;p=controller.git
diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml
index 06e0a92fa6..e44b569759 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,67 +24,87 @@
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
+
+
+
+
+
+
+ org.opendaylight.controller
+ features-base
+ features
+ xml
runtime
org.opendaylight.controller
- base-features
- ${project.parent.version}
+ features-adsal
features
xml
runtime
-
org.opendaylight.controller
- extras-features
- ${project.version}
- kar
+ features-nsf
+ features
+ xml
runtime
+
org.opendaylight.controller
- config-netty-features
- ${config.version}
+ features-mdsal
features
xml
runtime
org.opendaylight.controller
- features-adsal
- ${sal.version}
+ features-flow
features
xml
runtime
org.opendaylight.controller
- mdsal-features
- ${mdsal.version}
+ features-restconf
+ 1.2.0-SNAPSHOT
features
xml
runtime
+
+
+ org.opendaylight.controller
+ features-netconf-connector
+ features
+ xml
+
+
@@ -201,7 +221,6 @@
org.apache.maven.plugins
maven-checkstyle-plugin
- ${checkstyle.version}
**\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/
@@ -227,30 +246,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
-
-
-
-
-
-
-
-
-
-
-