From b8ec7d291dc4eba168c624ea0c0132d14f4ad90d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 14 Apr 2023 08:59:18 +0100 Subject: [PATCH] Upgrade to Jackson Bom 2.15.0-rc2 Closes gh-34980 --- .../spring-boot-dependencies/build.gradle | 2 +- .../spring-boot-buildpack-platform/build.gradle | 12 ++++++++++++ .../spring-boot-gradle-plugin/build.gradle | 12 ++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index b8201fc9e1b..1c18a23159d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -435,7 +435,7 @@ bom { ] } } - library("Jackson Bom", "2.14.2") { + library("Jackson Bom", "2.15.0-rc2") { group("com.fasterxml.jackson") { imports = [ "jackson-bom" diff --git a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle index 4ead0f73276..d890be6a2af 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle @@ -6,6 +6,18 @@ plugins { description = "Spring Boot Buildpack Platform" +configurations.all { + resolutionStrategy { + eachDependency { dependency -> + // Downgrade Jackson as Gradle cannot cope with 2.15.0's multi-version + // jar files with bytecode in META-INF/versions/19 + if (dependency.requested.group.startsWith("com.fasterxml.jackson")) { + dependency.useVersion("2.14.2") + } + } + } +} + dependencies { api("com.fasterxml.jackson.core:jackson-databind") api("com.fasterxml.jackson.module:jackson-module-parameter-names") diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index 72fb53e212c..6a3c5bd1718 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -15,7 +15,19 @@ configurations { // Downgrade SLF4J is required for tests to run in Eclipse resolutionStrategy.force("org.slf4j:slf4j-api:1.7.36") } + all { + resolutionStrategy { + eachDependency { dependency -> + // Downgrade Jackson as Gradle cannot cope with 2.15.0's multi-version + // jar files with bytecode in META-INF/versions/19 + if (dependency.requested.group.startsWith("com.fasterxml.jackson")) { + dependency.useVersion("2.14.2") + } + } + } + } } + dependencies { asciidoctorExtensions("io.spring.asciidoctor:spring-asciidoctor-extensions-section-ids")