commit 021329b7e79a387c7b2cc5d483dd36a55c4c5014
author Deanna Garcia <deannagarcia@google.com> Tue May 25 17:27:07 2021 +0000
committer Deanna Garcia <deannagarcia@google.com> Tue May 25 17:27:07 2021 +0000
tree d343523effedf39f5a3d2c77b38bf002d8bf7c6b
parent 2f8d310048f38ea90cad5e78cbd23f27d09f61c9

resolving conflicts

java/kotlin-lite/pom.xml

diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
index c7201ae..4c7361b 100644
--- a/java/kotlin-lite/pom.xml
+++ b/java/kotlin-lite/pom.xml
@@ -8,7 +8,6 @@
   </parent>
 
   <artifactId>protobuf-kotlin-lite</artifactId>
-  <packaging>bundle</packaging>
 
   <name>Protocol Buffers [Lite]</name>
   <description>
@@ -263,22 +262,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <!-- OSGI bundle configuration -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
-            <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
-            <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
-            <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
-            <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>

java/kotlin/pom.xml

diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
index cf48a1c..23f515d 100644
--- a/java/kotlin/pom.xml
+++ b/java/kotlin/pom.xml
@@ -8,7 +8,6 @@
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>
-  <packaging>bundle</packaging>
 
   <name>Protocol Buffers [Core]</name>
   <description>
@@ -219,21 +218,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- OSGI bundle configuration -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
-            <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
-            <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
-            <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
-            <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>