Merge branch '6.0.x' into renovate/actions-checkout-4.x

grails · Oct 9, 2023 · 4b3640d · 4b3640d
2 parents e418db5 + faeacd9
commit 4b3640d
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 69 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -9,8 +9,8 @@ configurations.all {
 
 dependencies {
     implementation gradleApi()
-    implementation("com.bertramlabs.plugins:asset-pipeline-gradle:4.3.0")
+    implementation("com.bertramlabs.plugins:asset-pipeline-gradle:4.4.0")
     implementation("org.grails:grails-gradle-plugin:6.0.0")
-    implementation("org.grails.plugins:hibernate5:8.0.0")
+    implementation("org.grails.plugins:hibernate5:8.0.1")
     implementation("org.jsoup:jsoup:1.16.1")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,15 +1,15 @@
-projectVersion=6.0.1-SNAPSHOT
+projectVersion=6.0.2-SNAPSHOT
 grailsVersion=6.0.0
 grailsGradlePluginVersion=6.0.0
 groovyVersion=3.0.11
 gorm.version=8.0.0
 vcsUrl=https://github.com/grails-plugins/grails-spring-security-core
 websiteUrl=https://github.com/grails-plugins/grails-spring-security-core
 issueTrackerUrl=https://github.com/grails-plugins/grails-spring-security-core/issues
-springSecurityVersion=5.8.6
+springSecurityVersion=5.8.7
 ehcacheVersion=2.10.9.2
 javaxServletApiVersion=4.0.1
-grailsTestingSupportVersion=3.0.0
+grailsTestingSupportVersion=3.1.0
 githubSlug=grails-plugins/grails-spring-security-core
 assetPipelineVersion=4.3.0
 hibernateCoreVersion=5.6.15.Final

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugin/grails-app/commands/grails.plugin.springsecurity/S2QuickstartCommand.groovy b/plugin/grails-app/commands/grails.plugin.springsecurity/S2QuickstartCommand.groovy
@@ -188,36 +188,25 @@ Example: ./gradlew runCommand "-Pargs=s2-quickstart --uiOnly"
 
         final Properties props = new Properties()
         file("gradle.properties")?.withInputStream { props.load(it) }
-
-        boolean gormVersionAfterThreshold = versionAfterOrEqualsToThreshold(GORM_VERSION_THRESHOLD,
-                (String) props.gormVersion ?: (String) props.getProperty("gorm.version"))
-
-        if (gormVersionAfterThreshold) {
-            generateFile('PersonWithoutInjection', userModel.packagePath, userModel.simpleName)
-            if (salt) {
-                generateFile('PersonPasswordEncoderListenerWithSalt',
-                        userModel.packagePath,
-                        userModel.simpleName,
-                        "${userModel.simpleName}PasswordEncoderListener", 'src/main/groovy')
-            } else {
-                generateFile('PersonPasswordEncoderListener',
-                        userModel.packagePath,
-                        userModel.simpleName,
-                        "${userModel.simpleName}PasswordEncoderListener",
-                        'src/main/groovy')
-            }
-            List<Map<String, String>> beans = []
-            beans.add([import    : "import ${userModel.packageName}.${userModel.simpleName}PasswordEncoderListener".toString(),
-                       definition: "${userModel.propertyName}PasswordEncoderListener(${userModel.simpleName}PasswordEncoderListener)".toString()])
-            addBeans(beans, 'grails-app/conf/spring/resources.groovy')
-
+
+        generateFile('PersonWithoutInjection', userModel.packagePath, userModel.simpleName)
+        if (salt) {
+            generateFile('PersonPasswordEncoderListenerWithSalt',
+                    userModel.packagePath,
+                    userModel.simpleName,
+                    "${userModel.simpleName}PasswordEncoderListener", 'src/main/groovy')
         } else {
-            if (salt) {
-                generateFile('PersonWithSalt', userModel.packagePath, userModel.simpleName)
-            } else {
-                generateFile('Person', userModel.packagePath, userModel.simpleName)
-            }
+            generateFile('PersonPasswordEncoderListener',
+                    userModel.packagePath,
+                    userModel.simpleName,
+                    "${userModel.simpleName}PasswordEncoderListener",
+                    'src/main/groovy')
         }
+        List<Map<String, String>> beans = []
+        beans.add([import    : "import ${userModel.packageName}.${userModel.simpleName}PasswordEncoderListener".toString(),
+                   definition: "${userModel.propertyName}PasswordEncoderListener(${userModel.simpleName}PasswordEncoderListener)".toString()])
+        addBeans(beans, 'grails-app/conf/spring/resources.groovy')
+
 
         generateFile('Authority', roleModel.packagePath, roleModel.simpleName)
         generateFile('PersonAuthority', roleModel.packagePath, userModel.simpleName + roleModel.simpleName)

diff --git a/plugin/grails-app/conf/logback.xml b/plugin/grails-app/conf/logback.xml
diff --git a/plugin/src/docs/code/s2-quickstart-old/build.gradle b/plugin/src/docs/code/s2-quickstart-old/build.gradle
@@ -46,7 +46,7 @@ dependencies {
     testCompile "org.grails.plugins:geb"
     testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.52.0"
     testRuntime "net.sourceforge.htmlunit:htmlunit:2.70.0"
-    compile 'org.grails.plugins:spring-security-core:6.0.0'
+    compile 'org.grails.plugins:spring-security-core:6.0.1'
 }
 
 bootRun {

diff --git a/plugin/src/docs/code/s2-quickstart-old/gradle/wrapper/gradle-wrapper.properties b/plugin/src/docs/code/s2-quickstart-old/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
diff --git a/plugin/src/docs/code/s2-quickstart-requestmap/build.gradle b/plugin/src/docs/code/s2-quickstart-requestmap/build.gradle
@@ -46,7 +46,7 @@ dependencies {
     testCompile "org.grails.plugins:geb"
     testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.52.0"
     testRuntime "net.sourceforge.htmlunit:htmlunit:2.70.0"
-    compile 'org.grails.plugins:spring-security-core:6.0.0'
+    compile 'org.grails.plugins:spring-security-core:6.0.1'
 }
 
 bootRun {

diff --git a/plugin/src/docs/code/s2-quickstart-requestmap/gradle/wrapper/gradle-wrapper.properties b/plugin/src/docs/code/s2-quickstart-requestmap/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
diff --git a/plugin/src/docs/code/s2-quickstart-rolegroup/build.gradle b/plugin/src/docs/code/s2-quickstart-rolegroup/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     testCompile "org.grails.plugins:geb"
     testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.52.0"
     testRuntime "net.sourceforge.htmlunit:htmlunit:2.70.0"
-   compile 'org.grails.plugins:spring-security-core:6.0.0'
+   compile 'org.grails.plugins:spring-security-core:6.0.1'
 }
 
 bootRun {

diff --git a/plugin/src/docs/code/s2-quickstart-rolegroup/gradle/wrapper/gradle-wrapper.properties b/plugin/src/docs/code/s2-quickstart-rolegroup/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
diff --git a/plugin/src/docs/code/s2-quickstart/build.gradle b/plugin/src/docs/code/s2-quickstart/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     dependencies {
         classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
         classpath "com.bertramlabs.plugins:asset-pipeline-gradle:$assetPipelineVersion"
-        classpath "org.grails.plugins:hibernate5:8.0.0"
+        classpath "org.grails.plugins:hibernate5:8.0.1"
     }
 }
 
@@ -48,7 +48,7 @@ dependencies {
     implementation "org.grails.plugins:events"
     implementation "org.grails.plugins:gsp"
     profile "org.grails.profiles:web"
-    implementation 'org.grails.plugins:spring-security-core:6.0.0'
+    implementation 'org.grails.plugins:spring-security-core:6.0.1'
     runtimeOnly "org.glassfish.web:el-impl:2.2.1-b05"
     runtimeOnly "com.h2database:h2"
     runtimeOnly "org.apache.tomcat:tomcat-jdbc"
@@ -59,11 +59,11 @@ dependencies {
     testImplementation "org.mockito:mockito-core"
     testImplementation "org.grails:grails-web-testing-support"
     testImplementation "org.grails.plugins:geb"
-    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:4.11.0"
-    testImplementation "org.seleniumhq.selenium:selenium-api:4.11.0"
-    testImplementation "org.seleniumhq.selenium:selenium-support:4.11.0"
-    testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:4.11.0"
-    testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:4.11.0"
+    testImplementation "org.seleniumhq.selenium:selenium-remote-driver:4.13.0"
+    testImplementation "org.seleniumhq.selenium:selenium-api:4.13.0"
+    testImplementation "org.seleniumhq.selenium:selenium-support:4.13.0"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:4.13.0"
+    testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:4.13.0"
 }
 
 bootRun {

diff --git a/plugin/src/docs/code/s2-quickstart/gradle/wrapper/gradle-wrapper.properties b/plugin/src/docs/code/s2-quickstart/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
diff --git a/settings.gradle b/settings.gradle
@@ -8,16 +8,16 @@ pluginManagement {
         id "org.grails.grails-web" version "6.0.0"
         id "org.grails.grails-gsp" version "6.0.0"
         id "org.grails.grails-plugin" version "$grailsGradlePluginVersion"
-        id "com.bertramlabs.asset-pipeline" version "4.3.0"
+        id "com.bertramlabs.asset-pipeline" version "4.4.0"
         id "com.github.erdi.webdriver-binaries" version "3.2"
         id "io.spring.dependency-management" version "1.1.3"
         id "org.asciidoctor.jvm.convert" version "4.0.0-alpha.1"
     }
 }
 
 plugins {
-    id "com.gradle.enterprise" version "3.14.1"
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.1'
+    id "com.gradle.enterprise" version "3.15.1"
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.3'
 }
 
 gradleEnterprise {