fix: #14930 - switch to a single shadow project so that slf4j can be excluded

Author: jdaugherty

grails-forge/grails-shell-cli-shadow/build.gradle renamed to grails-forge/grails-cli-shadow/build.gradle

@@ -41,6 +41,11 @@ dependencies {
     implementation 'org.apache.grails:grails-core' // for ApplicationContextCommandFactory to lookup commands
     implementation 'org.apache.grails:grails-url-mappings' // for UrlMappingsReportCommand
     // profiles will add additional libraries as needed to surface commands
+
+    // forge dependencies
+    implementation project(':grails-forge-cli'), {
+        exclude group: 'org.slf4j', module: 'slf4j-nop'
+    }
 }
 
 apply {

grails-forge/grails-cli/build.gradle

@@ -38,17 +38,13 @@ ext {
 version = projectVersion
 group = 'org.apache.grails'
 
-evaluationDependsOn(':grails-forge-cli')
-evaluationDependsOn(':grails-shell-cli-shadow')
+evaluationDependsOn(':grails-cli-shadow')
 dependencies {
     implementation platform("org.apache.grails:grails-bom:$projectVersion")
     implementation 'org.apache.groovy:groovy'
 
-    // shell-cli dependencies
-    runtimeOnly files(project(':grails-shell-cli-shadow').tasks.named('shadowJar'))
-
-    // forge dependencies
-    runtimeOnly files(project(':grails-forge-cli').tasks.named('shadowJar'))
+    // forge & shell-cli dependencies have to be pulled via a file to ensure the transforms are applied to both dependencies and our own projects
+    runtimeOnly files(project(':grails-cli-shadow').tasks.named('shadowJar'))
 }
 
 apply {

grails-forge/grails-forge-cli/build.gradle

@@ -27,7 +27,6 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'org.grails.forge.rocker'
-    id 'com.gradleup.shadow'
 }
 
 version = projectVersion
@@ -107,35 +106,6 @@ dependencies {
     testImplementation "org.codehaus.groovy:groovy-test:$groovyVersion"
 }
 
-TaskProvider<Jar> shadowJarTask = tasks.named('shadowJar', ShadowJar)
-shadowJarTask.configure { ShadowJar it ->
-    it.archiveClassifier.set('all')
-
-    // services & custom grails.factories have to be merged since commands can be created from both sources
-    it.mergeServiceFiles()
-    it.mergeServiceFiles('META-INF/grails.factories')
-
-    // groovy extensions are shipped with grails-core
-    it.mergeGroovyExtensionModules()
-
-    // combines all NOTICE files
-    it.transform(GrailsShadowNoticeTransform) {
-        it.projectName = 'Apache Grails'
-        it.inceptionYear = '2005'
-    }
-
-    // combines all LICENSE files
-    it.transform(GrailsShadowLicenseTransform) {
-        it.licenseText = rootProject.layout.projectDirectory.file('../licenses/LICENSE-Apache-2.0.txt').getAsFile().text
-    }
-
-    it.exclude(
-            'DISCLAIMER', // because we include our own jars, we need to exclude any files that we include
-            'META-INF/DEPENDENCIES', // until we publish our own SBOM, this won't be correct so exclude
-            'about.html' // restatement of the Eclipse Distribution License - Version 1.0 for jakarta
-    )
-}
-
 rocker {
     postProcessing = ['org.grails.forge.rocker.plugin.WhitespaceProcessor']
 }

grails-forge/settings.gradle

@@ -54,7 +54,7 @@ include(
         'grails-cli',
         'grails-forge-core',
         'grails-forge-cli',
-        'grails-shell-cli-shadow', // used by delegating cli, but not published
+        'grails-cli-shadow', // to allow us to transform our own artifacts
         'test-core',
         'grails-forge-api',
         'grails-forge-web-netty',