Merge "Do not send bridge name in update"

[ovsdb.git] / distribution / opendaylight-karaf / pom.xml

diff --git a/distribution/opendaylight-karaf/pom.xml b/distribution/opendaylight-karaf/pom.xml
index fa465df7c962576fd5fe263bfc5c4ecd0ba912da..f73eca7675e30a1a3d0379177d1663754d57c7dd 100644 (file)
--- a/distribution/opendaylight-karaf/pom.xml
+++ b/distribution/opendaylight-karaf/pom.xml
@@ -1,25 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<!--
+Copyright (C) 2014 Red Hat, 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.ovsdb</groupId>
     <artifactId>commons</artifactId>
     <version>1.3.0-SNAPSHOT</version>
     <relativePath>../../commons/parent/</relativePath>
   </parent>
+
   <artifactId>distribution-karaf</artifactId>
   <groupId>org.opendaylight.ovsdb</groupId>
-  <name>OpenDaylight OVSDB Karaf Distribution</name>
   <packaging>pom</packaging>
+
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.1.1</maven>
   </prerequisites>
+
   <properties>
     <branding.version>1.1.0-SNAPSHOT</branding.version>
     <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
-    <karaf.version>3.0.1</karaf.version>
     <karaf.branding.version>1.1.0-SNAPSHOT</karaf.branding.version>
-    <feature.ovsdb.version>1.1.0-SNAPSHOT</feature.ovsdb.version>
   </properties>
 
   <dependencies>
@@ -56,12 +66,16 @@
     <!-- Other ODL features needed -->
     <dependency>
       <groupId>org.opendaylight.integration</groupId>
-      <artifactId>features-integration</artifactId>
+      <artifactId>features-integration-index</artifactId>
       <version>0.3.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>features-ovsdb</artifactId>
+    </dependency>
   </dependencies>
 
   <build>