From d108c77298dc5331c1a6facd08601cd7978b1c20 Mon Sep 17 00:00:00 2001
From: Michael Yan <rain@rainboyan.com>
Date: Sun, 18 Aug 2024 03:08:34 +0800
Subject: [PATCH] Cleanup runtime dependencies of `gracce-shell`

Closes gh-501
---
 grace-api/build.gradle       |  2 +-
 grace-bootstrap/build.gradle |  2 +-
 grace-shell/build.gradle     | 35 +++++++++++++----------------------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/grace-api/build.gradle b/grace-api/build.gradle
index 5caa8ab9fa..a2c2b3d51a 100644
--- a/grace-api/build.gradle
+++ b/grace-api/build.gradle
@@ -8,7 +8,7 @@ dependencies {
 
     api(libs.slf4j.api)
     api(libs.spring.beans)
-    api(libs.spring.boot)
+    compileOnly(libs.spring.boot)
     api(libs.spring.context)
     api(libs.spring.core)
 }
diff --git a/grace-bootstrap/build.gradle b/grace-bootstrap/build.gradle
index 93ce0aefb2..904e4a60c3 100644
--- a/grace-bootstrap/build.gradle
+++ b/grace-bootstrap/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     api libs.groovy.templates
     api libs.groovy.xml
     api libs.snakeyaml
-    api libs.spring.boot
+    compileOnly libs.spring.boot
     api libs.spring.core
     compileOnly libs.groovy.ant
     compileOnly libs.jansi
diff --git a/grace-shell/build.gradle b/grace-shell/build.gradle
index 7ff4fab584..5f083cb63f 100644
--- a/grace-shell/build.gradle
+++ b/grace-shell/build.gradle
@@ -14,30 +14,11 @@ ext {
 configurations {
     dependenciesBom
     runtimeClasspath {
-        exclude group: 'commons-codec', module: 'commons-codec'
-        exclude group: 'com.github.ben-manes.caffeine', module: 'caffeine'
-        exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
-        exclude group: 'com.vaadin.external.google', module: 'android-json'
-        exclude group: 'io.micrometer'
-        exclude group: 'javax.inject', module: 'javax.inject'
-        exclude group: 'net.sf.jopt-simple', module: 'jopt-simple'
-        exclude group: 'org.checkerframework', module: 'checker-qual'
-        exclude group: 'org.apache.ant', module: 'ant-antlr'
-        exclude group: 'org.apache.ant', module: 'ant-junit'
-        exclude group: 'org.apache.commons', module: 'commons-compress'
-        exclude group: 'org.apache.groovy', module: 'groovy-groovydoc'
-        exclude group: 'org.apache.groovy', module: 'groovy-jmx'
-        exclude group: 'org.codehaus.plexus', module: 'plexus-classworlds'
-        exclude group: 'org.codehaus.plexus', module: 'plexus-component-annotations'
-        exclude group: 'org.codehaus.plexus', module: 'plexus-sec-dispatcher'
-        exclude group: 'org.javassist', module: 'javassist'
         exclude group: 'org.springframework', module: 'spring-aop'
         exclude group: 'org.springframework', module: 'spring-expression'
         exclude group: 'org.springframework', module: 'spring-jcl'
         exclude group: 'org.springframework', module: 'spring-tx'
         exclude group: 'org.springframework', module: 'spring-web'
-        exclude group: 'org.springframework.boot', module: 'spring-boot-autoconfigure'
-        exclude group: 'org.springframework.security', module: 'spring-security-crypto'
     }
 }
 
@@ -50,11 +31,17 @@ dependencies {
 
     api libs.ant
     api libs.gradle.tooling.api
-    api libs.groovy.ant
+    api libs.groovy.ant, {
+        exclude group: "org.apache.ant", module: "ant-antlr"
+        exclude group: "org.apache.ant", module: "ant-junit"
+        exclude group: "org.apache.groovy", module: "groovy-groovydoc"
+    }
     api libs.groovy.json
-    api libs.groovy.jmx
     compileOnly libs.jakarta.servlet
-    compileOnly libs.spring.web
+    implementation libs.spring.boot
+    compileOnly libs.spring.web, {
+        exclude group: "io.micrometer"
+    }
     api libs.jansi
     api libs.jline
     api libs.slf4j.api
@@ -62,11 +49,13 @@ dependencies {
     dependenciesBom project(path: ":grace-bom", configuration: 'effectiveBom')
     implementation(libs.maven.resolver.provider) {
         exclude group: "com.google.guava", module: "guava"
+        exclude group: "javax.inject", module: "javax.inject"
     }
     implementation(libs.maven.resolver.connectorBasic)
     implementation(libs.maven.resolver.impl)
     implementation(libs.maven.resolver.transportFile)
     implementation(libs.maven.resolver.transportHttp) {
+        exclude group: "commons-codec", module: "commons-codec"
         exclude group: "org.slf4j", module:"jcl-over-slf4j"
     }
     implementation("org.apache.maven:maven-settings-builder:3.6.3") {
@@ -76,6 +65,8 @@ dependencies {
     implementation("org.sonatype.sisu:sisu-inject-plexus:2.6.0") {
         exclude group: "javax.enterprise", module: "cdi-api"
         exclude group: "org.sonatype.sisu", module: "sisu-inject-bean"
+        exclude group: "org.codehaus.plexus", module: "plexus-classworlds"
+        exclude group: "org.codehaus.plexus", module: "plexus-component-annotations"
     }
     runtimeOnly libs.slf4j.simple
 }