Merge branch '7.0.x' into 7.0.x-mongo-pre-update-snapshot

Author: codeconsole

build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GradleUtils.groovy

@@ -41,8 +41,4 @@ class GradleUtils {
     static <T> T lookupProperty(Project project, String name, T defaultValue = null) {
         project.findProperty(name) as T ?: defaultValue
     }
-
-    static <T> T lookupPropertyByType(Project project, String name, Class<T> type) {
-        project.findProperty(name) as T
-    }
 }

build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/PublishPlugin.groovy

@@ -178,6 +178,10 @@ class PublishPlugin implements Plugin<Project> {
             it.license.name = 'Apache-2.0'
             it.title.set(project.provider { lookupProperty(project, 'pomTitle', project.rootProject.name == 'grails-forge' ? 'Apache Grails® Application Forge' : 'Apache Grails® framework')})
             it.desc.set(project.provider { lookupProperty(project, 'pomDescription', project.rootProject.name == 'grails-forge' ? 'Generates Apache Grails® applications' : 'Apache Grails® Web Application Framework')})
+            it.organization {
+                it.name.set('Apache Software Foundation')
+                it.url.set('https://apache.org/')
+            }
             it.developers.set(project.provider { lookupProperty(project, 'pomDevelopers', determineDevelopers(project))})
             it.pomCustomization = lookupProperty(project, 'pomCustomization') as Closure
             it.publishTestSources.set(project.provider { lookupProperty(project, 'pomPublishTestSources', false)})

build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/SbomPlugin.groovy

@@ -48,7 +48,6 @@ import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
 
 import static org.apache.grails.buildsrc.GradleUtils.lookupProperty
-import static org.apache.grails.buildsrc.GradleUtils.lookupPropertyByType
 
 @CompileStatic
 class SbomPlugin implements Plugin<Project> {
@@ -125,8 +124,8 @@ class SbomPlugin implements Plugin<Project> {
         def sbomOutputLocation = project.layout.buildDirectory.file(
             project.provider {
                 def artifactId = lookupProperty(project, 'pomArtifactId', project.name)
-                def version = lookupPropertyByType(project, 'projectVersion', String)
-                "${artifactId}-${version}-sbom.json" as String
+                def version = project.findProperty('projectVersion')
+                "$artifactId-$version-sbom.json" as String
             }
         )
 

grails-forge/gradle.properties

@@ -24,7 +24,7 @@ title=Grails Application Forge
 projectDesc=Generates Grails applications
 
 # for forge build process which is a micronaut 3.x.x app with picocli
-grailsPublishGradleVersion=0.0.2-SNAPSHOT
+grailsPublishGradleVersion=0.0.2
 antVersion=1.10.15
 antlr4Version=4.8-1!!
 apacheRatVersion=0.8.1