Adds OVSDB to Base - per TSC vote on Nov 7, 2013

Change-Id: I2b8bb22569077fc2c869f19a439b9dc0b93b9a77
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/distributions/base/pom.xml b/distributions/base/pom.xml
index ada013abd94e8335f30b89989f6386edd7af3cab..b5b6a2ba16ccec144adbe85e487619014e02ff88 100644 (file)
--- a/distributions/base/pom.xml
+++ b/distributions/base/pom.xml
@@ -1,10 +1,10 @@
-<!--                                                                                                                                     
-Adapted from David Erickson's Distribution pom.xml                                                                                       
-see https://git.opendaylight.org/gerrit/#/c/390/                                                                                         
+<!--
+Adapted from David Erickson's Distribution pom.xml
+see https://git.opendaylight.org/gerrit/#/c/390/
 -->
 <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                                                                                    
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -17,7 +17,6 @@ http://maven.apache.org/maven-v4_0_0.xsd">
   <artifactId>distributions-base</artifactId>
   <packaging>pom</packaging>
   <name>OpenDaylight Base Edition</name>
-
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -28,6 +27,12 @@ http://maven.apache.org/maven-v4_0_0.xsd">
       <!-- Make sure this isn't included on any classpath-->
       <scope>provided</scope>
     </dependency>
+    <!-- ovsdb -->
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>ovsdb</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
   </dependencies>
   <build>
     <resources>

diff --git a/distributions/base/src/assemble/bin.xml b/distributions/base/src/assemble/bin.xml
index 197935be819eccaa58c2089b2e19b418fe446169..f96368a088d08c1fa64fb6ce35315d4d3c8e62d1 100644 (file)
--- a/distributions/base/src/assemble/bin.xml
+++ b/distributions/base/src/assemble/bin.xml
@@ -8,6 +8,37 @@
     <format>zip</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>opendaylight/plugins</outputDirectory>
+      <excludes>
+        <exclude>equinoxSDK381:org.eclipse.osgi</exclude>
+        <exclude>equinoxSDK381:org.eclipse.equinox.console</exclude>
+        <exclude>equinoxSDK381:org.eclipse.equinox.launcher</exclude>
+        <exclude>equinoxSDK381:org.eclipse.equinox.ds</exclude>
+        <exclude>equinoxSDK381:org.eclipse.equinox.util</exclude>
+        <exclude>equinoxSDK381:org.eclipse.osgi.services</exclude>
+        <exclude>virgomirror:org.eclipse.jdt.core.compiler.batch</exclude>
+        <exclude>org.apache.felix:org.apache.felix.fileinstall</exclude>
+        <exclude>geminiweb:org.eclipse.virgo.kernel.equinox.extensions</exclude>
+        <exclude>org.slf4j:slf4j-api</exclude>
+        <exclude>ch.qos.logback:logback-core</exclude>
+        <exclude>ch.qos.logback:logback-classic</exclude>
+        <exclude>com.sun.jersey:jersey-core</exclude>
+        <exclude>com.sun.jersey:jersey-json</exclude>
+        <exclude>com.sun.jersey:jersey-server</exclude>
+        <exclude>org.opendaylight.defense4all:defense4all.core.impl</exclude>
+        <exclude>org.opendaylight.defense4all:framework.core.impl</exclude>
+        <exclude>org.opendaylight.defense4all:defense4all.restservice</exclude>
+      </excludes>
+      <outputFileNameMapping>
+        ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
+      </outputFileNameMapping>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+    </dependencySet>
+  </dependencySets>
   <fileSets>
     <fileSet>
       <directory>${project.build.directory}/generated-resources</directory>