Fixed distribution build parameters to pull in the Virtualization edition from Integr...

and replace it with the latest OVSDB bundles (ovsdb library, northbound and neutron).

This makes the OVSDB developers life simpler and avoids all the copy the bundle over issues and
provides a much simpler way to execute the controller with the OVSDB bundles being developed.
Run the controller normally :

run.sh -Xmx2048m -XX:MaxPermSize=512m -virt ovsdb [-of13]

Change-Id: Icd717639ca1768a87feefe550a2c1ac386359156
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/distribution/opendaylight/pom.xml b/distribution/opendaylight/pom.xml
index 2b5b0ce6b10e7104dfaa494c7dff324e33f403e2..74f819f06993fcb6a6437db3156d0a0ee74168b7 100755 (executable)
--- a/distribution/opendaylight/pom.xml
+++ b/distribution/opendaylight/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Adapted from David Erickson's Distribution pom.xml
 see https://git.opendaylight.org/gerrit/#/c/390/
@@ -14,23 +15,7 @@ see https://git.opendaylight.org/gerrit/#/c/390/
   <artifactId>distribution.ovsdb</artifactId>
   <packaging>pom</packaging>
   <name>ovsdb Distribution</name>
-
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
-    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
-    <tag>HEAD</tag>
-  </scm>
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>distribution.opendaylight</artifactId>
-      <version>0.1.2-SNAPSHOT</version>
-      <type>zip</type>
-      <classifier>osgipackage</classifier>
-      <!-- Make sure this isn't included on any classpath-->
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>ovsdb</artifactId>
@@ -38,14 +23,23 @@ see https://git.opendaylight.org/gerrit/#/c/390/
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb.northbound</artifactId>
-      <version>0.5.1-SNAPSHOT</version>
+      <artifactId>ovsdb.neutron</artifactId>
+      <version>0.7.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>ovsdb.neutron</artifactId>
+      <artifactId>ovsdb.northbound</artifactId>
       <version>0.5.1-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.integration</groupId>
+      <artifactId>distributions-virtualization</artifactId>
+      <version>0.1.2-SNAPSHOT</version>
+      <classifier>osgipackage</classifier>
+      <type>zip</type>
+      <!-- Make sure this isn't included on any classpath-->
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <build>
     <resources>
@@ -53,49 +47,58 @@ see https://git.opendaylight.org/gerrit/#/c/390/
         <directory>${basedir}/src/main/resources</directory>
       </resource>
       <resource>
-        <directory>${project.build.directory}/generated-resources</directory>
         <filtering>true</filtering>
+        <directory>${project.build.directory}/generated-resources</directory>
       </resource>
     </resources>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
+        <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
-            <id>unpack-shared-resources</id>
+            <id>distro-assembly</id>
             <goals>
-              <goal>unpack-dependencies</goal>
+              <goal>single</goal>
             </goals>
-            <phase>generate-resources</phase>
+            <phase>package</phase>
             <configuration>
-             <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-             <includeArtifactIds>distribution.opendaylight</includeArtifactIds>
-             <includeGroupIds>org.opendaylight.controller</includeGroupIds>
-             <excludeTransitive>true</excludeTransitive>
-             <ignorePermissions>false</ignorePermissions>
+              <descriptors>
+                <descriptor>src/assemble/bin.xml</descriptor>
+              </descriptors>
             </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.8</version>
         <executions>
           <execution>
-            <id>distro-assembly</id>
-            <phase>package</phase>
+            <id>unpack-shared-resources</id>
             <goals>
-              <goal>single</goal>
+              <goal>unpack-dependencies</goal>
             </goals>
+            <phase>generate-resources</phase>
             <configuration>
-              <descriptors>
-                <descriptor>src/assemble/bin.xml</descriptor>
-              </descriptors>
+              <outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+              <includeArtifactIds>distributions-virtualization</includeArtifactIds>
+              <includeGroupIds>org.opendaylight.integration</includeGroupIds>
+              <excludeTransitive>true</excludeTransitive>
+              <ignorePermissions>false</ignorePermissions>
             </configuration>
           </execution>
         </executions>
       </plugin>
     </plugins>
   </build>
+
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/ovsdb.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
+  </scm>
 </project>
+
+

diff --git a/distribution/opendaylight/src/assemble/bin.xml b/distribution/opendaylight/src/assemble/bin.xml
index b06e147dc61be9939ab0577ef7ae1533d938c399..346df3c7455809e43fd2acde249b45ecaa891a48 100644 (file)
--- a/distribution/opendaylight/src/assemble/bin.xml
+++ b/distribution/opendaylight/src/assemble/bin.xml
@@ -12,6 +12,9 @@
     <fileSet>
       <directory>${project.build.directory}/generated-resources</directory>
       <outputDirectory>/</outputDirectory>
+      <excludes>
+          <exclude>opendaylight/plugins/*ovsdb*</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
   <dependencySets>