diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GradleUtils.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GradleUtils.groovy index 2b1e9057a9c..2ee3b782f11 100644 --- a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GradleUtils.groovy +++ b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/GradleUtils.groovy @@ -41,8 +41,4 @@ class GradleUtils { static T lookupProperty(Project project, String name, T defaultValue = null) { project.findProperty(name) as T ?: defaultValue } - - static T lookupPropertyByType(Project project, String name, Class type) { - project.findProperty(name) as T - } } diff --git a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/SbomPlugin.groovy b/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/SbomPlugin.groovy index bde5353d5df..0f7acf4256a 100644 --- a/build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/SbomPlugin.groovy +++ b/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 { @@ -125,8 +124,8 @@ class SbomPlugin implements Plugin { 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 } )