dependabot generation improvements

grails · Oct 19, 2024 · 27654a2 · 27654a2
1 parent 2e89e83
commit 27654a2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         classpath "io.github.gradle-nexus:publish-plugin:$gradleNexusPublishPluginVersion"
         classpath "com.netflix.nebula:gradle-extra-configurations-plugin:$gradleExtraConfigurationsPluginVersion"
         classpath "com.bmuschko:gradle-nexus-plugin:$gradleNexusPluginVersion"
-        classpath "jakarta.xml.bind:jakarta.xml.bind-api:$jakartaXmlBindVersion"
+        classpath "jakarta.xml.bind:jakarta.xml.bind-api:${project['jakarta.xml.bind-api.version']}"
         classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:$gradleLicensePluginVersion"
     }
 }
@@ -124,7 +124,7 @@ allprojects {
                         details.useVersion(groovyVersion)
                     }
                     if (details.requested.group == "org.spockframework") {
-                        details.useVersion(spockVersion)
+                        details.useVersion(project['spock.version'])
                     }
                 }
             }

diff --git a/gradle.properties b/gradle.properties
@@ -10,25 +10,21 @@ gradleNexusPublishPluginVersion=2.0.0
 gradleExtraConfigurationsPluginVersion=10.0.1
 gradleLicensePluginVersion=0.16.1
 gradleToolingApiVersion=8.10.2
-grailsGradlePluginVersion=7.0.0-SNAPSHOT
 groovyVersion=4.0.23
 hamcrestVersion=1.3
-jakartaXmlBindVersion=4.0.2
 joptSimpleVersion=5.0.4
 mongodbJavaDriverVersion=5.1.4
 plexusComponentApiVersion=1.0-alpha-33
 plexusSecDispatcherVersion=1.4
 plexusSisuInjectVersion=2.6.0
 slf4jVersion=2.0.16
-spockVersion=2.3-groovy-4.0
-springBootVersion=3.3.4
 
 org.gradle.caching=true
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=1024M
 
-# Generated by: ./gradlew :grails-bom:dependabot -Pgen=properties
+# Generated on Sat Oct 19 01:10:39 PDT 2024 by: ./gradlew :grails-bom:dependabot -Pgenerate=properties
 ant.version=1.10.15
 asciidoctorj.version=3.0.0
 aspectjrt.version=1.9.22.1
@@ -88,9 +84,9 @@ profiles-web.version=7.0.1-SNAPSHOT
 profiles-web-plugin.version=7.0.1-SNAPSHOT
 slf4j.version=2.0.16
 snakeyaml.version=2.3
-spock-core.version=2.3-groovy-4.0
+spock.version=2.3-groovy-4.0
 spotbugs-annotations.version=4.8.6
-spring-boot-cli.version=3.3.4
+spring-boot.version=3.3.4
 springloaded.version=1.2.8.RELEASE
 tomcat.version=10.1.31
 tomcat-embed-logging-juli.version=8.5.2

diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle
@@ -35,7 +35,7 @@ ext {
         jakarta.inject:jakarta.inject-api::
         jakarta.persistence:jakarta.persistence-api::
         jakarta.servlet:jakarta.servlet-api::
-        jakarta.xml.bind:jakarta.xml.bind-api::$jakartaXmlBindVersion
+        jakarta.xml.bind:jakarta.xml.bind-api::
         jline:jline::
         net.bytebuddy:byte-buddy::
         net.java.dev.jna:jna::
@@ -56,7 +56,7 @@ ext {
         org.grails:grails-datastore-gorm-hibernate5::
         org.grails:grails-datastore:async,core,gorm,gorm-async,gorm-support,gorm-rx,gorm-test,gorm-validation,web:$datastoreVersion
         org.grails:grails-gdoc-engine::
-        org.grails:grails-gradle-plugin::$grailsGradlePluginVersion
+        org.grails:grails-gradle-plugin::
         org.grails:grails-testing-support,grails-gorm-testing-support,grails-web-testing-support::
         org.grails:grails:grails-web-taglib,gsp,web-gsp::gsp
         org.grails:views-json-testing-support::
@@ -67,8 +67,8 @@ ext {
         org.objenesis:objenesis::
         org.slf4j:jcl-over-slf4j::$slf4jVersion
         org.slf4j:slf4j:api,simple:$slf4jVersion
-        org.spockframework:spock-core,spock-spring::$spockVersion
-        org.springframework.boot:spring-boot-cli::$springBootVersion
+        org.spockframework:spock-core,spock-spring:::spock
+        org.springframework.boot:spring-boot-cli:::spring-boot
         org.springframework:springloaded::
         org.xhtmlrenderer:flying-saucer-pdf-openpdf::
         org.yaml:snakeyaml::
@@ -111,7 +111,7 @@ allDependencies.each {
 }
 
 dependencies {
-    api platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}")
+    api platform("org.springframework.boot:spring-boot-dependencies:${project['spring-boot.version']}")
 
     constraints {
         allDependencies.each {
@@ -127,7 +127,6 @@ publishing {
                 def root = asNode()
 
                 def propsNode = root.appendNode('properties')
-                propsNode.appendNode('spring-boot.version', springBootVersion)
                 dependenciesVersions.each {
                     propsNode.appendNode(it.version, it.versionValue)
                 }
@@ -176,23 +175,26 @@ task dependabot {
         def action = project.findProperty('generate') ?: project.findProperty('gen') ?: 'gradle'
 
         switch (action) {
+            case 'props':
             case 'properties':
-                println "# Generated on ${new Date()} by: ./gradlew :grails-bom:dependabot -Pgen=properties"
-                dependenciesVersions.each {
-                    println "$it.version=$it.versionValue"
-                }
+                def gradleProperties = new File("${projectDir.parentFile}/gradle.properties")
+                gradleProperties << '\n\n' + """\
+                    # Generated on ${new Date()} by: ./gradlew :grails-bom:dependabot -Pgenerate=properties
+                    ${dependenciesVersions.collect { "$it.version=$it.versionValue" }.join('\n                    ')}
+                    """.stripIndent(true).trim()
+                println "${gradleProperties} appended."
                 break
             default:
                 def dependabot = new File("${projectDir.parentFile}/dependabot/build.gradle")
                 dependabot.parentFile.mkdirs()
                 dependabot.write("""\
-                    // Gemerated on ${new Date()} by: ./gradlew :grails-bom:dependabot
+                    // Generated on ${new Date()} by: ./gradlew :grails-bom:dependabot -Pgenerate=gradle
                     plugins {
-                        id 'java'
+                        id 'java-library'
                     }
                 
                     dependencies {
-                    ${allDependencies.collect { "    compileOnly \"${it.groupId}:${it.artifactId}:\${${it.version}}\"" }.join('\n                    ')}
+                    ${allDependencies.collect { "    api \"${it.groupId}:${it.artifactId}:\${project['${it.version}']}\"" }.join('\n                    ')}
                     }
                     """.stripIndent(true).trim())
                 println "${dependabot} created."