Fix OSGI metadata for gson and jackson2 packages (#1251)

* merge OSGI metadata * add OSGI for GSON * restore Automatic Module Name
googleapis · May 13, 2019 · 4010170 · 4010170
1 parent 4da27fa
commit 4010170
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml
@@ -26,6 +26,7 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
@@ -35,6 +36,27 @@
           </archive>
         </configuration>
       </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://googleapis.dev/java/google-api-client/1.28.0/index.html</Bundle-DocURL>
+            <Bundle-Description>GSON extensions to the Google APIs Client Library for Java</Bundle-Description>
+            <Bundle-SymbolicName>com.google.api.client.googleapis.notifications.json.gson</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
         <executions>

diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
@@ -26,6 +26,7 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
@@ -35,22 +36,22 @@
           </archive>
         </configuration>
       </plugin>
-      <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>    
+            <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.26.0-android/jdiff/Google_HTTP_Client_Library_for_Java_1.19.0/com/google/api/client/json/jackson2/package-summary</Bundle-DocURL>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/1.28.0/index.html</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>