fix: #14930 - ensure both a shadowJar and regular jar can be published for grails-cli

Author: jdaugherty

grails-forge/grails-cli/build.gradle

@@ -38,13 +38,38 @@ ext {
 version = projectVersion
 group = 'org.apache.grails'
 
+configurations {
+    shadowCombined
+}
+
 evaluationDependsOn(':grails-cli-shadow')
 dependencies {
     implementation platform("org.apache.grails:grails-bom:$projectVersion")
     implementation 'org.apache.groovy:groovy'
 
-    // 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'))
+    // shell-cli dependencies
+    implementation 'org.apache.grails:grails-shell-cli'
+    implementation 'org.springframework.boot:spring-boot-cli'
+    implementation 'org.apache.groovy:groovy'
+    implementation 'org.apache.groovy:groovy-ant'
+    implementation 'org.apache.groovy:groovy-templates'
+
+    // The commands are pulled from the shellCliDependencies in the shell project, but they are not in the shell jar file,
+    // so they must be added here. To keep the jar file smaller, only a subset is included here
+    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'
+    }
+
+    // for the shadow jar, configure forge & shell-cli dependencies to be pulled from a file to ensure the shadow
+    // transforms are applied to both dependencies and our own projects
+    shadowCombined platform("org.apache.grails:grails-bom:$projectVersion")
+    shadowCombined 'org.apache.groovy:groovy'
+    shadowCombined files(project(':grails-cli-shadow').tasks.named('shadowJar'))
 }
 
 apply {
@@ -66,6 +91,9 @@ TaskProvider<Jar> shadowJarTask = tasks.named('shadowJar', ShadowJar)
 shadowJarTask.configure { ShadowJar it ->
     it.archiveClassifier.set('all')
 
+    // use a separate configuration path so we can still publish the cli project with a non-shadow jar
+    it.configurations = [project.configurations.shadowCombined]
+
     // services & custom grails.factories have to be merged since commands can be created from both sources
     it.mergeServiceFiles()
     it.mergeServiceFiles('META-INF/grails.factories')