Merge branch '3.3.x'
Closes gh-41447
This commit is contained in:
@@ -10,6 +10,16 @@ plugins {
|
||||
|
||||
description = "Spring Boot AutoConfigure"
|
||||
|
||||
configurations.all {
|
||||
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
|
||||
if (details.requested.module.group == "org.apache.kafka" && details.requested.module.name == "kafka-server-common") {
|
||||
details.artifactSelection {
|
||||
selectArtifact(DependencyArtifact.DEFAULT_TYPE, null, null)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api(project(":spring-boot-project:spring-boot"))
|
||||
|
||||
|
||||
@@ -15,6 +15,15 @@ configurations {
|
||||
springApplicationExample
|
||||
testSlices
|
||||
antoraContent
|
||||
all {
|
||||
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
|
||||
if (details.requested.module.group == "org.apache.kafka" && details.requested.module.name == "kafka-server-common") {
|
||||
details.artifactSelection {
|
||||
selectArtifact(DependencyArtifact.DEFAULT_TYPE, null, null)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
jar {
|
||||
|
||||
@@ -6,6 +6,16 @@ plugins {
|
||||
|
||||
description = "Spring Boot Kafka smoke test"
|
||||
|
||||
configurations.all {
|
||||
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
|
||||
if (details.requested.module.group == "org.apache.kafka" && details.requested.module.name == "kafka-server-common") {
|
||||
details.artifactSelection {
|
||||
selectArtifact(DependencyArtifact.DEFAULT_TYPE, null, null)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
|
||||
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
|
||||
|
||||
Reference in New Issue
Block a user