Bug 6278: Copy karaf-parent from controller to odlparent

[controller.git] / opendaylight / commons / opendaylight / pom.xml

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 98e957e38dac4bdb6307c96ec6a212209da6bdfc..38d9ac2ce103ea8e98f76d06786f1585f9a1af3f 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -85,9 +85,12 @@
     <ietf-topology.version>2013.10.21.9-SNAPSHOT</ietf-topology.version>
     <ietf-yang-types.version>2013.07.15.9-SNAPSHOT</ietf-yang-types.version>
     <jdepend.maven.plugin.version>2.0-beta-2</jdepend.maven.plugin.version>
+
+    <!-- Path prefix where we generate configuration subsystem bindings -->
     <jmxGeneratorPath>target/generated-sources/config-binding</jmxGeneratorPath>
+
     <jolokia-bridge.version>0.3.0-SNAPSHOT</jolokia-bridge.version>
-    <karaf.branding.version>1.3.0-SNAPSHOT</karaf.branding.version>
+    <karaf.branding.version>1.7.0-SNAPSHOT</karaf.branding.version>
     <karaf.shell.version>${karaf.version}</karaf.shell.version>
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
     <logging.bridge.version>0.7.0-SNAPSHOT</logging.bridge.version>
@@ -110,7 +113,11 @@
     <sal.implementation.version>0.7.0-SNAPSHOT</sal.implementation.version>
     <sal.networkconfiguration.version>0.3.0-SNAPSHOT</sal.networkconfiguration.version>
     <sal.version>0.11.0-SNAPSHOT</sal.version>
-    <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+
+    <!-- Path prefix where we generate YANG Java Bindings. This really should be inherited
+         from mdsal's binding-parent -->
+    <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
+
     <samples.loadbalancer>0.8.0-SNAPSHOT</samples.loadbalancer>
     <samples.loadbalancer.northbound.version>0.7.0-SNAPSHOT</samples.loadbalancer.northbound.version>
     <samples.simpleforwarding.version>0.7.0-SNAPSHOT</samples.simpleforwarding.version>
@@ -435,7 +442,7 @@
       </dependency>
       <!-- Karaf Dependencies -->
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf.branding</artifactId>
         <version>${karaf.branding.version}</version>
       </dependency>