Browse Source

Merge branch '6.0.x'

# Conflicts:
#	framework-platform/framework-platform.gradle
pull/30869/head
Sam Brannen 3 years ago
parent
commit
dc4fcef884
  1. 4
      framework-platform/framework-platform.gradle

4
framework-platform/framework-platform.gradle

@ -8,7 +8,7 @@ javaPlatform { @@ -8,7 +8,7 @@ javaPlatform {
dependencies {
api(platform("com.fasterxml.jackson:jackson-bom:2.15.2"))
api(platform("io.micrometer:micrometer-bom:1.10.8"))
api(platform("io.micrometer:micrometer-bom:1.10.9"))
api(platform("io.netty:netty-bom:4.1.94.Final"))
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
api(platform("io.projectreactor:reactor-bom:2023.0.0-SNAPSHOT"))
@ -46,7 +46,7 @@ dependencies { @@ -46,7 +46,7 @@ dependencies {
api("commons-io:commons-io:2.11.0")
api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
api("info.picocli:picocli:4.7.4")
api("io.micrometer:context-propagation:1.0.3")
api("io.micrometer:context-propagation:1.0.4")
api("io.mockk:mockk:1.13.4")
api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3")
api("io.projectreactor.tools:blockhound:1.0.8.RELEASE")

Loading…
Cancel
Save