Skip to content

Commit 49f0c9a

Browse files
committed
Merge branch '2.x' into 3.x
2 parents 7aea196 + adcc4d0 commit 49f0c9a

File tree

4 files changed

+11
-22
lines changed

4 files changed

+11
-22
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ permissions:
1313
contents: read
1414

1515
env:
16-
GUAVA_DEFAULT: '33.1.0-jre'
16+
GUAVA_DEFAULT: '33.4.8-jre'
1717
GUAVA_MIN: '25.1-jre'
18-
GUAVA_MAX: '33.1.0-jre'
18+
GUAVA_MAX: '33.4.8-jre'
1919
jobs:
2020
build:
2121
runs-on: 'ubuntu-24.04'
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
java_version: ['17', '21']
25+
java_version: ['17', '21', '24']
2626
guava_version: [ $GUAVA_DEFAULT, $GUAVA_MIN, $GUAVA_MAX ]
2727
# Indicate combination for which Snapshot build enabled
2828
include:
@@ -64,7 +64,7 @@ jobs:
6464
run: ./mvnw -B -q -ff -ntp test
6565
- name: Publish code coverage
6666
if: ${{ github.event_name != 'pull_request' && matrix.snapshot && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
67-
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
67+
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
6868
with:
6969
token: ${{ secrets.CODECOV_TOKEN }}
7070
files: ./target/site/jacoco/jacoco.xml

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ To use these format backends Maven-based projects, use following dependency:
2828
<dependency>
2929
<groupId>com.fasterxml.jackson.datatype</groupId>
3030
<artifactId>jackson-datatype-[COLLECTION]</artifactId>
31-
<version>2.13.3</version>
31+
<version>2.19.1</version>
3232
</dependency>
3333
```
3434

guava/README.md

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To use module on Maven-based projects, use following dependency:
1212
<dependency>
1313
<groupId>com.fasterxml.jackson.datatype</groupId>
1414
<artifactId>jackson-datatype-guava</artifactId>
15-
<version>3.0.0-SNAPSHOT</version>
15+
<version>3.0.0-rc5</version>
1616
</dependency>
1717
```
1818

@@ -29,6 +29,8 @@ Following table shows the tested working ranges for recent module versions.
2929
| Module version | Min Guava | Default Guava | Max Guava |
3030
| -------------- | --------- | ------------- | --------- |
3131
| 3.0 | 25.1-jre | 25.1-jre | 33.1.0-jre|
32+
| 2.20 | 22.0 | 25.1-jre | 33.4.8-jre|
33+
| 2.19 | 20.0 | 25.1-jre | 33.1.0-jre|
3234
| 2.18 | 20.0 | 25.1-jre | 33.1.0-jre|
3335
| 2.17 | 20.0 | 25.1-jre | 33.1.0-jre|
3436
| 2.16 | 20.0 | 25.1-jre | 33.1.0-jre|
@@ -42,28 +44,15 @@ Following table shows the tested working ranges for recent module versions.
4244

4345
Notes:
4446

45-
* At the point of testing, `31.1-jre` was the latest available Guava library
47+
* At the point of testing of 2.14 - 2.19,, `31.1-jre` was the latest available Guava library
4648
version, so all versions work with the latest Guava
4749
* "Min Guava" means the earliest version that integration tests pass with
4850
* "Default Guava" is the dependency specified in module's `pom.xml`: it is used for build, unit tests
4951
* Build (compilation, running of unit tests) works on a subset of specified compatibility range: typically version needed is above "Min Guava", but lower than "Max Guava"
5052

5153
### Registering module
5254

53-
Like all standard Jackson modules (libraries that implement Module interface), registration is done as follows (Jackson 2.x up to 2.9)
54-
55-
```java
56-
// New (2.10+)
57-
ObjectMapper mapper = JsonMapper.builder()
58-
.addModule(new GuavaModule())
59-
.build();
60-
61-
// Old (before 2.10, but works on all 2.x)
62-
ObjectMapper mapper = new ObjectMapper()
63-
.registerModule(new GuavaModule());
64-
```
65-
66-
OR, the new method added in 2.10 (old method will work with 2.x but not 3.x):
55+
Like all standard Jackson modules (libraries that implement Module interface), registration is done as follows:
6756

6857
```java
6958
ObjectMapper mapper = JsonMapper.builder()

release-notes/VERSION-2.x

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Active Maintainers:
2121
#190: Add unit tests to verify goodness of SPI metadata for Modules
2222
- Generate SBOMs [JSTEP-14]
2323

24-
2.19.1 (not yet released)
24+
2.19.1 (13-Jun-2025)
2525

2626
#185: `ACCEPT_SINGLE_VALUE_AS_ARRAY` doesn't work on Guava `ImmutableList`
2727
(reported by Gergely J)

0 commit comments

Comments
 (0)