Grails 7: grails-spring-security-ui

grails · Oct 2, 2024 · 6cd3d93 · 6cd3d93
1 parent f32f30f
commit 6cd3d93
Show file tree

Hide file tree

Showing 25 changed files with 472 additions and 641 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8']
+        java: ['17']
     env:
       WORKSPACE: ${{ github.workspace }}
       GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
@@ -26,7 +26,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Run Tests
         if: github.event_name == 'pull_request'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8']
+        java: ['17']
     env:
       GIT_USER_NAME: puneetbehl
       GIT_USER_EMAIL: [email protected]
@@ -20,7 +20,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Set the current release version
         id: release_version

diff --git a/build.gradle b/build.gradle
@@ -29,4 +29,16 @@ if (isReleaseVersion) {
             }
         }
     }
-}
+}
+
+subprojects {
+    configurations.configureEach {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+            if ((details.requested.group == 'org.codehaus.groovy' || details.requested.group == 'org.apache.groovy') && details.requested.name != 'groovy-bom') {
+                String groovyVersion = findProperty('groovyVersion') ?: libs.versions.groovy.get()
+                details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: groovyVersion)
+                details.because "The dependency coordinates are changed in Apache Groovy 4, plus ensure version"
+            }
+        }
+    }
+}
diff --git a/docs/build.gradle b/docs/build.gradle
@@ -3,9 +3,9 @@ buildscript {
         maven { url 'https://repo.grails.org/grails/core' }
     }
     dependencies {
-        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
-        classpath 'org.asciidoctor:asciidoctorj-epub3:1.5.1'
-        classpath 'org.asciidoctor:asciidoctorj-pdf:2.3.9'
+        classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.6.1'
+        classpath 'org.asciidoctor:asciidoctorj-epub3:2.1.3'
+        classpath 'org.asciidoctor:asciidoctorj-pdf:2.3.18'
     }
 }
 

diff --git a/examples/extended/build.gradle b/examples/extended/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
         classpath "org.grails.plugins:hibernate5:${hibernateGormVersion}"
         classpath "com.bertramlabs.plugins:asset-pipeline-gradle:${assetPipelineVersion}"
-        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.0"
+        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.7"
     }
 }
 
@@ -26,51 +26,50 @@ repositories {
 }
 
 dependencies {
-    compile "org.springframework.boot:spring-boot-starter-logging"
-    compile "org.springframework.boot:spring-boot-autoconfigure"
-    compile "org.grails:grails-core"
-    compile "org.springframework.boot:spring-boot-starter-actuator"
-    compile "org.springframework.boot:spring-boot-starter-tomcat"
-    compile "org.grails:grails-web-boot"
-    compile "org.grails:grails-logging"
-    compile "org.grails:grails-plugin-rest"
-    compile "org.grails:grails-plugin-databinding"
-    compile "org.grails:grails-plugin-i18n"
-    compile "org.grails:grails-plugin-services"
-    compile "org.grails:grails-plugin-url-mappings"
-    compile "org.grails:grails-plugin-interceptors"
-    compile "org.grails.plugins:cache"
-    compile "org.grails.plugins:async"
-    compile "org.grails.plugins:scaffolding"
-    compile "org.grails.plugins:events"
-    compile "org.grails.plugins:hibernate5"
-    compile "org.hibernate:hibernate-core:$hibernateCoreVersion"
-    compile "org.grails.plugins:gsp"
+    implementation "org.springframework.boot:spring-boot-starter-logging"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "org.grails:grails-core"
+    implementation "org.springframework.boot:spring-boot-starter-actuator"
+    implementation "org.springframework.boot:spring-boot-starter-tomcat"
+    implementation "org.grails:grails-web-boot"
+    implementation "org.grails:grails-logging"
+    implementation "org.grails:grails-plugin-rest"
+    implementation "org.grails:grails-plugin-databinding"
+    implementation "org.grails:grails-plugin-i18n"
+    implementation "org.grails:grails-plugin-services"
+    implementation "org.grails:grails-plugin-url-mappings"
+    implementation "org.grails:grails-plugin-interceptors"
+    implementation "org.grails.plugins:cache"
+    implementation "org.grails.plugins:async"
+    implementation "org.grails.plugins:scaffolding"
+    implementation "org.grails.plugins:events"
+    implementation "org.grails.plugins:hibernate5"
+    implementation "org.hibernate:hibernate-core:$hibernateCoreVersion"
+    implementation "org.grails.plugins:gsp"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
-    runtime "org.glassfish.web:el-impl:2.1.2-b03"
-    runtime "com.h2database:h2"
-    runtime "org.apache.tomcat:tomcat-jdbc"
-    //testCompile "org.grails:grails-test-mixins:3.3.0"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
-    testCompile "org.grails:grails-gorm-testing-support"
-    testCompile "org.grails:grails-web-testing-support"
-    testCompile "org.grails.plugins:geb"
-    testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
-    testCompile "org.seleniumhq.selenium:selenium-api:3.14.0"
-    testCompile "org.seleniumhq.selenium:selenium-support:3.14.0"
-    testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
-    testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
+    runtimeOnly "com.h2database:h2"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    testImplementation "org.grails:grails-gorm-testing-support"
+    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.grails.plugins:geb"
+    testImplementation "org.spockframework:spock-core"
+    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:4.19.1"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.19.1"
+    testImplementation "org.seleniumhq.selenium:selenium-support:4.19.1"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:4.19.1"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:4.19.1"
 
-    compile 'dumbster:dumbster:1.6', { transitive = false }
-    compile "org.grails.plugins:mail:$mailVersion"
+    implementation "dumbster:dumbster:$dumbsterVersion", { transitive = false }
+    implementation "org.grails.plugins:mail:$mailVersion"
 
 
-    compile("org.grails.plugins:spring-security-acl:4.0.0.M2") {
+    implementation("org.grails.plugins:spring-security-acl:$springSecurityAclVersion") {
         exclude group: 'org.grails.plugins', module: 'spring-security-core'
     }
 
-    compile project(":spring-security-ui")
+    implementation project(":spring-security-ui")
 }
 
 webdriverBinaries {

diff --git a/examples/extended/grails-app/conf/logback.groovy b/examples/extended/grails-app/conf/logback.groovy
diff --git a/examples/extended/grails-app/conf/logback.xml b/examples/extended/grails-app/conf/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <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">
+        <withJansi>true</withJansi>
+        <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>
+        </encoder>
+    </appender>
+
+    <root level="error">
+        <appender-ref ref="STDOUT" />
+    </root>
+
+</configuration>
diff --git a/examples/extended/grails-app/views/error.gsp b/examples/extended/grails-app/views/error.gsp
@@ -8,8 +8,8 @@
 		<g:if test="${Throwable.isInstance(exception)}">
 			<g:renderException exception="${exception}"/>
 		</g:if>
-		<g:elseif test="${request.getAttribute('javax.servlet.error.exception')}">
-			<g:renderException exception="${request.getAttribute('javax.servlet.error.exception')}"/>
+		<g:elseif test="${request.getAttribute('jakarta.servlet.error.exception')}">
+			<g:renderException exception="${request.getAttribute('jakarta.servlet.error.exception')}"/>
 		</g:elseif>
 		<g:else>
 			<ul class="errors">

diff --git a/examples/simple/build.gradle b/examples/simple/build.gradle
@@ -4,9 +4,9 @@ buildscript {
     }
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "org.grails.plugins:hibernate5:${hibernateGormVersion}"
-        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:${assetPipelineVersion}"
-        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.0"
+        classpath "org.grails.plugins:hibernate5:$hibernateGormVersion"
+        classpath "com.bertramlabs.plugins:asset-pipeline-gradle:$assetPipelineVersion"
+        classpath "gradle.plugin.com.github.erdi.webdriver-binaries:webdriver-binaries-gradle-plugin:2.7"
     }
 }
 
@@ -26,59 +26,53 @@ repositories {
 }
 
 dependencies {
-    compile "org.springframework.boot:spring-boot-starter-logging"
-    compile "org.springframework.boot:spring-boot-autoconfigure"
-    compile "org.grails:grails-core"
-    compile "org.springframework.boot:spring-boot-starter-actuator"
-    compile "org.springframework.boot:spring-boot-starter-tomcat"
-    compile "org.grails:grails-web-boot"
-    compile "org.grails:grails-logging"
-    compile "org.grails:grails-plugin-rest"
-    compile "org.grails:grails-plugin-databinding"
-    compile "org.grails:grails-plugin-i18n"
-    compile "org.grails:grails-plugin-services"
-    compile "org.grails:grails-plugin-url-mappings"
-    compile "org.grails:grails-plugin-interceptors"
-    compile "org.grails.plugins:cache"
-    compile "org.grails.plugins:async"
-    compile "org.grails.plugins:scaffolding"
-    compile "org.grails.plugins:events"
-    compile "org.grails.plugins:hibernate5"
-    compile "org.hibernate:hibernate-core:$hibernateCoreVersion"
-    compile "org.grails.plugins:gsp"
+    implementation "org.springframework.boot:spring-boot-starter-logging"
+    implementation "org.springframework.boot:spring-boot-autoconfigure"
+    implementation "org.grails:grails-core"
+    implementation "org.springframework.boot:spring-boot-starter-actuator"
+    implementation "org.springframework.boot:spring-boot-starter-tomcat"
+    implementation "org.grails:grails-web-boot"
+    implementation "org.grails:grails-logging"
+    implementation "org.grails:grails-plugin-rest"
+    implementation "org.grails:grails-plugin-databinding"
+    implementation "org.grails:grails-plugin-i18n"
+    implementation "org.grails:grails-plugin-services"
+    implementation "org.grails:grails-plugin-url-mappings"
+    implementation "org.grails:grails-plugin-interceptors"
+    implementation "org.grails.plugins:cache"
+    implementation "org.grails.plugins:async"
+    implementation "org.grails.plugins:scaffolding"
+    implementation "org.grails.plugins:events"
+    implementation "org.grails.plugins:hibernate5"
+    implementation "org.hibernate:hibernate-core:$hibernateCoreVersion"
+    implementation "org.grails.plugins:gsp"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
-    runtime "org.glassfish.web:el-impl:2.1.2-b03"
-    runtime "com.h2database:h2"
-    runtime "org.apache.tomcat:tomcat-jdbc"
-    runtime "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
-    testCompile "org.grails:grails-gorm-testing-support"
-    testCompile "org.grails:grails-web-testing-support"
-    testCompile "org.grails.plugins:geb"
-    testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.14.0"
-    testCompile "org.seleniumhq.selenium:selenium-api:3.14.0"
-    testCompile "org.seleniumhq.selenium:selenium-support:3.14.0"
-    testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:3.14.0"
-    testRuntime "org.seleniumhq.selenium:selenium-firefox-driver:3.14.0"
+    runtimeOnly "com.h2database:h2"
+    runtimeOnly "org.apache.tomcat:tomcat-jdbc"
+    runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
+    testImplementation "org.grails:grails-gorm-testing-support"
+    testImplementation "org.grails:grails-web-testing-support"
+    testImplementation "org.grails.plugins:geb"
+    testImplementation "org.spockframework:spock-core"
+    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:4.19.1"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.19.1"
+    testImplementation "org.seleniumhq.selenium:selenium-support:4.19.1"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:4.19.1"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:4.19.1"
 
 
-    compile 'dumbster:dumbster:1.6', { transitive = false }
-    compile "org.grails.plugins:mail:$mailVersion"
+    implementation "dumbster:dumbster:$dumbsterVersion", { transitive = false }
+    implementation "org.grails.plugins:mail:$mailVersion"
 
-    compile project(":spring-security-ui")
+    implementation project(":spring-security-ui")
 }
 
 webdriverBinaries {
     chromedriver "${chromeDriverVersion}"
     geckodriver "${geckoDriverVersion}"
 }
 
-bootRun {
-    jvmArgs('-Dspring.output.ansi.enabled=always')
-    sourceResources sourceSets.main
-}
-
-
 assets {
     minifyJs = true
     minifyCss = true
@@ -92,4 +86,4 @@ tasks.withType(Test) {
     systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver')
 }
 
-apply from: "${rootProject.projectDir}/gradle/integrationTestVerbose.gradle"
+apply from: "${rootProject.projectDir}/gradle/integrationTestVerbose.gradle"
diff --git a/examples/simple/grails-app/conf/logback.groovy b/examples/simple/grails-app/conf/logback.groovy