From 81c606b42af5e3d9839a8b34e97405d58528a3a7 Mon Sep 17 00:00:00 2001
From: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
Date: Fri, 7 Nov 2014 16:37:52 +0900
Subject: [PATCH] Include lldp-speaker application in VTN Manager binary
 distribution.

Change-Id: I5056dc66bdaf69361b92ffe93f386c9e2bf6fa56
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
---
 manager/common/pom.xml            | 25 ++++++++++++++++---------
 manager/dist/pom.xml              | 11 ++++++++++-
 manager/dist/src/assemble/bin.xml |  2 +-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/manager/common/pom.xml b/manager/common/pom.xml
index 5abbfe46..8dc9d0e9 100644
--- a/manager/common/pom.xml
+++ b/manager/common/pom.xml
@@ -71,7 +71,6 @@
     <!-- Karaf features -->
     <feature.adsal-compatibility.version>1.5.0-SNAPSHOT</feature.adsal-compatibility.version>
     <feature.nsf.version>0.5.0-SNAPSHOT</feature.nsf.version>
-    <feature.openflowplugin.version>0.1.0-SNAPSHOT</feature.openflowplugin.version>
     <feature.ovsdb.version>1.1.0-SNAPSHOT</feature.ovsdb.version>
     <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>
 
@@ -83,6 +82,9 @@
 
     <!-- Default checkstyle configuration -->
     <vtn.checkstyle.xml>vtn/checkstyle.xml</vtn.checkstyle.xml>
+
+    <!-- OpenDaylight artifacts -->
+    <odl.openflowplugin.version>0.1.0-SNAPSHOT</odl.openflowplugin.version>
   </properties>
 
   <profiles>
@@ -775,37 +777,42 @@
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-api</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>${odl.openflowplugin.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-extension-api</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>${odl.openflowplugin.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>${odl.openflowplugin.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-controller-config</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>${odl.openflowplugin.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-extension-nicira</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>${odl.openflowplugin.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowjava-extension-nicira-api</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>${odl.openflowplugin.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowjava-extension-nicira</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>${odl.openflowplugin.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.openflowplugin.applications</groupId>
+        <artifactId>lldp-speaker</artifactId>
+        <version>${odl.openflowplugin.version}</version>
       </dependency>
 
       <!-- OpenDaylight OVSDB project -->
@@ -880,7 +887,7 @@
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>features-openflowplugin</artifactId>
-        <version>${feature.openflowplugin.version}</version>
+        <version>${odl.openflowplugin.version}</version>
         <classifier>features</classifier>
         <type>xml</type>
         <scope>runtime</scope>
diff --git a/manager/dist/pom.xml b/manager/dist/pom.xml
index 3d10c0dd..dfbbbd1d 100644
--- a/manager/dist/pom.xml
+++ b/manager/dist/pom.xml
@@ -97,6 +97,10 @@
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>openflowjava-extension-nicira</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>lldp-speaker</artifactId>
+    </dependency>
 
     <!-- OpenDaylight ovsdb -->
     <dependency>
@@ -171,11 +175,16 @@
               <outputDirectory>
                 ${project.build.directory}/provided-configs
               </outputDirectory>
+              <includeGroupIds>
+                org.opendaylight.openflowplugin,
+                org.opendaylight.openflowplugin.applications
+              </includeGroupIds>
               <includeArtifactIds>
                 openflowplugin-controller-config,
                 openflowplugin-extension-nicira,
                 openflowjava-extension-nicira,
-                openflowjava-extension-nicira-api
+                openflowjava-extension-nicira-api,
+                lldp-speaker
               </includeArtifactIds>
               <includes>**\/*.xml</includes>
               <excludeTransitive>true</excludeTransitive>
diff --git a/manager/dist/src/assemble/bin.xml b/manager/dist/src/assemble/bin.xml
index b1d96c3b..a67fc990 100644
--- a/manager/dist/src/assemble/bin.xml
+++ b/manager/dist/src/assemble/bin.xml
@@ -83,7 +83,7 @@
     <dependencySet>
       <includes>
         <include>org.opendaylight.openflowjava:*</include>
-        <include>org.opendaylight.openflowplugin:*</include>
+        <include>org.opendaylight.openflowplugin*:*</include>
         <include>org.opendaylight.ovsdb:*</include>
       </includes>
       <excludes>
-- 
2.36.6