Skip to content

Commit 5ad9f42

Browse files
authored
Try to fix #160 (OSGi dep problem wrt Guava) (#161)
1 parent f76649a commit 5ad9f42

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

guava/pom.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ Guava (https://github.com/google/guava) types (currently mostly just collection
3838
<!-- 28-Feb-2023, tatu: 2.15 raises baseline from 21.x to 23.x -->
3939
<!-- 01-May-2023, tatu: 2.16 raises baseline from 23.x to 25.x -->
4040
<version.guava>25.1-jre</version.guava>
41+
<!-- 10-Sep-2024, tatu: [datatypes-collections#160] OSGi version bit different: -->
42+
<version.guava.osgi-base>25.1.0</version.guava.osgi-base>
4143

4244
<javac.src.version>1.8</javac.src.version>
4345
<javac.target.version>1.8</javac.target.version>
4446

4547
<!-- 31-Jul-2020, tatu: remove upper limit for Jackson 2.12; tested up to 30.x -->
46-
<version.guava.osgi>[${version.guava}.0,99)</version.guava.osgi>
48+
<version.guava.osgi>[${version.guava.osgi-base},99)</version.guava.osgi>
4749

4850
<!-- Generate PackageVersion.java into this directory. -->
4951
<packageVersion.dir>com/fasterxml/jackson/datatype/guava</packageVersion.dir>

release-notes/VERSION-2.x

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Active Maintainers:
1818

1919
2.18.0 (not yet released)
2020

21+
#160: (guava) Defect guava OSGi dependency version specified?
22+
(reported by @jpstotz)
2123
- HPPC dependency upgraded to 0.9.1 (from 0.8.2)
2224

2325
2.17.2 (05-Jul-2024)

0 commit comments

Comments
 (0)