Browse Source

Upgrade to Jackson Bom 2.19.0

Closes gh-45542
pull/45554/head
Stéphane Nicoll 8 months ago
parent
commit
e1ff4fbaf9
  1. 2
      gradle.properties
  2. 5
      spring-boot-project/spring-boot-dependencies/build.gradle
  3. 8
      spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackLayersMetadata.java
  4. 4
      spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java

2
gradle.properties

@ -11,7 +11,7 @@ checkstyleToolVersion=10.12.4 @@ -11,7 +11,7 @@ checkstyleToolVersion=10.12.4
commonsCodecVersion=1.18.0
graalVersion=22.3
hamcrestVersion=3.0
jacksonVersion=2.18.4
jacksonVersion=2.19.0
javaFormatVersion=0.0.43
junitJupiterVersion=5.12.2
kotlinVersion=1.9.25

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

@ -692,7 +692,10 @@ bom { @@ -692,7 +692,10 @@ bom {
because "we don't want release candidates"
}
group("com.fasterxml.jackson") {
bom("jackson-bom")
bom("jackson-bom") {
permit("com.fasterxml.woodstox:woodstox-core")
permit("org.codehaus.woodstox:stax2-api")
}
}
links {
releaseNotes("https://github.com/FasterXML/jackson/wiki/Jackson-Release-{version}")

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

@ -118,8 +118,8 @@ final class BuildpackLayersMetadata extends MappedObject { @@ -118,8 +118,8 @@ final class BuildpackLayersMetadata extends MappedObject {
private static Buildpacks fromJson(JsonNode node) {
Buildpacks buildpacks = new Buildpacks();
node.fields()
.forEachRemaining((field) -> buildpacks.addBuildpackVersions(field.getKey(),
node.properties()
.forEach((field) -> buildpacks.addBuildpackVersions(field.getKey(),
BuildpackVersions.fromJson(field.getValue())));
return buildpacks;
}
@ -140,8 +140,8 @@ final class BuildpackLayersMetadata extends MappedObject { @@ -140,8 +140,8 @@ final class BuildpackLayersMetadata extends MappedObject {
private static BuildpackVersions fromJson(JsonNode node) {
BuildpackVersions versions = new BuildpackVersions();
node.fields()
.forEachRemaining((field) -> versions.addBuildpackVersion(field.getKey(),
node.properties()
.forEach((field) -> versions.addBuildpackVersion(field.getKey(),
BuildpackLayerDetails.fromJson(field.getValue())));
return versions;
}

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

@ -90,8 +90,8 @@ public class MappedObject { @@ -90,8 +90,8 @@ public class MappedObject {
protected <V> Map<String, V> mapAt(String expression, Function<JsonNode, V> valueMapper) {
Map<String, V> map = new LinkedHashMap<>();
getNode().at(expression)
.fields()
.forEachRemaining((entry) -> map.put(entry.getKey(), valueMapper.apply(entry.getValue())));
.properties()
.forEach((entry) -> map.put(entry.getKey(), valueMapper.apply(entry.getValue())));
return Collections.unmodifiableMap(map);
}

Loading…
Cancel
Save