Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12177 from deannagarcia/fixPom

Browse Source 
Fix pom file errors caused by the extra "$"
pull/12189/head
deannagarcia 2 years ago committed by GitHub
parent 832a19627a 8ac2337595
commit be7f6b06c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      java/core/pom_template.xml
  2. 2
      java/kotlin-lite/pom_template.xml
  3. 2
      java/kotlin/pom_template.xml
  4. 2
      java/lite/pom_template.xml
  5. 4
      java/util/pom_template.xml

2
java/core/pom_template.xml
Unescape View File

@ -31,7 +31,7 @@
<Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name --> <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>
<Import-Package>sun.misc;resolution:=optional,*</Import-Package> <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>

2
java/kotlin-lite/pom_template.xml
Unescape View File

@ -17,7 +17,7 @@
</description> </description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${groupId}</groupId> <groupId>{groupId}</groupId>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>
</dependency> </dependency>
{dependencies} {dependencies}

2
java/kotlin/pom_template.xml
Unescape View File

@ -17,7 +17,7 @@
</description> </description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${groupId}</groupId> <groupId>{groupId}</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
</dependency> </dependency>
{dependencies} {dependencies}

2
java/lite/pom_template.xml
Unescape View File

@ -31,7 +31,7 @@
<Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name --> <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>
<Import-Package>sun.misc;resolution:=optional,*</Import-Package> <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
</instructions> </instructions>
</configuration> </configuration>

4
java/util/pom_template.xml
Unescape View File

@ -14,7 +14,7 @@
<description>Utilities for Protocol Buffers</description> <description>Utilities for Protocol Buffers</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${groupId}</groupId> <groupId>{groupId}</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
</dependency> </dependency>
{dependencies} {dependencies}
@ -32,7 +32,7 @@
<Automatic-Module-Name>com.google.protobuf.util</Automatic-Module-Name> <!-- Java9+ Jigsaw module name --> <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>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>

Write Preview
Loading…
Cancel
Save