X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=karaf%2Fopendaylight-karaf%2Fpom.xml;h=a34361970dd19101b4ac773a6a43500910247c59;hp=e0ea4c0edffb3758a87e5d33b0576fbd7a58b54b;hb=8fefdf8981eaef2a8192238699011ac662152a1c;hpb=18cefe8da04b98855683d75be276b9f0e8f3ae73
diff --git a/karaf/opendaylight-karaf/pom.xml b/karaf/opendaylight-karaf/pom.xml
index e0ea4c0edf..a34361970d 100644
--- a/karaf/opendaylight-karaf/pom.xml
+++ b/karaf/opendaylight-karaf/pom.xml
@@ -4,14 +4,11 @@
org.opendaylight.controller
commons.opendaylight
- 1.5.0-SNAPSHOT
+ 1.7.0-SNAPSHOT
../../opendaylight/commons/opendaylight
distribution.opendaylight-karaf
pom
-
- 3.0
-
@@ -46,34 +43,20 @@
xml
+
+
+
+ org.apache.aries.proxy
+ org.apache.aries.proxy.impl
+ 1.0.5
+
+
-
-
- org.opendaylight.controller
- features-base
- features
- xml
- runtime
-
-
- org.opendaylight.controller
- features-adsal
- features
- xml
- runtime
-
-
- org.opendaylight.controller
- features-nsf
- features
- xml
- runtime
-
org.opendaylight.controller
@@ -91,36 +74,27 @@
runtime
- org.opendaylight.controller
- features-flow
- features
- xml
- runtime
-
-
- org.opendaylight.controller
- features-restconf
- 1.2.0-SNAPSHOT
+ org.opendaylight.mdsal
+ features-mdsal
features
xml
runtime
- org.opendaylight.controller
- features-neutron
- ${networkconfig.neutron.version}
+ org.opendaylight.mdsal.model
+ features-mdsal-model
features
xml
runtime
+
-
+
@@ -209,7 +183,6 @@
org.apache.karaf.tooling
karaf-maven-plugin
- ${karaf.version}
true
@@ -244,7 +217,6 @@
org.apache.maven.plugins
maven-dependency-plugin
- 2.6
copy
@@ -288,6 +260,23 @@
false
+
+ copy-dependencies
+ prepare-package
+
+ copy-dependencies
+
+
+ ${project.build.directory}/assembly/system
+ distribution.vtn-coordinator
+ false
+ true
+ true
+ true
+ true
+ true
+
+
@@ -312,6 +301,12 @@
+
+
+
+
@@ -320,7 +315,7 @@
- scm:git:ssh://git.opendaylight.org:29418/controller.git
+ scm:git:http://git.opendaylight.org/gerrit/controller.git
scm:git:ssh://git.opendaylight.org:29418/controller.git
HEAD
https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main