From: Michael Vorburger <vorburger@redhat.com>
Date: Tue, 31 Jan 2017 13:15:52 +0000 (+0100)
Subject: Remove bad manifestLocation from maven-bundle-plugin
X-Git-Tag: release/carbon~289
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=e7afc8d48820f29611dce22d3c93595dc37b8a74

Remove bad manifestLocation from maven-bundle-plugin

Change-Id: I7741c11a21393510af4dcb452e721abd236a9c2c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---

diff --git a/.gitignore b/.gitignore
index 7b1cbba777..9c5ee23714 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@ target-ide
 .classpath
 .project
 .settings
-MANIFEST.MF
 opendaylight/northbound/integrationtest/logs/*
 *.ipr
 *.iml
diff --git a/opendaylight/commons/liblldp/pom.xml b/opendaylight/commons/liblldp/pom.xml
index 62a21f23e4..e148d00164 100644
--- a/opendaylight/commons/liblldp/pom.xml
+++ b/opendaylight/commons/liblldp/pom.xml
@@ -48,7 +48,6 @@
             <Export-Package>
               org.opendaylight.controller.liblldp</Export-Package>
           </instructions>
-          <manifestLocation>${project.basedir}/META-INF</manifestLocation>
         </configuration>
       </plugin>
     </plugins>