Added move of branding jar to assembly

Change-Id: I2fcef68141f977c662ba3d0d1e24250d03ab0dcc
Signed-off-by: Heath Kesler <hkesler@savoirtech.com>
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>

diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml
index ade907044527acc18f9561b12da0c796339c4811..67c30454f86cc7b640c871b2e89955dda452262e 100644 (file)
--- a/opendaylight/distribution/opendaylight-karaf/pom.xml
+++ b/opendaylight/distribution/opendaylight-karaf/pom.xml
@@ -208,24 +208,27 @@
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
         <version>2.6</version>
         <executions>
           <execution>
-            <id>copy-resources</id>
+            <id>copy</id>
             <goals>
-              <goal>copy-resources</goal>
+              <goal>copy</goal>
             </goals>
             <!-- here the phase you need -->
-            <phase>process-resources</phase>
+            <phase>generate-resources</phase>
             <configuration>
-              <outputDirectory>${basedir}/target/assembly</outputDirectory>
-              <overwrite>true</overwrite>
-              <resources>
-                <resource>
-                  <directory>${basedir}/src/main/resources</directory>
-                </resource>
-              </resources>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.opendaylight.controller</groupId>
+                  <artifactId>karaf.branding</artifactId>
+                  <version>${karaf.branding.version}</version>
+                  <outputDirectory>target/assembly/lib</outputDirectory>
+                  <destFileName>karaf.branding-${branding.version}.jar</destFileName>
+                </artifactItem>
+              </artifactItems>
             </configuration>
           </execution>
         </executions>