From ae2029fae55e08ebf0cd3826c3c1b78342b6e4ae Mon Sep 17 00:00:00 2001
From: Matt Bishop <matt@thebishops.org>
Date: Tue, 1 Dec 2015 15:09:29 -0800
Subject: [PATCH] Replaced maven-bundle-plugin with jar manifest template.
 Picks up build-helper-maven-plugin config correctly.

---
 osgi-over-slf4j/pom.xml                        | 18 +-----------------
 .../src/main/resources/META-INF/MANIFEST.MF    |  8 ++++++++
 2 files changed, 9 insertions(+), 17 deletions(-)
 create mode 100644 osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF

diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
index 7c38b36d..b7129043 100755
--- a/osgi-over-slf4j/pom.xml
+++ b/osgi-over-slf4j/pom.xml
@@ -12,7 +12,7 @@
 
   <artifactId>osgi-over-slf4j</artifactId>
 
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>OSGi LogService implemented over SLF4J</name>
 
   <url>http://www.slf4j.org</url>
@@ -41,20 +41,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.7</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.osgi.service.log</Export-Package>
-            <Bundle-Activator>org.slf4j.osgi.logservice.impl.Activator</Bundle-Activator>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..3f9f8b18
--- /dev/null
+++ b/osgi-over-slf4j/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Implementation-Title: osgi-over-slf4j
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.slf4j.osgi-over-slf4j
+Bundle-Name: OSGi LogService implemented over SLF4J
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Activator: org.slf4j.osgi.logservice.impl.Activator
+Export-Package: org.osgi.service.log;uses:="org.osgi.framework";version=${parsedVersion.osgiVersion}
+Import-Package: org.osgi.framework;"[1.5,2)",org.osgi.service.log;version="[1.3,2)",org.slf4j;version=${parsedVersion.osgiVersion}