From: Stephen Kitt <skitt@redhat.com>
Date: Fri, 21 Oct 2016 08:59:50 +0000 (+0200)
Subject: Fully specify distribution.opendaylight-karaf
X-Git-Tag: release/carbon~429
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=919fc8c18575fc76e6b69508b38a272147be7796

Fully specify distribution.opendaylight-karaf

... and karaf-parent while we're at it.

This is necessary in particular to put distribution.opendaylight-karaf
back in org.opendaylight.controller, and allow controller to merge
again...

Change-Id: I277b21f31168e6cb22ac4b332c26475debd8974d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml
index 4f1ca9e3da..673d2c5863 100644
--- a/karaf/karaf-parent/pom.xml
+++ b/karaf/karaf-parent/pom.xml
@@ -17,6 +17,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>karaf-parent</artifactId>
+  <version>1.8.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
 
diff --git a/karaf/opendaylight-karaf/pom.xml b/karaf/opendaylight-karaf/pom.xml
index 5972269db2..a120b5a7f8 100644
--- a/karaf/opendaylight-karaf/pom.xml
+++ b/karaf/opendaylight-karaf/pom.xml
@@ -7,7 +7,9 @@
     <version>1.8.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
+  <groupId>org.opendaylight.controller</groupId>
   <artifactId>distribution.opendaylight-karaf</artifactId>
+  <version>1.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <dependencies>