Merge pull request #499 from grails/grails6-update

Grails6 update

.github/workflows/gradle.yml

@@ -2,10 +2,10 @@ name: Java CI
 on:
   push:
     branches:
-      - '[3-9].[3-9].x'
+      - '[3-9].[0-9].x'
   pull_request:
     branches:
-      - '[3-9].[3-9].x'
+      - '[3-9].[0-9].x'
   workflow_dispatch:
 jobs:
   test:

build.gradle

@@ -1,21 +1,19 @@
 buildscript {
-    ext {
-        grailsVersion = project.grailsVersion
-    }
     repositories {
-        mavenLocal()
-        jcenter()
+        mavenCentral()
         maven { url "https://repo.grails.org/grails/core" }
     }
     dependencies {
-        classpath "org.grails:grails-gradle-plugin:$grailsVersion"
-        classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.15.2"
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
-        //classpath "io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE"
-        classpath 'com.adarshr:gradle-test-logger-plugin:2.0.0'
+        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
+        classpath 'com.adarshr:gradle-test-logger-plugin:4.0.0'
     }
 }
 
+plugins {
+    id 'idea'
+    id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
+}
+
 allprojects {
     apply plugin:"idea"
 }
@@ -30,44 +28,43 @@ subprojects { Project project ->
 
     ext {
         grailsVersion = project.grailsVersion
-        gradleWrapperVersion = project.gradleWrapperVersion
         isSnapshot = version.endsWith('SNAPSHOT')
-        bintrayUser = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : ''
-        bintrayKey = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : ''
-        pluginPortalUser = project.hasProperty('pluginPortalUser') ? project.property('pluginPortalUser') : ''
-        pluginPortalPassword = project.hasProperty('pluginPortalPassword') ? project.property('pluginPortalPassword') : ''
     }
 
     repositories {
-        mavenLocal()
+        mavenCentral()
         maven { url "https://repo.grails.org/grails/core" }
     }
     if (project.name != "spring-security-rest-docs" &&
         project.name != "spring-security-rest-testapp-profile" &&
             !project.name.startsWith("build") ) {
         apply plugin: "org.grails.grails-plugin"
-        apply plugin: "org.grails.grails-plugin-publish"
-        apply plugin: "com.jfrog.artifactory"
+    }
+
+    tasks.withType(Test) {
+        useJUnitPlatform()
     }
 
     if (project.name in pluginProjects) {
 
         sourceCompatibility = targetCompatibility = 1.8
 
+        apply plugin: "java-library"
+
         dependencies {
             console "org.grails:grails-console"
 
-            compile "org.springframework.boot:spring-boot-starter-logging"
-            compile "org.springframework.boot:spring-boot-autoconfigure"
-            compile "org.grails:grails-core"
+            api "org.springframework.boot:spring-boot-starter-logging"
+            api "org.springframework.boot:spring-boot-autoconfigure"
+            api "org.grails:grails-core"
+            api "org.grails.plugins:spring-security-core:$springSecurityCoreVersion"
 
-            provided "org.grails:grails-plugin-services"
-            provided "org.grails:grails-plugin-domain-class"
+            api "org.grails:grails-plugin-services"
+            api "org.grails:grails-plugin-domain-class"
 
-            testCompile "org.grails:grails-gorm-testing-support"
-            //testCompile "org.grails:grails-plugin-testing"
-            testCompile "org.grails:grails-web-testing-support"
-            testCompile('com.athaydes:spock-reports:1.7.1') {
+            testImplementation "org.grails:grails-gorm-testing-support"
+            testImplementation "org.grails:grails-web-testing-support"
+            testImplementation('com.athaydes:spock-reports:2.5.1-groovy-3.0') {
                 transitive = false
             }
         }
@@ -81,51 +78,57 @@ subprojects { Project project ->
             showSkippedStandardStreams false
             showFailedStandardStreams true
         }
-
-        artifactoryPublish {
-            dependsOn sourcesJar, javadocJar
-        }
     }
 
     if (project.name in profileProjects) {
         apply plugin: "org.grails.grails-profile"
-        apply plugin: "org.grails.grails-profile-publish"
     }
 
     if (project.name in publishedProjects && project.name != "spring-security-rest-docs" &&
             project.name != "spring-security-rest-testapp-profile") {
-        grailsPublish {
-            user = bintrayUser
-            key = bintrayKey
-            portalUser = pluginPortalUser
-            portalPassword = pluginPortalPassword
-            userOrg = 'grails'
-            repo = 'plugins'
-            githubSlug = 'alvarosanchez/grails-spring-security-rest'
-            license {
-                name = 'Apache-2.0'
-            }
-            title = "Spring Security REST plugin"
-            desc = "Grails plugin to implement token-based, RESTful authentication using Spring Security"
-            developers = [
-                alvarosanchez: "Alvaro Sanchez-Mariscal",
-                Schlogen: "James Kleeh"
-            ]
-        }
-
-        artifactory {
-            contextUrl = 'http://oss.jfrog.org'
-            publish {
-                repository {
-                    repoKey = isSnapshot ? 'oss-snapshot-local' : 'oss-release-local'
-                    username = bintrayUser
-                    password = bintrayKey
-                }
-                defaults {
-                    // Reference to Gradle configurations defined in the build script.
-                    // This is how we tell the Artifactory Plugin which artifacts should be
-                    // published to Artifactory.
-                    publications('maven')
+        apply plugin: 'maven-publish'
+        apply plugin: 'signing'
+        publishing {
+            publications {
+                mavenRelease(MavenPublication) {
+
+                    groupId = project.group
+                    artifactId = 'spring-security-rest'
+                    version = project.version
+
+                    from components.java
+
+                    artifact sourcesJar
+                    artifact javadocJar
+
+                    pom {
+                        name = 'Spring Security REST plugin'
+                        description = 'Grails plugin to implement token-based, RESTful authentication using Spring Security'
+                        url = 'https://github.com/grails/grails-spring-security-rest'
+                        licenses {
+                            license {
+                                name = 'The Apache License, Version 2.0'
+                                url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+                            }
+                        }
+                        developers {
+                            developer {
+                                id = 'alvarosanchez'
+                                name = 'Alvaro Sanchez-Mariscal'
+                                email = ''
+                            }
+                            developer {
+                                id = 'jameskleeh'
+                                name = 'James Kleeh'
+                                email = ''
+                            }
+                        }
+                        scm {
+                            connection = 'scm:git:https://github.com/grails/grails-spring-security-rest.git'
+                            developerConnection = 'scm:git:https://github.com/grails/grails-spring-security-rest.git'
+                            url = 'https://github.com/grails/grails-spring-security-rest/tree/3.0.x'
+                        }
+                    }
                 }
             }
         }

gradle.properties

@@ -1,5 +1,3 @@
-grailsVersion=4.0.0
-springSecurityCoreVersion=4.0.0.RC3
-gradleWrapperVersion=4.9
-bintrayUser=alvarosanchez
-pluginPortalUser=alvaro.sanchez
+grailsVersion=5.3.2
+grailsGradlePluginVersion=5.3.0
+springSecurityCoreVersion=5.3.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists