Merge "Bug 6278: Depend on odlparent's version of karaf.branding & opendaylight-karaf...

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 61831c2df95fe4446d1c87aded8ff0b8c4cba917..05fab3d7479b9bffe94de37f536ca4a0390ae8ab 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -26,7 +26,7 @@
   <name>Parent POM</name>
 
   <properties>
-    <branding.version>1.3.0-SNAPSHOT</branding.version>
+    <branding.version>1.7.0-SNAPSHOT</branding.version>
     <build.suffix>1.0.0</build.suffix>
     <config.version>0.5.0-SNAPSHOT</config.version>
     <dlux.loader.version>0.4.0-SNAPSHOT</dlux.loader.version>
@@ -104,7 +104,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf.branding</artifactId>
         <version>${branding.version}</version>
         <scope>compile</scope>
@@ -122,7 +122,7 @@
       </dependency>
 
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>opendaylight-karaf-resources</artifactId>
         <version>${karaf.resources.version}</version>
       </dependency>