Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove maven-bundle-plugin to fix duplicate class errors #8653

Merged
merged 11 commits into from May 25, 2021
+0 −33
Merged

Remove maven-bundle-plugin to fix duplicate class errors #8653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
eb3ab8c
Add headerfiles to Makefile
deannagarcia May 14, 2021
f9a60fc
Add another header to Makefile
deannagarcia May 14, 2021
76bd17c
Add another file to Makefile
deannagarcia May 14, 2021
f447554
Updating makefile to pass the tests
deannagarcia May 18, 2021
6319a23
Run update_file_lists.sh
deannagarcia May 20, 2021
eb57ffe
Reverting last change since tests are still failing
deannagarcia May 20, 2021
2f8d310
Fixing objc tests
deannagarcia May 24, 2021
021329b
resolving conflicts
deannagarcia May 25, 2021
713f2d0
Removing files that were added during rebasing
deannagarcia May 25, 2021
3f8f6e9
Removing more files that were added during rebasing
deannagarcia May 25, 2021
5fac12f
Reverting the Makefile spacing changes
deannagarcia May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 0 additions & 17 deletions java/kotlin-lite/pom.xml
View file
Open in desktop
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
View file
Open in desktop
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