Skip to content

Commit

Permalink
Merge pull request #8653 from deannagarcia/fixDuplicateClassErrors
Browse files Browse the repository at this point in the history
Remove maven-bundle-plugin to fix duplicate class errors
  • Loading branch information
deannagarcia authored May 25, 2021
2 parents e635605 + 5fac12f commit b87d364
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 33 deletions.
17 changes: 0 additions & 17 deletions java/kotlin-lite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</parent>

<artifactId>protobuf-kotlin-lite</artifactId>
<packaging>bundle</packaging>

<name>Protocol Buffers [Lite]</name>
<description>
Expand Down Expand Up @@ -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>
16 changes: 0 additions & 16 deletions java/kotlin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</parent>

<artifactId>protobuf-kotlin</artifactId>
<packaging>bundle</packaging>

<name>Protocol Buffers [Core]</name>
<description>
Expand Down Expand Up @@ -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>

Expand Down

0 comments on commit b87d364

Please sign in to comment.