From a455c0557295088c23e502b438e15d2d409e7a04 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@google.com>
Date: Sun, 5 Feb 2017 17:32:19 -0500
Subject: [PATCH 1/4] add OSGI metadata

---
 google-api-client/pom.xml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index 71edbb65a..032cd52f7 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -36,20 +36,42 @@
         <configuration>
           <archive>
             <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
         </configuration>
         <executions>
           <execution>
             <id>jar</id>
-            <phase>compile</phase>
+            <phase>package</phase>
             <goals>
               <goal>jar</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
+      <plugin>   
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.4</version>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>    
+              <goal>manifest</goal>
+            </goals>   
+          </execution>
+        </executions>
+        <configuration>
+          <instructions>
+            <Bundle-DocURL>https://developers.google.com/api-client-library/java/</Bundle-DocURL>
+            <Bundle-Description>The Google API Client Library for Java provides functionality common to all Google APIs; for example HTTP transport, error handling, authentication, JSON parsing, media download/upload, and batching.</Bundle-Description>
+            <Bundle-SymbolicName>com.google.api.client.googleapis</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>

From 3a4a3fdc7a25978aa2a9c41332a5093023a10de0 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@google.com>
Date: Mon, 6 Feb 2017 14:51:54 -0500
Subject: [PATCH 2/4] more default behavior

---
 google-api-client/pom.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index 032cd52f7..cf2f93ebc 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -41,15 +41,6 @@
              <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
         </configuration>
-        <executions>
-          <execution>
-            <id>jar</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
       <plugin>   
         <groupId>org.apache.felix</groupId>
@@ -77,7 +68,6 @@
         <executions>
           <execution>
             <id>source-jar</id>
-            <phase>compile</phase>
             <goals>
               <goal>jar</goal>
             </goals>

From 4d85d84955dc028e0a2089122230e85d2f566684 Mon Sep 17 00:00:00 2001
From: Elliotte Harold <elharo@google.com>
Date: Thu, 6 Sep 2018 18:12:02 -0400
Subject: [PATCH 3/4] add OSGI info

---
 google-api-client-jackson2/pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
index 17bb9bba4..e2be54ecd 100644
--- a/google-api-client-jackson2/pom.xml
+++ b/google-api-client-jackson2/pom.xml
@@ -41,6 +41,27 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>   
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.4</version>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>    
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <instructions>
+            <Bundle-DocURL>https://developers.google.com/api-client-library/java/google-http-java-client/reference/1.20.0/jdiff/Google_HTTP_Client_Library_for_Java_1.19.0/com/google/api/client/json/jackson2/package-summary</Bundle-DocURL>
+            <Bundle-Description>Low-level implementation of the JSON parser library based on the Jackson 2 JSON library.</Bundle-Description>
+            <Bundle-SymbolicName>com.google.api.client.jackson2</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>

From b7f568eda8b848afe0897d31b4ed6a185c843d32 Mon Sep 17 00:00:00 2001
From: Elliotte Harold <elharo@google.com>
Date: Thu, 6 Sep 2018 18:14:27 -0400
Subject: [PATCH 4/4] whitespace

---
 google-api-client/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index d43a91bbf..03542e7e4 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -36,7 +36,7 @@
         <configuration>
           <archive>
             <manifest>
-<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
@@ -50,7 +50,7 @@
           <execution>
             <id>bundle-manifest</id>
             <phase>process-classes</phase>
-            <goals>    
+            <goals>
               <goal>manifest</goal>
             </goals>
           </execution>