Merge branch '6.0.x'

# Conflicts: # framework-platform/framework-platform.gradle
lyd0 · Aug 2, 2023 · 51aaaae · 51aaaae
2 parents aa10d23 + dcec61a
commit 51aaaae
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle
@@ -45,7 +45,6 @@ dependencies {
 		api("com.thoughtworks.xstream:xstream:1.4.20")
 		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.1.0-M3")
 		api("io.mockk:mockk:1.13.4")
 		api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3")

diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
@@ -15,7 +15,6 @@ dependencies {
 	optional(project(":spring-webmvc"))
 	optional(project(":spring-websocket"))
 	optional("com.jayway.jsonpath:json-path")
-	optional("info.picocli:picocli")
 	optional("io.micrometer:context-propagation")
 	optional("io.micrometer:micrometer-observation")
 	optional("io.projectreactor:reactor-test")