Skip to content

Commit e1ff4fb

Browse files
committed
Upgrade to Jackson Bom 2.19.0
Closes gh-45542
1 parent 2ca0ac0 commit e1ff4fb

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ checkstyleToolVersion=10.12.4
1111
commonsCodecVersion=1.18.0
1212
graalVersion=22.3
1313
hamcrestVersion=3.0
14-
jacksonVersion=2.18.4
14+
jacksonVersion=2.19.0
1515
javaFormatVersion=0.0.43
1616
junitJupiterVersion=5.12.2
1717
kotlinVersion=1.9.25

spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,10 @@ bom {
692692
because "we don't want release candidates"
693693
}
694694
group("com.fasterxml.jackson") {
695-
bom("jackson-bom")
695+
bom("jackson-bom") {
696+
permit("com.fasterxml.woodstox:woodstox-core")
697+
permit("org.codehaus.woodstox:stax2-api")
698+
}
696699
}
697700
links {
698701
releaseNotes("https://github.com/FasterXML/jackson/wiki/Jackson-Release-{version}")

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackLayersMetadata.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ private void addBuildpackVersions(String id, BuildpackVersions versions) {
118118

119119
private static Buildpacks fromJson(JsonNode node) {
120120
Buildpacks buildpacks = new Buildpacks();
121-
node.fields()
122-
.forEachRemaining((field) -> buildpacks.addBuildpackVersions(field.getKey(),
121+
node.properties()
122+
.forEach((field) -> buildpacks.addBuildpackVersions(field.getKey(),
123123
BuildpackVersions.fromJson(field.getValue())));
124124
return buildpacks;
125125
}
@@ -140,8 +140,8 @@ private void addBuildpackVersion(String version, BuildpackLayerDetails details)
140140

141141
private static BuildpackVersions fromJson(JsonNode node) {
142142
BuildpackVersions versions = new BuildpackVersions();
143-
node.fields()
144-
.forEachRemaining((field) -> versions.addBuildpackVersion(field.getKey(),
143+
node.properties()
144+
.forEach((field) -> versions.addBuildpackVersion(field.getKey(),
145145
BuildpackLayerDetails.fromJson(field.getValue())));
146146
return versions;
147147
}

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ protected <T> T valueAt(String expression, Class<T> type) {
9090
protected <V> Map<String, V> mapAt(String expression, Function<JsonNode, V> valueMapper) {
9191
Map<String, V> map = new LinkedHashMap<>();
9292
getNode().at(expression)
93-
.fields()
94-
.forEachRemaining((entry) -> map.put(entry.getKey(), valueMapper.apply(entry.getValue())));
93+
.properties()
94+
.forEach((entry) -> map.put(entry.getKey(), valueMapper.apply(entry.getValue())));
9595
return Collections.unmodifiableMap(map);
9696
}
9797

0 commit comments

Comments
 (0)