Skip to content

Commit

Permalink
Fix #105: upgrade Guava dep to 23.6.1-jre (from 21.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Mar 1, 2023
1 parent fa1097c commit 3250f3c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
5 changes: 3 additions & 2 deletions guava/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ Following table shows the tested working ranges for recent module versions.

| Module version | Min Guava | Default Guava | Max Guava |
| -------------- | --------- | ------------- | --------- |
| 2.14 | 14.0 | 21.0 | 30.1-jre |
| 2.15 | 14.0 | 23.6.1 | 31.1-jre |
| 2.14 | 14.0 | 21.0 | 31.1-jre |
| 2.13 | 14.0 | 21.0 | 30.1-jre |
| 2.12 | 14.0 | 21.0 | 30.1-jre |
| 2.11 | 14.0 | 20.0 | 30.1-jre |
Expand All @@ -37,7 +38,7 @@ Following table shows the tested working ranges for recent module versions.

Notes:

* At the point of testing, `30.1-jre` was the latest available Guava library
* At the point of testing, `31.1-jre` was the latest available Guava library
version, so all versions work with the latest Guava
* "Min Guava" means the earliest version that integration tests pass with
* "Default Guava" is the dependency specified in module's `pom.xml`: it is used for build, unit tests
Expand Down
5 changes: 3 additions & 2 deletions guava/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@ Guava (https://github.com/google/guava) types (currently mostly just collection
<properties>
<!-- 19-Jul-2019, tatu: and for 2.10, 18.0 to 20.0 (last pre-Java8 version) -->
<!-- 02-Aug-2020, tatu: 2.12 raises baseline from 20.0 to 21.0 -->
<version.guava>21.0</version.guava>
<!-- 28-Feb-2023, tatu: 2.15 raises baseline from 21.x to 23.x -->
<version.guava>23.6.1-jre</version.guava>

<!-- Guava 21.0 and later are Java 8 (JRE variant; android one not)
-->
<javac.src.version>1.8</javac.src.version>
<javac.target.version>1.8</javac.target.version>

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

<!-- Generate PackageVersion.java into this directory. -->
Expand Down
2 changes: 1 addition & 1 deletion release-notes/VERSION-2.x
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Active Maintainers:

2.15.0 (not yet released)

-
#105: (guava) Update Guava dependency to 23.6.1-jre (from 21.0)

2.14.2 (28-Jan-2023)
2.14.1 (21-Nov-2022)
Expand Down

0 comments on commit 3250f3c

Please sign in to comment.