Manual merge of #161 to 3.0/master

FasterXML · Sep 10, 2024 · 919f331 · 919f331
1 parent 8281a2f
commit 919f331
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/guava/pom.xml b/guava/pom.xml
@@ -29,7 +29,9 @@ Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just c
     <!-- In Jackson 2.18 was guava 25.1-jre
       -->
     <version.guava>33.1.0-jre</version.guava>
-    <version.guava.osgi>[${version.guava}.0,99)</version.guava.osgi>
+    <!-- 10-Sep-2024, tatu: [datatypes-collections#160] OSGi version bit different: -->
+    <version.guava.osgi-base>25.1.0</version.guava.osgi-base>
+    <version.guava.osgi>[${version.guava.osgi-base},99)</version.guava.osgi>
 
     <!-- Generate PackageVersion.java into this directory. -->
     <packageVersion.dir>tools/jackson/datatype/guava</packageVersion.dir>