From a13ec34a92351f6bf483397a9d10372130ccc16b Mon Sep 17 00:00:00 2001
From: Michael Yan <rain@rainboyan.com>
Date: Fri, 16 Aug 2024 04:32:31 +0800
Subject: [PATCH] Optimize SLF4J dependencies for all modules

No need to add SLF4J dependencies to all modules

* Remove SLF4J dependencies from all modules
* Add `org.slf4j:jcl-over-slf4j` to `grace-shell`

Closes gh-471
---
 build.gradle             | 9 +--------
 grace-shell/build.gradle | 2 ++
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7679ab5cb2..e0435ee83d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,10 +51,7 @@ if (jointBuildGroovyJarProperty) {
         throw new GradleException("The groovy.jar system property points to ${jointBuildGroovyJar.absolutePath} which does not exist.")
     }
 } else {
-    groovyDependency = dependencies.create("org.codehaus.groovy:groovy:${groovyVersion}") {
-        exclude module:"commons-cli"
-        exclude module:"ant"
-    }
+    groovyDependency = dependencies.create("org.codehaus.groovy:groovy:${groovyVersion}")
 }
 
 version = grailsVersion
@@ -320,10 +317,6 @@ subprojects { project ->
         testRuntimeOnly libs.junit.jupiter.engine
 
         if (project.name != "grace-docs") {
-            // Logging
-            api libs.slf4j.api
-            api libs.slf4j.jcl
-
             // Testing
             testImplementation libs.slf4j.simple
             testImplementation libs.spock.core, { transitive = false }
diff --git a/grace-shell/build.gradle b/grace-shell/build.gradle
index b2ad150393..c88a89d07a 100644
--- a/grace-shell/build.gradle
+++ b/grace-shell/build.gradle
@@ -58,6 +58,8 @@ dependencies {
     compileOnly libs.spring.web
     api libs.jansi
     api libs.jline
+    api libs.slf4j.api
+    api libs.slf4j.jcl
     dependenciesBom project(path: ":grace-bom", configuration: 'effectiveBom')
     implementation(libs.maven.resolver.provider) {
         exclude group: "com.google.guava", module: "guava"