Update dependency gradle.plugin.com.github.johnrengelman:shadow to v8 - autoclosed

.github/workflows/release.yml

@@ -39,7 +39,7 @@ jobs:
           commit_user_email: ${{ env.GIT_USER_EMAIL }}
           commit_author: ${{ env.GIT_USER_NAME }} <${{ env.GIT_USER_EMAIL }}>
           file_pattern: .
-          branch: 6.2.x
+          branch: 7.0.x
       - name: "⚙️ Run pre-release"
         uses: micronaut-projects/github-actions/pre-release@master
         with:
@@ -79,7 +79,7 @@ jobs:
         env:
           BETA: ${{ contains(steps.release_version.outputs.value, 'M') }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          BASE_BRANCH: 6.2.x
+          BASE_BRANCH: 7.0.x
           BRANCH: gh-pages
           FOLDER: build/docs
           VERSION: ${{ steps.release_version.outputs.value }}

.github/workflows/snapshot.yml

@@ -176,7 +176,7 @@ jobs:
           cp ./LICENSE grails-linux-amd64-snapshot/
           zip -r grails-linux-amd64-snapshot.zip ./grails-linux-amd64-snapshot
       - name: Upload Snapshot
-        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/6.2.x'
+        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/7.0.x'
         uses: actions/upload-artifact@v4
         with:
           name: grails-linux-amd64-snapshot
@@ -212,7 +212,7 @@ jobs:
           cp ./LICENSE grails-darwin-amd64-snapshot/
           zip -r grails-darwin-amd64-snapshot.zip ./grails-darwin-amd64-snapshot -x '*.DS_Store*' -x '__MAC_OSX'
       - name: "📤 Upload Snapshot"
-        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/6.2.x'
+        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/7.0.x'
         uses: actions/upload-artifact@v4
         with:
           name: grails-darwin-amd64-snapshot
@@ -250,7 +250,7 @@ jobs:
           cp ./LICENSE grails-darwin-aarch64-snapshot/
           zip -r grails-darwin-aarch64-snapshot.zip grails-darwin-aarch64-snapshot/ -x '*.DS_Store*' -x '__MAC_OSX'
       - name: "📤 Upload Snapshot"
-        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/6.2.x'
+        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/7.0.x'
         uses: actions/upload-artifact@v4
         with:
           name: grails-darwin-aarch64-snapshot
@@ -292,7 +292,7 @@ jobs:
           Copy-Item "./LICENSE" -Destination "./grails-win-amd64-snapshot"
           Compress-Archive -Path "./grails-win-amd64-snapshot" -Update -DestinationPath ./grails-win-amd64-snapshot.zip
       - name: "📤 Publish artifact"
-        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/6.2.x'
+        if: success() && github.event_name == 'push' && github.ref == 'refs/heads/7.0.x'
         uses: actions/upload-artifact@v4
         with:
           name: grails-win-amd64-snapshot

buildSrc/build.gradle

@@ -31,7 +31,7 @@ dependencies {
     implementation "org.asciidoctor:asciidoctor-gradle-jvm:4.0.3"
     implementation "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
     implementation "io.spring.nohttp:nohttp-gradle:0.0.11"
-    implementation "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
+    implementation "gradle.plugin.com.github.johnrengelman:shadow:8.0.0"
     implementation "io.github.gradle-nexus:publish-plugin:1.3.0"
 }
 

gradle.properties

@@ -1,4 +1,4 @@
-projectVersion=6.2.1-SNAPSHOT
+projectVersion=7.0.0-SNAPSHOT
 micronautBuildVersion=1.1.5
 micronautDocsVersion=2.0.0
 micronautVersion=3.10.4
@@ -10,7 +10,7 @@ title=Grails Application Forge
 projectDesc=Generates Grails applications
 projectUrl=https://grails.org
 githubSlug=grails/grails-forge
-githubBranch=6.2.x
+githubBranch=7.0.x
 developers=Puneet Behl
 org.gradle.parallel=true
 org.gradle.caching=true

grails-forge-core/src/main/java/org/grails/forge/feature/logging/Logback.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 original authors
+ * Copyright 2017-2024 original authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,10 +60,15 @@ public boolean shouldApply(ApplicationType applicationType, Options options, Set
     public void apply(GeneratorContext generatorContext) {
         OperatingSystem operatingSystem = generatorContext.getOperatingSystem();
         boolean jansi = false;
+
         if (operatingSystem != OperatingSystem.WINDOWS) {
             jansi = true;
         }
-        generatorContext.addTemplate("loggingConfig", new RockerTemplate("grails-app/conf/logback.xml", logback.template(jansi)));
+
+        String projectName = generatorContext.getProject().getName();
+        String packageName = generatorContext.getProject().getPackageName();
+
+        generatorContext.addTemplate("loggingConfig", new RockerTemplate("grails-app/conf/logback-spring.xml", logback.template(projectName, packageName, jansi)));
         generatorContext.addDependency(Dependency.builder()
                 .groupId("org.grails")
                 .artifactId("grails-logging")

grails-forge-core/src/main/java/org/grails/forge/feature/logging/template/logback.rocker.raw

@@ -1,21 +1,41 @@
-@args (boolean jansi)
+@args (String projectName, String packageName, boolean jansi)
 
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
 
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <withJansi>@jansi</withJansi>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>${CONSOLE_LOG_THRESHOLD}</level>
+        </filter>
         <encoder>
-            <charset>UTF-8</charset>
-            <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex</pattern>
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>${CONSOLE_LOG_CHARSET}</charset>
         </encoder>
     </appender>
 
-    <root level="error">
-        <appender-ref ref="STDOUT" />
+    <root level="ERROR">
+        <appender-ref ref="CONSOLE"/>
     </root>
 
+    <springProfile name="development">
+        <logger name="StackTrace" level="ERROR" additivity="false" />
+
+<!--        <logger name="@packageName" level="DEBUG"/>-->
+
+<!--        <logger name="org.hibernate.SQL" level="DEBUG"/>-->
+<!--        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>-->
+<!--        <logger name="org.springframework.security" level="TRACE"/>-->
+
+<!--        <root level="WARN"/>-->
+    </springProfile>
+
+<!--    logging to a file-->
+<!--    <property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}spring.log}"/>-->
+<!--    <include resource="org/springframework/boot/logging/logback/file-appender.xml" />-->
+<!--    <root level="ERROR">-->
+<!--        <appender-ref ref="FILE" />-->
+<!--    </root>-->
+<!--    add logging.file.name to application.yml-->
 </configuration>

grails-forge-core/src/test/groovy/org/grails/forge/feature/logging/LogbackSpec.groovy

@@ -23,12 +23,12 @@ class LogbackSpec extends ApplicationContextSpec implements CommandOutputFixture
     }
 
     @Unroll
-    void "test logback.xml config file is present for #applicationType application"() {
+    void "test logback-spring.xml config file is present for #applicationType application"() {
         when:
         def output = generate(applicationType, new Options(TestFramework.SPOCK, JdkVersion.JDK_11))
 
         then:
-        output.containsKey("grails-app/conf/logback.xml")
+        output.containsKey("grails-app/conf/logback-spring.xml")
 
         where:
         applicationType << ApplicationType.values().toList()