From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 13 Apr 2018 15:17:28 +0000 (+0000)
Subject: Merge "Add archive creation to POM file"
X-Git-Tag: v1.2.0~79
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dc99e44fd343d7236bfa4c4d54f8444c421b0e72;hp=446bddb6f3b9b14144b96db50d44ff2c8723e051;p=demo.git

Merge "Add archive creation to POM file"
---

diff --git a/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml b/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml
index 8fff6bc0..90f5770b 100644
--- a/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml
+++ b/vnfs/vLBMS/apis/vlb-vnf-onap-distribution/pom.xml
@@ -1,12 +1,6 @@
 <?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">
 
-  <!--parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>minimal-distribution-parent</artifactId>
-    <version>1.17.07</version>
-  </parent-->
-
   <parent>
     <artifactId>demo-aggregator</artifactId>
     <version>1.2.0-SNAPSHOT</version>
@@ -54,9 +48,56 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+              <useBaseVersion>true</useBaseVersion>
+              <useRepositoryLayout>true</useRepositoryLayout>
+              <excludeArtifactIds>yang-jmx-generator</excludeArtifactIds>
+            </configuration>
+           </execution>
+           <execution>
+             <id>unpack-configuration</id>
+             <phase>prepare-package</phase>
+             <goals>
+               <goal>unpack-dependencies</goal>
+             </goals>
+             <configuration>
+               <includes>**/honeycomb-minimal-resources/</includes>
+               <outputDirectory>${project.build.outputDirectory}/</outputDirectory>
+             </configuration>
+           </execution>
+         </executions>
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>io.fd.honeycomb.common</groupId>
+            <artifactId>minimal-assembly-descriptor</artifactId>
+            <version>1.17.07</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>create-archive</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptorRefs>
+                <descriptorRef>honeycomb-minimal</descriptorRef>
+              </descriptorRefs>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -90,33 +131,9 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <!--plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.6.7</version>
-        <extensions>true</extensions>
-        <configuration>
-          <nexusUrl>https://nexus.onap.org/</nexusUrl>
-          <stagingProfileId>176c31dfe190a</stagingProfileId>
-          <serverId>ecomp-staging</serverId>
-        </configuration>
-      </plugin-->
     </plugins>
   </build>
 
-  <!--distributionManagement>
-    <repository>
-      <id>ecomp-releases</id>
-      <name>Demo Release Repository</name>
-      <url>https://nexus.onap.org/content/repositories/releases/</url>
-    </repository>
-    <snapshotRepository>
-      <id>ecomp-snapshots</id>
-      <name>Demo Snapshot Repository</name>
-      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement-->
-
   <dependencies>
     <!-- Dependency on sample plugin -->
     <dependency>