From: Lori Jakab <lorand.jakab@gmail.com>
Date: Thu, 28 Jul 2016 11:31:46 +0000 (+0000)
Subject: Merge "Bug 6278: Depend on odlparent's version of karaf.branding & opendaylight-karaf... 
X-Git-Tag: release/boron~30
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7e873fbac8f7f033fe61fac809a7e1b402cb3ea5;hp=b4418ca87e10e56a8af69d8b69fcac122d766c42;p=lispflowmapping.git

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

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 61831c2df..05fab3d74 100644
--- 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>