diff --git a/gradle.properties b/gradle.properties index 1e7c54029bd..51d11f10a17 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 22320f552af..4cb2e6522b1 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -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}") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackLayersMetadata.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackLayersMetadata.java index ac9f54591e9..eadb2c391ef 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/BuildpackLayersMetadata.java +++ b/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 { 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 { 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; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java index 936e57bfe8f..26b8b1a30b3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/json/MappedObject.java +++ b/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 { protected Map mapAt(String expression, Function valueMapper) { Map 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); }