From 4eff1a855f342f1b36117535218762f3257ae78c Mon Sep 17 00:00:00 2001
From: Sean Bright <sean@transparentbpo.com>
Date: Tue, 23 Feb 2016 11:25:21 -0500
Subject: [PATCH] Restore OSGi manifest headers

Commit 2016e95 removed the necessary MANIFEST.MF headers for Gson to
resolve in an OSGi environment. This patch restores them.
---
 gson/bnd.bnd | 14 ++++++++++++++
 gson/pom.xml | 12 ++++++++++++
 pom.xml      |  7 +++++++
 3 files changed, 33 insertions(+)
 create mode 100644 gson/bnd.bnd

diff --git a/gson/bnd.bnd b/gson/bnd.bnd
new file mode 100644
index 00000000..c98fcfd3
--- /dev/null
+++ b/gson/bnd.bnd
@@ -0,0 +1,14 @@
+Bundle-SymbolicName: com.google.gson
+Bundle-Name: ${project.name}
+Bundle-Description: ${project.description}
+Bundle-Vendor: Google Gson Project
+Bundle-ContactAddress: ${project.parent.url}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6, JavaSE-1.7, JavaSE-1.8
+
+-removeheaders: Private-Package
+
+-exportcontents:\
+    com.google.gson,\
+    com.google.gson.annotations,\
+    com.google.gson.reflect,\
+    com.google.gson.stream
diff --git a/gson/pom.xml b/gson/pom.xml
index 7de4b8af..e3ce4515 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -31,6 +31,18 @@
           </links>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>bnd-process</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/pom.xml b/pom.xml
index e8b6fb96..d7f19f5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,13 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.10.3</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <useDefaultManifestFile>true</useDefaultManifestFile>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>