X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight-karaf%2Fpom.xml;h=761c1620ba27b7014b2a2d340a00962ac8a55509;hb=1e9ecb12a453b0e4dec447fdddd612bd1b1f4722;hp=06e0a92fa6cf3d1c0656736c65f2d0cc76d0cc09;hpb=d255fdd0b14660a22ff63771d954ac3fe5d0cb7e;p=controller.git
diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml
index 06e0a92fa6..761c1620ba 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.4.2-Helium
../../commons/opendaylight
distribution.opendaylight-karaf
@@ -24,66 +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
+ features-adsal
+ features
+ xml
org.opendaylight.controller
- config-netty-features
- ${config.version}
+ features-nsf
features
xml
- runtime
+
org.opendaylight.controller
- features-adsal
- ${sal.version}
+ features-mdsal
features
xml
- runtime
org.opendaylight.controller
- mdsal-features
- ${mdsal.version}
+ features-flow
features
xml
- runtime
@@ -227,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
-
-
-
-
-
-
-
-
-
-
-