diff --git a/spring-shell-core/spring-shell-core.gradle b/spring-shell-core/spring-shell-core.gradle
index b265c03b..ec588d87 100644
--- a/spring-shell-core/spring-shell-core.gradle
+++ b/spring-shell-core/spring-shell-core.gradle
@@ -10,7 +10,11 @@ dependencies {
 	api('org.springframework:spring-core')
 	api('org.springframework.boot:spring-boot-starter-validation')
 	api('org.springframework:spring-messaging')
-	api('org.jline:jline')
+	api('io.projectreactor:reactor-core')
+	api('org.jline:jline-console')
+	api('org.jline:jline-reader')
+	api('org.jline:jline-style')
+	api('org.jline:jline-terminal')
 	api('org.antlr:ST4')
 	api('commons-io:commons-io')
 	compileOnly 'com.google.code.findbugs:jsr305'
diff --git a/spring-shell-management/spring-shell-management.gradle b/spring-shell-management/spring-shell-management.gradle
index bdb30f86..72ffb830 100644
--- a/spring-shell-management/spring-shell-management.gradle
+++ b/spring-shell-management/spring-shell-management.gradle
@@ -11,9 +11,14 @@ description = 'Spring Shell BOM'
 dependencies {
 	api platform("org.springframework.boot:spring-boot-dependencies:$springBootVersion")
 	constraints {
-		api "org.jline:jline:$jlineVersion"
-		api "org.jline:jline-terminal-jna:$jlineVersion"
+		api "org.jline:jline-console:$jlineVersion"
+		api "org.jline:jline-reader:$jlineVersion"
+		api "org.jline:jline-style:$jlineVersion"
+		api "org.jline:jline-terminal:$jlineVersion"
+		api "org.jline:jline-terminal-ffm:$jlineVersion"
 		api "org.jline:jline-terminal-jansi:$jlineVersion"
+		api "org.jline:jline-terminal-jna:$jlineVersion"
+		api "org.jline:jline-terminal-jni:$jlineVersion"
 		api "org.antlr:ST4:$st4Version"
 		api "commons-io:commons-io:$commonsIoVersion"
 		api "com.google.jimfs:jimfs:$jimfsVersion"
diff --git a/spring-shell-test-autoconfigure/spring-shell-test-autoconfigure.gradle b/spring-shell-test-autoconfigure/spring-shell-test-autoconfigure.gradle
index 860c20c5..c740156a 100644
--- a/spring-shell-test-autoconfigure/spring-shell-test-autoconfigure.gradle
+++ b/spring-shell-test-autoconfigure/spring-shell-test-autoconfigure.gradle
@@ -14,7 +14,6 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-autoconfigure'
 	implementation 'org.springframework.boot:spring-boot-test-autoconfigure'
 	implementation 'org.springframework.boot:spring-boot-starter-test'
-	optional 'org.jline:jline'
 	optional 'org.assertj:assertj-core'
 	optional 'org.junit.jupiter:junit-jupiter-api'
 	testImplementation 'org.awaitility:awaitility'