Pre release 5.0.0-M1

grails-plugins · Dec 24, 2024 · 768b885 · 768b885
1 parent 4abb629
commit 768b885
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 28 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,14 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        maven { url "https://repo.grails.org/grails/core" }
+    }
+    dependencies {
+        classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
+    }
+}
+
 allprojects {
     repositories {
         mavenCentral()
@@ -13,6 +24,19 @@ subprojects { project ->
     apply plugin: "groovy"
 
     project.compileJava.options.release = 17
+
+    if(project.name.endsWith('spring-security-ldap')) {
+        apply plugin: "org.grails.grails-publish"
+        grailsPublish {
+            githubSlug = 'grails-plugins/grails-spring-security-ldap'
+            license {
+                name = 'Apache-2.0'
+            }
+            title = 'Grails Spring Security LDAP Plugin'
+            desc = 'Adds Spring Security LDAP support to a Grails application.'
+            developers = [burtbeckwith: 'Burt Beckwith']
+        }
+    }
 }
 
 apply from: rootProject.file("gradle/docs.gradle")
diff --git a/docs/build.gradle b/docs/build.gradle
@@ -24,15 +24,15 @@ def asciidoctorAttributes = [
         version                           : project.version,
         projectUrl                        : "https://github.com/grails-plugins/grails-spring-security-ldap",
         sourcedir                         : "${rootProject.allprojects.find { it.name == 'spring-security-ldap' }.projectDir}/src/main/groovy",
-        gormDetailedLink                  : "https://gorm.grails.org/${getGrailsDocumentationVersion(project['gorm.version'] as String)}/hibernate/manual/index.html",
+        gormDetailedLink                  : "https://gorm.grails.org/${getGrailsDocumentationVersion(project.documentationGormHibernateVersion as String)}/hibernate/manual/index.html",
         gormSummaryLink                   : "https://docs.grails.org/${getGrailsDocumentationVersion(project.grailsVersion)}/guide/GORM.html",
         grailsDocBase                     : "https://docs.grails.org/${getGrailsDocumentationVersion(project.grailsVersion)}",
         functionalTestAppPath             : "${rootProject.allprojects.find { it.name == 'functional-test-app' }.projectDir}",
         customUserDetailsContextMapperPath: "${rootProject.allprojects.find { it.name == 'custom-user-details-context-mapper' }.projectDir}",
         grailsSpringSecurityCoreVersion   : project['grailsSpringSecurityCoreVersion'],
         grailsSpringSecurityCoreLink      : "https://grails.github.io/grails-spring-security-core/${getGrailsDocumentationVersion(project.grailsSpringSecurityCoreVersion)}/index.html",
-        springSecurityLdapLink            : "https://docs.spring.io/spring-security/reference/${project.springSecurityVersion}/servlet/authentication/passwords/ldap.html",
-        springSecurityLdapApiLink         : "https://docs.spring.io/spring-security/site/docs/${project.springSecurityVersion}/api"
+        springSecurityLdapLink            : "https://docs.spring.io/spring-security/reference/${project.documentationSpringSecurityVersion}/servlet/authentication/passwords/ldap.html",
+        springSecurityLdapApiLink         : "https://docs.spring.io/spring-security/site/docs/${project.documentationSpringSecurityVersion}/api"
 
 ]
 

diff --git a/examples/custom-user-details-context-mapper/build.gradle b/examples/custom-user-details-context-mapper/build.gradle
@@ -12,6 +12,8 @@ version "0.1"
 group "misc.functional.test.app"
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
+
     profile("org.grails.profiles:web")
     implementation("org.grails:grails-core")
     implementation("org.grails:grails-logging")
@@ -25,7 +27,6 @@ dependencies {
     implementation("org.grails.plugins:gsp")
     implementation("org.grails.plugins:hibernate5")
     implementation("org.grails.plugins:scaffolding")
-    implementation("org.sitemesh:grails-plugin-sitemesh3:${grailsVersion}")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-actuator")

diff --git a/examples/functional-test-app/build.gradle b/examples/functional-test-app/build.gradle
@@ -11,6 +11,8 @@ plugins {
 group "com.test"
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
+
     profile("org.grails.profiles:web")
     implementation("org.grails:grails-core")
     implementation("org.grails:grails-logging")
@@ -24,7 +26,6 @@ dependencies {
     implementation("org.grails.plugins:gsp")
     implementation("org.grails.plugins:hibernate5")
     implementation("org.grails.plugins:scaffolding")
-    implementation("org.sitemesh:grails-plugin-sitemesh3:${grailsVersion}")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-actuator")

diff --git a/examples/retrieve-db-roles/build.gradle b/examples/retrieve-db-roles/build.gradle
@@ -11,6 +11,8 @@ plugins {
 group "misc.functional.test.app"
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
+
     profile("org.grails.profiles:web")
     implementation("org.grails:grails-core")
     implementation("org.grails:grails-logging")
@@ -24,7 +26,6 @@ dependencies {
     implementation("org.grails.plugins:gsp")
     implementation("org.grails.plugins:hibernate5")
     implementation("org.grails.plugins:scaffolding")
-    implementation("org.sitemesh:grails-plugin-sitemesh3:${grailsVersion}")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-actuator")

diff --git a/examples/retrieve-group-roles/build.gradle b/examples/retrieve-group-roles/build.gradle
@@ -11,6 +11,8 @@ plugins {
 group "misc.functional.test.app"
 
 dependencies {
+    implementation platform("org.grails:grails-bom:$grailsVersion")
+
     profile("org.grails.profiles:web")
     implementation("org.grails:grails-core")
     implementation("org.grails:grails-logging")
@@ -24,7 +26,6 @@ dependencies {
     implementation("org.grails.plugins:gsp")
     implementation("org.grails.plugins:hibernate5")
     implementation("org.grails.plugins:scaffolding")
-    implementation("org.sitemesh:grails-plugin-sitemesh3:${grailsVersion}")
     implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-actuator")

diff --git a/gradle.properties b/gradle.properties
@@ -1,10 +1,9 @@
 projectVersion=5.0.0-SNAPSHOT
 
-grailsVersion=7.0.0-SNAPSHOT
+grailsVersion=7.0.0-M1
 grailsGradlePluginVersion=7.0.0-SNAPSHOT
-springSecurityVersion=6.3.4
-springLdapCoreVersion=3.2.7
-grailsSpringSecurityCoreVersion=7.0.0-SNAPSHOT
-gebVersion=5.0.0-SNAPSHOT
-assetPipelineVersion=5.0.1
-gorm.version=9.0.0-SNAPSHOT
+grailsSpringSecurityCoreVersion=7.0.0-M1
+assetPipelineVersion=5.0.5
+
+documentationSpringSecurityVersion=6.4.2
+documentationGormHibernateVersion=9.0.0-M2
diff --git a/plugin/build.gradle b/plugin/build.gradle
@@ -20,19 +20,21 @@ plugins {
 group "org.grails.plugins"
 
 dependencies {
+	implementation platform("org.grails:grails-bom:$grailsVersion")
+
 	runtimeOnly 'org.grails:grails-web-boot'
 
 	api "org.grails.plugins:spring-security-core:$grailsSpringSecurityCoreVersion"
 
-	api "org.springframework.security:spring-security-ldap:$springSecurityVersion", {
+	api "org.springframework.security:spring-security-ldap", {
 		['apacheds-core', 'apacheds-core-entry', 'apacheds-protocol-ldap', 'apacheds-protocol-shared',
 		 'apacheds-server-jndi', 'commons-logging', 'fest-assert', 'jcl-over-slf4j', 'junit',
 		 'ldapsdk', 'logback-classic', 'mockito-core', 'shared-ldap', 'slf4j-api', 'spring-beans',
 		 'spring-context', 'spring-core', 'spring-ldap-core', 'spring-security-core',
 		 'spring-test', 'spring-tx'].each { exclude module: it }
 	}
 
-	api "org.springframework.ldap:spring-ldap-core:$springLdapCoreVersion", {
+	api "org.springframework.ldap:spring-ldap-core", {
 		['commons-lang', 'gsbase', 'junit', 'mockito-core', 'powermock-api-mockito',
 		 'powermock-api-support', 'powermock-core', 'powermock-module-junit4',
 		 'powermock-module-junit4-common', 'powermock-reflect', 'slf4j-log4j12', 'spring-beans',
@@ -45,15 +47,4 @@ dependencies {
 
 bootJar.enabled = false
 
-apply from: rootProject.file("gradle/testing.gradle")
-
-apply plugin: "org.grails.grails-publish"
-grailsPublish {
-	githubSlug = 'grails-plugins/grails-spring-security-ldap'
-	license {
-		name = 'Apache-2.0'
-	}
-	title = 'Grails Spring Security LDAP Plugin'
-	desc = 'Adds Spring Security LDAP support to a Grails application.'
-	developers = [burtbeckwith: 'Burt Beckwith']
-}
+apply from: rootProject.file("gradle/testing.gradle")