Browse Source

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

Java: Add Automatic-Module-Name entries to the Manifest
Rafi Kamal 6 năm trước cách đây
mục cha
commit
bc1773c42c
3 tập tin đã thay đổi với 3 bổ sung0 xóa
  1. 1 0
      java/core/pom.xml
  2. 1 0
      java/lite/pom.xml
  3. 1 0
      java/util/pom.xml

+ 1 - 0
java/core/pom.xml

@@ -144,6 +144,7 @@
         <extensions>true</extensions>
         <extensions>true</extensions>
         <configuration>
         <configuration>
           <instructions>
           <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-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
             <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
             <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
             <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
             <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>

+ 1 - 0
java/lite/pom.xml

@@ -324,6 +324,7 @@
         <extensions>true</extensions>
         <extensions>true</extensions>
         <configuration>
         <configuration>
           <instructions>
           <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-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
             <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
             <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
             <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
             <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>

+ 1 - 0
java/util/pom.xml

@@ -118,6 +118,7 @@
         <extensions>true</extensions>
         <extensions>true</extensions>
         <configuration>
         <configuration>
           <instructions>
           <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-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
             <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName>
             <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName>
             <Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package>
             <Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package>