From 7bb330aaa9c1eb0504a2a735736e5363bc5b9094 Mon Sep 17 00:00:00 2001 From: artembilan Date: Wed, 9 Nov 2022 17:39:16 -0500 Subject: [PATCH] Re-order mavenBom imports It looks like some of Spring project's bom added after `spring-framework-bom` causes a mess with dependencies: it brings those SF deps which are in the latest `mavenBom` * Move `spring-framework-bom` to the end of the list to be sure that its version comes properly * Do the same for Spring Data - after Spring AMQP and Spring Kafka --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index c31ea9a7c3..d1d5aa82de 100644 --- a/build.gradle +++ b/build.gradle @@ -164,11 +164,6 @@ allprojects { imports { mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion" mavenBom "org.junit:junit-bom:$junitJupiterVersion" - mavenBom "org.springframework:spring-framework-bom:$springVersion" - mavenBom "org.springframework.data:spring-data-bom:$springDataVersion" - mavenBom "org.springframework.amqp:spring-amqp-bom:$springAmqpVersion" - mavenBom "org.springframework.kafka:spring-kafka-bom:$springKafkaVersion" - mavenBom "org.springframework.ws:spring-ws-bom:$springWsVersion" mavenBom "io.projectreactor:reactor-bom:$reactorVersion" mavenBom "org.apache.logging.log4j:log4j-bom:$log4jVersion" mavenBom "org.mockito:mockito-bom:$mockitoVersion" @@ -179,6 +174,11 @@ allprojects { mavenBom "org.apache.groovy:groovy-bom:$groovyVersion" mavenBom "org.springframework.security:spring-security-bom:$springSecurityVersion" mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:$kotlinCoroutinesVersion" + mavenBom "org.springframework.amqp:spring-amqp-bom:$springAmqpVersion" + mavenBom "org.springframework.kafka:spring-kafka-bom:$springKafkaVersion" + mavenBom "org.springframework.ws:spring-ws-bom:$springWsVersion" + mavenBom "org.springframework.data:spring-data-bom:$springDataVersion" + mavenBom "org.springframework:spring-framework-bom:$springVersion" } }