Move ovsdb distribution to use karaf-parent

Change-Id: Ief6939eb8f1cc15f1042ecc1fd7e549c60de57cc
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/commons/pom.xml b/commons/pom.xml
new file mode 100644 (file)
index 0000000..9300e7d
--- /dev/null
+++ b/commons/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2015 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>
+    <artifactId>commons</artifactId>
+    <groupId>org.opendaylight.ovsdb</groupId>
+    <version>1.3.0-SNAPSHOT</version>
+    <relativePath>../commons/parent/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>parents</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <name>${project.artifactId}</name>
+  <packaging>pom</packaging>
+
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+  <modules>
+    <module>integrationtest</module>
+    <module>parent</module>
+  </modules>
+</project>

diff --git a/features/pom.xml b/features/pom.xml
new file mode 100644 (file)
index 0000000..4ecff05
--- /dev/null
+++ b/features/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2015 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>
+    <artifactId>commons</artifactId>
+    <groupId>org.opendaylight.ovsdb</groupId>
+    <version>1.3.0-SNAPSHOT</version>
+    <relativePath>../commons/parent/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>features</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <name>${project.artifactId}</name>
+  <packaging>pom</packaging>
+
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+  <modules>
+    <module>ovs-sfc</module>
+    <module>ovsdb</module>
+  </modules>
+</project>

diff --git a/karaf/pom.xml b/karaf/pom.xml
new file mode 100644 (file)
index 0000000..9cbd631
--- /dev/null
+++ b/karaf/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2015 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.controller</groupId>
+    <artifactId>karaf-parent</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <relativePath/>
+  </parent>
+
+  <groupId>org.opendaylight.ovsdb</groupId>
+  <artifactId>karaf</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <name>${project.artifactId}</name>
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+  <properties>
+    <!-- uncomment the next line if you want karaf to automatically load the feature -->
+    <!--<karaf.localFeature>odl-ovsdb-openstack</karaf.localFeature>-->
+  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>ovsdb-artifacts</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <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>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>features-ovsdb</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/openstack/pom.xml b/openstack/pom.xml
new file mode 100644 (file)
index 0000000..b02a855
--- /dev/null
+++ b/openstack/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2015 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>
+    <artifactId>commons</artifactId>
+    <groupId>org.opendaylight.ovsdb</groupId>
+    <version>1.3.0-SNAPSHOT</version>
+    <relativePath>../commons/parent/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>openstack</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <name>${project.artifactId}</name>
+  <packaging>pom</packaging>
+
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+  <modules>
+    <module>net-virt</module>
+    <module>net-virt-providers</module>
+  </modules>
+</project>

diff --git a/ovsdb-artifacts/pom.xml b/ovsdb-artifacts/pom.xml
new file mode 100644 (file)
index 0000000..9af4b8d
--- /dev/null
+++ b/ovsdb-artifacts/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2015 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>
+
+  <groupId>org.opendaylight.ovsdb</groupId>
+  <artifactId>ovsdb-artifacts</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>features-ovsdb</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>

diff --git a/ovsdb-plugin-compatibility-layer/pom.xml b/ovsdb-plugin-compatibility-layer/pom.xml
index 32d625fd77662b11f84a45a015b3f7e1f4e3f8ee..22ed4dab510b4e577f46a26d61397f45f58aebcf 100755 (executable)
--- a/ovsdb-plugin-compatibility-layer/pom.xml
+++ b/ovsdb-plugin-compatibility-layer/pom.xml
@@ -1,5 +1,7 @@
 <?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">
+<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>
@@ -10,7 +12,7 @@
 
   <artifactId>ovsdb-plugin-compatibility-layer</artifactId>
   <version>1.1.0-SNAPSHOT</version>
-  <name>OpenDaylight OVSDB Plugin Compatibility Layer</name>
+  <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/pom.xml b/pom.xml
index 07770e929f54572e2bb4b1620134f2ddc77328bc..22f356d5558a14afd6a4d86a3a3287faa214fb1f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,21 +29,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <modules>
     <!-- Parent POM files -->
-    <module>commons/parent</module>
-    <module>commons/integrationtest</module>
-    <!--<module>distribution/opendaylight-karaf</module>-->
-    <module>features/ovsdb</module>
-    <module>features/ovs-sfc</module>
+    <module>commons</module>
+    <module>features</module>
+    <module>karaf</module>
     <!-- OVSDB Components -->
     <module>library</module>
     <module>northbound</module>
-    <module>openstack/net-virt</module>
-    <module>openstack/net-virt-providers</module>
+    <module>openstack</module>
     <module>plugin</module>
+    <module>ovsdb-artifacts</module>
     <module>ovsdb-plugin-compatibility-layer</module>
     <module>plugin-shell</module>
-    <module>schemas/hardwarevtep</module>
-    <module>schemas/openvswitch</module>
+    <module>schemas</module>
     <module>southbound</module>
     <module>utils</module>
     <!-- Integration Tests -->

diff --git a/schemas/pom.xml b/schemas/pom.xml
new file mode 100644 (file)
index 0000000..3f02ff9
--- /dev/null
+++ b/schemas/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (C) 2015 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>
+    <artifactId>commons</artifactId>
+    <groupId>org.opendaylight.ovsdb</groupId>
+    <version>1.3.0-SNAPSHOT</version>
+    <relativePath>../commons/parent/pom.xml</relativePath>
+  </parent>
+
+  <artifactId>schemas</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <name>${project.artifactId}</name>
+  <packaging>pom</packaging>
+
+  <prerequisites>
+    <maven>3.1.1</maven>
+  </prerequisites>
+  <modules>
+    <module>hardwarevtep</module>
+    <module>openvswitch</module>
+  </modules>
+</project>