Merge pull request #6568 from ennerf/add-jigsaw-module-name

Java: Add Automatic-Module-Name entries to the Manifest
6 years ago · bc1773c42c
parent 7ba4a99e00 405b618a2c
commit bc1773c42c
3 changed files with 3 additions and 0 deletions
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@ -144,6 +144,7 @@
        <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>
--- a/java/lite/pom.xml
+++ b/java/lite/pom.xml
@ -324,6 +324,7 @@
        <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>
--- a/java/util/pom.xml
+++ b/java/util/pom.xml
@ -118,6 +118,7 @@
        <extensions>true</extensions>
        <configuration>
          <instructions>
+            <Automatic-Module-Name>com.google.protobuf.util</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
            <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
            <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName>
            <Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package>