fix: #14930 - styling clean up

Author: jdaugherty

grails-forge/buildSrc/src/main/groovy/org/apache/grails/buildsrc/GrailsShadowLicenseTransform.groovy renamed to grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowLicenseTransform.groovy

@@ -14,13 +14,12 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.grails.buildsrc
+package org.apache.grails.forge.buildlogic.shadowjar
 
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
-import groovy.util.logging.Slf4j
 import org.apache.tools.zip.ZipEntry
 import org.apache.tools.zip.ZipOutputStream
 import org.gradle.api.file.FileTreeElement
@@ -31,15 +30,14 @@ import java.util.regex.Pattern
 /**
  * supports combining into a single license file.
  */
-@Slf4j
 @CompileStatic
 class GrailsShadowLicenseTransform implements Transformer {
 
     private static final List<Pattern> LICENSE_PATTERNS = [
-            Pattern.compile('META-INF/[^/]*LICENSE[^/]*', Pattern.CASE_INSENSITIVE),
-            Pattern.compile('META-INF/LICENSES/.*', Pattern.CASE_INSENSITIVE),
-            Pattern.compile('[^/]*LICENSE[^/]*', Pattern.CASE_INSENSITIVE),
-            Pattern.compile('LICENSES/.*', Pattern.CASE_INSENSITIVE)
+            ~'(?i)META-INF/[^/]*LICENSE[^/]*',
+            ~'(?i)META-INF/LICENSES/.*',
+            ~'(?i)[^/]*LICENSE[^/]*',
+            ~'(?i)LICENSES/.*'
     ]
 
     private static final String LICENSE_PATH = 'META-INF/LICENSE'
@@ -68,8 +66,8 @@ class GrailsShadowLicenseTransform implements Transformer {
     }
 
     @Override
-    @CompileDynamic
     // Multiple assignments without list expressions on the right hand side are unsupported in static type checking mode
+    @CompileDynamic
     void transform(TransformerContext context) {
         if (!licenses) {
             // Add our license as previously seen so we can dedupe - this transformer only applies to the copy of other jars

grails-forge/buildSrc/src/main/groovy/org/apache/grails/buildsrc/GrailsShadowNoticeTransform.groovy renamed to grails-forge/buildSrc/src/main/groovy/org/apache/grails/forge/buildlogic/shadowjar/GrailsShadowNoticeTransform.groovy

@@ -14,25 +14,23 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.grails.buildsrc
+package org.apache.grails.forge.buildlogic.shadowjar
 
 import com.github.jengelman.gradle.plugins.shadow.transformers.ApacheNoticeResourceTransformer
 import groovy.transform.CompileStatic
-import groovy.util.logging.Slf4j
 import org.gradle.api.file.FileTreeElement
 
 import java.util.regex.Pattern
 
 /**
  * jakarta is eclipse licensed, so we need to include the NOTICE.md file
  */
-@Slf4j
 @CompileStatic
 class GrailsShadowNoticeTransform extends ApacheNoticeResourceTransformer {
 
     private static final List<Pattern> NOTICE_PATTERNS = [
-            Pattern.compile('META-INF/[^/]*NOTICE[^/]*', Pattern.CASE_INSENSITIVE),
-            Pattern.compile('[^/]*NOTICE[^/]*', Pattern.CASE_INSENSITIVE)
+            ~'(?i)META-INF/[^/]*NOTICE[^/]*',
+            ~'(?i)[^/]*NOTICE[^/]*'
     ]
 
     @Override

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

@@ -15,8 +15,8 @@
  *  limitations under the License.
  */
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.apache.grails.buildsrc.GrailsShadowLicenseTransform
-import org.apache.grails.buildsrc.GrailsShadowNoticeTransform
+import org.apache.grails.forge.buildlogic.shadowjar.GrailsShadowLicenseTransform
+import org.apache.grails.forge.buildlogic.shadowjar.GrailsShadowNoticeTransform
 
 plugins {
     id 'groovy'
@@ -44,6 +44,8 @@ dependencies {
 
     // forge dependencies
     implementation project(':grails-forge-cli'), {
+        // exclude the slf4j-nop dependency because the simple slf4j implementation is already included
+        // which will cause a duplicate warning message
         exclude group: 'org.slf4j', module: 'slf4j-nop'
     }
 }
@@ -54,7 +56,7 @@ apply {
 
 TaskProvider<Jar> shadowJarTask = tasks.named('shadowJar', ShadowJar)
 shadowJarTask.configure { ShadowJar it ->
-    it.archiveClassifier.set('all')
+    it.archiveClassifier = 'all'
 
     // services & custom grails.factories have to be merged since commands can be created from both sources
     it.mergeServiceFiles()

grails-forge/grails-cli/build.gradle

@@ -15,8 +15,8 @@
  *  limitations under the License.
  */
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.apache.grails.buildsrc.GrailsShadowLicenseTransform
-import org.apache.grails.buildsrc.GrailsShadowNoticeTransform
+import org.apache.grails.forge.buildlogic.shadowjar.GrailsShadowLicenseTransform
+import org.apache.grails.forge.buildlogic.shadowjar.GrailsShadowNoticeTransform
 
 plugins {
     id 'groovy'
@@ -62,6 +62,8 @@ dependencies {
 
     // forge dependencies
     implementation project(':grails-forge-cli'), {
+        // exclude the slf4j-nop dependency because the simple slf4j implementation is already included
+        // which will cause a duplicate warning message
         exclude group: 'org.slf4j', module: 'slf4j-nop'
     }
 
@@ -89,7 +91,7 @@ jarTask.configure { Jar it ->
 
 TaskProvider<Jar> shadowJarTask = tasks.named('shadowJar', ShadowJar)
 shadowJarTask.configure { ShadowJar it ->
-    it.archiveClassifier.set('all')
+    it.archiveClassifier = 'all'
 
     // use a separate configuration path so we can still publish the cli project with a non-shadow jar
     it.configurations = [project.configurations.shadowCombined]

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

@@ -17,9 +17,6 @@
  *  under the License.
  */
 
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.apache.grails.buildsrc.GrailsShadowLicenseTransform
-import org.apache.grails.buildsrc.GrailsShadowNoticeTransform
 import org.grails.forge.internal.tasks.GenerateManpageAsciidoc
 import org.grails.forge.internal.tasks.PicocliBuildCompletionTask
 

grails-forge/settings.gradle

@@ -52,13 +52,13 @@ rootProject.name = 'grails-forge'
 
 include(
         'grails-cli',
-        'grails-forge-core',
-        'grails-forge-cli',
         'grails-cli-shadow', // to allow us to transform our own artifacts
-        'test-core',
+        'grails-forge-analytics-postgres',
         'grails-forge-api',
+        'grails-forge-cli',
+        'grails-forge-core',
         'grails-forge-web-netty',
-        'grails-forge-analytics-postgres'
+        'test-core',
 )
 
 includeBuild('..') {