X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=karaf%2Fpom.xml;h=7395a4d727faa5f041a37250abde8bc176a0aa1a;hp=1d37ae1b04a22898ec0311474358203d0bbcbb96;hb=6b79f859a8da16fe15e47b85bb8309cd4ae0fd1c;hpb=2e5fefe4f1833e5209a4a0ecf2e4e245b1b89e3b

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 1d37ae1b04..7395a4d727 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -1,28 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.parent</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../opendaylight/commons/parent</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>karaf4-parent</artifactId>
+    <version>4.0.5</version>
+    <relativePath/>
   </parent>
 
-  <artifactId>karaf-aggregator</artifactId>
+  <groupId>org.opendaylight.controller</groupId>
+  <artifactId>distribution.opendaylight-karaf</artifactId>
+  <version>1.12.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <modules>
-    <module>karaf-branding</module>
-    <module>karaf-parent</module>
-    <module>opendaylight-karaf</module>
-    <module>opendaylight-karaf-empty</module>
-    <module>opendaylight-karaf-resources</module>
-  </modules>
+
+  <dependencies>
+    <dependency>
+      <!-- scope is compile so all features (there is only one) are installed
+                 into startup.properties and the feature repo itself is not installed -->
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>framework</artifactId>
+      <type>kar</type>
+    </dependency>
+
+    <!--
+          controller provided features:
+          Note: Nothing should go here that is not locked
+          down with testing... ie, no broken feature repos
+    -->
+
+    <!-- MD-SAL Related Features -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <version>1.9.0-SNAPSHOT</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-extras</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <version>3.0.2</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <scm>
+    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
 </project>