Merge pull request #36 from tucker-bluesage/3.0.x

Upgrading to Grails 5.3.2 eliminating conflict with logback-config.

README.md

@@ -9,18 +9,20 @@ Main differences with the Grails 2 plugin:
 - simplest code as possible
 - easy to extend
 
-Installation
+Documentation
 ------------
-Use [v1.2.x](https://github.com/grails-plugins/grails-spring-security-oauth2-google/releases/tag/v1.2.0) for Grails 3.0 to 3.2
+[User Guide](https://grails.github.io/grails-spring-security-oauth2/)
 
-Use v1.3.x for Grails 3.3+.
+Installation
+------------
+For Grails 5.3+
 
 Add the following dependencies in `build.gradle`
 ```
 dependencies {
 ...
-    compile 'org.grails.plugins:spring-security:3.2.+'
-    compile 'org.grails.plugins:spring-security-oauth2:1.2.0'
+    implementation 'org.grails.plugins:spring-security-core:5.2.1'
+    implementation 'org.grails.plugins:spring-security-oauth2:3.0.0'
 ...
 }
 ```

build.gradle

@@ -4,24 +4,30 @@ buildscript {
 	}
 	dependencies {
 		classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
-		classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.2.4"
 		classpath "org.asciidoctor:asciidoctor-gradle-jvm:3.3.2"
 	}
 }
 
+plugins {
+    id 'maven-publish'
+    id 'idea'
+    id 'eclipse'
+    id 'signing'
+    id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
+}
+
+
 version project.projectVersion
 group = 'org.grails.plugins'
 
-apply plugin:"eclipse"
-apply plugin: "idea"
+
 apply plugin: "java-library"
 apply plugin: "org.grails.grails-plugin"
 apply plugin: "org.grails.grails-gsp"
-apply plugin: "org.grails.internal.grails-plugin-publish"
-apply plugin: "asset-pipeline"
 apply plugin: "org.asciidoctor.jvm.convert"
 
 repositories {
+	mavenCentral()
 	maven { url "https://repo.grails.org/grails/core" }
 }
 
@@ -39,8 +45,6 @@ dependencies {
 	console "org.grails:grails-console"
 	profile "org.grails.profiles:web-plugin"
 
-	runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.4.7"
-
 	testImplementation "org.springframework.boot:spring-boot-autoconfigure"
 	testImplementation "org.springframework.boot:spring-boot-starter-actuator"
 	testImplementation "org.springframework.boot:spring-boot-starter-tomcat"
@@ -51,28 +55,88 @@ dependencies {
 	documentation "com.github.javaparser:javaparser-core:3.15.14"
 }
 
-grailsPublish {
-	githubSlug = 'grails/grails-spring-security-oauth2'
-	license {
-		name = 'Apache-2.0'
+publishing {
+	publications {
+		maven(MavenPublication) {
+
+			groupId = project.group
+			artifactId = 'spring-security-oauth2'
+			version = project.version
+
+			from components.java
+
+			artifact sourcesJar
+			artifact javadocJar
+
+			pom {
+				name = 'Spring Security Oauth2 Plugin'
+				description = 'This plugin provides the capability to authenticate via oauth and depends on grails-spring-security-core.'
+				url = 'https://github.com/grails/grails-spring-security-oauth2'
+				licenses {
+					license {
+						name = 'The Apache License, Version 2.0'
+						url = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+					}
+				}
+				developers {
+					developer {
+						id = 'MatrixCrawler'
+						name = 'Johannes Brunswicker'
+						email = ''
+					}
+					developer {
+						id = 'aitmanas'
+						name = 'aitmanas'
+						email = ''
+					}
+					developer {
+						id = 'rvanderwerf'
+						name = 'Ryan Vanderwerf'
+						email = ''
+					}
+					developer {
+						id = 'puneetbehl'
+						name = 'Puneet Behl'
+						email = ''
+					}
+				}
+				scm {
+					connection = 'scm:git:https://github.com/grails/grails-spring-security-oauth2.git'
+					developerConnection = 'scm:git:https://github.com/grails/grails-spring-security-oauth2.git'
+					url = 'https://github.com/grails/grails-spring-security-oauth2/tree/2.0.x'
+				}
+			}
+		}
+
+
 	}
-	title = "Spring Security OAuth2"
-	desc = """
-	This plugin provides the capability to authenticate via oauth and depends on grails-spring-security-core.
-"""
-	developers = [
-		MatrixCrawler: "Johannes Brunswicker",
-		aitmanas: "aitmanas",
-		rvanderwerf: "Ryan Vanderwerf",
-		puneetbehl: "Puneet Behl"
-	]
-	userOrg = 'grails'
 }
 
-assets {
-	packagePlugin = true
+//afterEvaluate {
+//    signing {
+//        //required { gradle.taskGraph.hasTask("publish") || gradle.taskGraph.hasTask("publishMavenPublicationToMavenLocal") }
+//        sign publishing.publications.maven
+//    }
+//}
+
+nexusPublishing {
+	repositories {
+		sonatype {
+			def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : ''
+			def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : ''
+			def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.hasProperty("sonatypeOssStagingProfileId") ? project.sonatypeOssStagingProfileId : ''
+			nexusUrl = uri("https://s01.oss.sonatype.org/service/local/")
+			snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+			username = ossUser
+			password = ossPass
+			stagingProfileId = ossStagingProfileId
+		}
+	}
 }
 
+
+
+
 tasks.withType(Test) {
 	useJUnitPlatform()
 }

gradle.properties

@@ -1,6 +1,8 @@
-projectVersion=2.0.0-SNAPSHOT
-grailsVersion=5.1.3
+projectVersion=3.0.0
+grailsVersion=5.3.2
 grailsGradlePluginVersion=5.3.0
+groovyVersion=3.0.11
+gorm.version=7.3.3
 vcsUrl=https://github.com/grails/grails-spring-security-oauth2
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists