Skip to content

Commit dd3125c

Browse files
committed
Fix CI failure (unit test broken)
1 parent f5dbde4 commit dd3125c

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/main.yml

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

1515
env:
16-
GUAVA_DEFAULT: '33.3.1-jre'
16+
GUAVA_DEFAULT: '33.4.8-jre'
1717
GUAVA_MIN: '25.1-jre'
18-
GUAVA_MAX: '33.3.1-jre'
18+
GUAVA_MAX: '33.4.8-jre'
1919
jobs:
2020
build:
2121
runs-on: 'ubuntu-24.04'

guava/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Following table shows the tested working ranges for recent module versions.
2828

2929
| Module version | Min Guava | Default Guava | Max Guava |
3030
| -------------- | --------- | ------------- | --------- |
31-
| 3.0 | 25.1-jre | 33.3.1-jre | 33.4.8-jre|
31+
| 3.0 | 25.1-jre | 33.4.8-jre | 33.4.8-jre|
3232
| 2.20 | 22.0 | 25.1-jre | 33.4.8-jre|
3333
| 2.19 | 20.0 | 25.1-jre | 33.1.0-jre|
3434
| 2.18 | 20.0 | 25.1-jre | 33.1.0-jre|

guava/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just c
2727

2828
<properties>
2929
<!-- In Jackson 2.20 was guava 25.1-jre -->
30-
<version.guava>33.3.1-jre</version.guava>
30+
<version.guava>33.4.8-jre</version.guava>
3131
<!-- 10-Sep-2024, tatu: [datatypes-collections#160] OSGi version bit different: -->
32-
<version.guava.osgi-base>33.3.1</version.guava.osgi-base>
32+
<version.guava.osgi-base>33.4.8</version.guava.osgi-base>
3333
<version.guava.osgi>[${version.guava.osgi-base},99)</version.guava.osgi>
3434

3535
<!-- Generate PackageVersion.java into this directory. -->

guava/src/main/java/tools/jackson/datatype/guava/deser/InternetDomainNameDeserializer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public class InternetDomainNameDeserializer extends FromStringDeserializer<Inter
1717
protected InternetDomainName _deserialize(String value, DeserializationContext ctxt)
1818
throws JacksonException
1919
{
20+
System.err.println("InternetDomainNameDeserializer._deserialize called with value: " + value);
2021
return InternetDomainName.from(value);
2122
}
2223
}

guava/src/test/java/tools/jackson/datatype/guava/ScalarTypesTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ public void testInternetDomainNameSerialization() throws Exception
2424
public void testInternetDomainNameDeserialization() throws Exception
2525
{
2626
final String INPUT = "google.com";
27-
// InternetDomainName name = MAPPER.readValue(quote(INPUT), InternetDomainName.class);
28-
InternetDomainName name = new ObjectMapper().readValue(q(INPUT), InternetDomainName.class);
27+
InternetDomainName name = MAPPER.readValue(q(INPUT), InternetDomainName.class);
2928
assertNotNull(name);
3029
assertEquals(INPUT, name.toString());
3130
}

0 commit comments

Comments
 (0)