Manual merge of #72 fix for master as well

FasterXML · Jun 9, 2020 · 8e9d5fb · 8e9d5fb
1 parent 17c8f60
commit 8e9d5fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/jr-annotation-support/pom.xml b/jr-annotation-support/pom.xml
@@ -12,10 +12,13 @@
 </description>
   <url>https://github.com/FasterXML/jackson-jr</url>
   <properties>
+    <!-- Looks like we need to be bit careful on OSGi exports, to avoid
+        accidentally double-exporting jr-objects types
+      -->
+    <osgi.export>${project.groupId}.annotationsupport;version=${project.version}</osgi.export>
+
     <packageVersion.dir>com/fasterxml/jackson/jr/annotationsupport</packageVersion.dir>
     <packageVersion.package>${project.groupId}.annotationsupport</packageVersion.package>
-    <packageVersion.template.input>${basedir}/src/main/java/${packageVersion.dir}/PackageVersion.java.in</packageVersion.template.input>
-    <packageVersion.template.output>${generatedSourcesDir}/${packageVersion.dir}/PackageVersion.java</packageVersion.template.output>
   </properties>
 
   <dependencies>

diff --git a/jr-retrofit2/pom.xml b/jr-retrofit2/pom.xml
@@ -14,8 +14,11 @@
         accidentally double-exporting jr-objects types
       -->
     <osgi.export>
-${project.groupId}.retrofit2
+${project.groupId}.retrofit2;version=${project.version}
     </osgi.export>
+
+    <!-- No PackageVersion defined or needed, since N/A for this package
+      -->
   </properties>
 
   <dependencies>

diff --git a/jr-stree/pom.xml b/jr-stree/pom.xml
@@ -12,10 +12,13 @@ has no other dependencies.
 </description>
   <url>https://github.com/FasterXML/jackson-jr</url>
   <properties>
+    <!-- Looks like we need to be bit careful on OSGi exports, to avoid
+        accidentally double-exporting jr-objects types
+      -->
+    <osgi.export>${project.groupId}.stree;version=${project.version}</osgi.export>
+
     <packageVersion.dir>com/fasterxml/jackson/jr/stree</packageVersion.dir>
     <packageVersion.package>${project.groupId}.stree</packageVersion.package>
-    <packageVersion.template.input>${basedir}/src/main/java/${packageVersion.dir}/PackageVersion.java.in</packageVersion.template.input>
-    <packageVersion.template.output>${generatedSourcesDir}/${packageVersion.dir}/PackageVersion.java</packageVersion.template.output>
   </properties>
 
   <dependencies>