From: Stephen Kitt <skitt@redhat.com>
Date: Thu, 10 Dec 2015 09:55:56 +0000 (+0100)
Subject: Make karaf-empty a POM package
X-Git-Tag: release/beryllium~97
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=5305c5579d7f9151c5b913cc20ae1b4fca381db2;hp=09419e51e2e0b771b1ae013bb4c8bdf7a4f984eb

Make karaf-empty a POM package

opendaylight-karaf-empty is currently a (default) JAR package, which
causes maven-install-plugin to try to install a JAR at all costs. It
ends up copying pom.xml to opendaylight-karaf-empty-....jar which
breaks anything then processing the JARs and expecting them to be
valid (e.g. for signing). Declaring that opendaylight-karaf-empty is a
POM package still produces the Karaf distributions along with the POM,
but avoids generating an invalid JAR.

Change-Id: I766acd4fd12002a05968b286a5290461c409c92e
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/karaf/opendaylight-karaf-empty/pom.xml b/karaf/opendaylight-karaf-empty/pom.xml
index b069acf881..d3f0916b09 100644
--- a/karaf/opendaylight-karaf-empty/pom.xml
+++ b/karaf/opendaylight-karaf-empty/pom.xml
@@ -11,6 +11,7 @@
   <artifactId>opendaylight-karaf-empty</artifactId>
   <version>1.6.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
+  <packaging>pom</packaging>
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>