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 3a92b467f1a7c1bbfd4f3465ae84a411664b32b1..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>
-  <version>1.1.0-SNAPSHOT</version>
   <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>
-    <feature.ovsdb.version>1.1.0-SNAPSHOT</feature.ovsdb.version>
-    <feature.ovsdb.openstack.version>1.1.0-SNAPSHOT</feature.ovsdb.openstack.version>
+    <karaf.branding.version>1.1.0-SNAPSHOT</karaf.branding.version>
   </properties>
 
   <dependencies>
@@ -36,7 +46,6 @@
       <version>${karaf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
-      <scope>runtime</scope>
     </dependency>
 
     <!-- ODL Branding -->
@@ -54,31 +63,18 @@
       <version>${karaf.resources.version}</version>
     </dependency>
 
+    <!-- Other ODL features needed -->
     <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-ovsdb</artifactId>
-      <version>${feature.ovsdb.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-openflow-nxm</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <groupId>org.opendaylight.integration</groupId>
+      <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-ovs-sfc</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
+      <artifactId>features-ovsdb</artifactId>
     </dependency>
   </dependencies>
 
@@ -170,15 +166,6 @@
         <artifactId>karaf-maven-plugin</artifactId>
         <version>${karaf.version}</version>
         <extensions>true</extensions>
-        <configuration>
-          <bootFeatures>
-            <feature>standard</feature>
-              <feature>odl-base-all</feature>
-              <feature>odl-adsal-northbound</feature>
-              <feature>odl-openflow-nxm-extensions</feature>
-              <feature>odl-nsf-all</feature>
-          </bootFeatures>
-        </configuration>
         <executions>
           <execution>
             <id>process-resources</id>
@@ -198,7 +185,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
         <executions>
           <execution>
             <id>copy</id>
@@ -226,7 +213,6 @@
             <phase>prepare-package</phase>
             <configuration>
              <outputDirectory>${project.build.directory}/assembly</outputDirectory>
-             <groupId>org.opendaylight.controller</groupId>
              <includeArtifactIds>opendaylight-karaf-resources</includeArtifactIds>
              <excludes>META-INF\/**</excludes>
              <excludeTransitive>true</excludeTransitive>