commit 080e3067b92bed7e7347f5656a569116491dbbc6
author deannagarcia <69992229+deannagarcia@users.noreply.github.com> Thu Mar 09 11:06:44 2023 -0800
committer GitHub <noreply@github.com> Thu Mar 09 11:06:44 2023 -0800
tree 092ee638277e2eabcb5fb278f45ba7c3aa04b3e3
parent be7f6b06c0c1082c43e3bf225a66cafaf26d68e6
parent d80c12d3221fd489b779fccf0020a17bd666a311

Merge pull request #12189 from deannagarcia/poms

Add $ back for osgi header

java/core/pom_template.xml

diff --git a/java/core/pom_template.xml b/java/core/pom_template.xml
index a5ea5e3..11bd419 100644
--- a/java/core/pom_template.xml
+++ b/java/core/pom_template.xml
@@ -31,7 +31,7 @@
             <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>
+            <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
             <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
           </instructions>
         </configuration>

java/lite/pom_template.xml

diff --git a/java/lite/pom_template.xml b/java/lite/pom_template.xml
index 878b646..728c291 100644
--- a/java/lite/pom_template.xml
+++ b/java/lite/pom_template.xml
@@ -31,7 +31,7 @@
             <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>
+            <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
             <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
           </instructions>
         </configuration>

java/util/pom_template.xml

diff --git a/java/util/pom_template.xml b/java/util/pom_template.xml
index 456aac4..77ffa85 100644
--- a/java/util/pom_template.xml
+++ b/java/util/pom_template.xml
@@ -32,7 +32,7 @@
             <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>
+            <Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package>
           </instructions>
         </configuration>
       </plugin>