Merge branch '2024.0.x'

Author: rainboyan

grace-gradle-plugin/build.gradle

@@ -1,10 +1,7 @@
-buildscript {
-    repositories {
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath("com.gradle.plugin-publish:com.gradle.plugin-publish.gradle.plugin:2.0.0")
-    }
+plugins {
+    id('java-gradle-plugin')
+    id('maven-publish')
+    alias libs.plugins.gradle.plugin.publish
 }
 
 ext.isSnapshot = version.endsWith("-SNAPSHOT")
@@ -13,10 +10,6 @@ ext."signing.keyId" = System.getenv("SIGNING_KEY") ?: project.hasProperty("signi
 ext."signing.password" = System.getenv("SIGNING_PASSPHRASE") ?: project.hasProperty("signing.password") ? project.getProperty('signing.password') : null
 ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ? project.getProperty('signing.secretKeyRingFile') : null
 
-apply plugin: 'com.gradle.plugin-publish'
-apply plugin: 'java-gradle-plugin'
-apply plugin: 'maven-publish'
-
 java {
     withJavadocJar()
     withSourcesJar()

gradle/libs.versions.toml

@@ -23,6 +23,7 @@ grace-data-mongodb = "2024.0.0-RC1"
 grace-doc-engine = "2.0.0"
 gradle = "8.14.4"
 gradle-git-properties = "2.5.7"
+gradle-plugin-publish = "2.1.1"
 groovy = "4.0.30"
 gson = "2.13.2"
 h2 = "2.3.232"
@@ -247,4 +248,5 @@ snakeyaml-bundle = ["snakeyaml"]
 tomcat-bundle = ["tomcat-annotations-api", "tomcat-jdbc", "tomcat-jsp-api", "tomcat-embed-core", "tomcat-embed-el", "tomcat-embed-jasper", "tomcat-embed-websocket"]
 
 [plugins]
-gradle-git-properties = { id = "com.gorylenko.gradle-git-properties", version.ref = "gradle-git-properties" }
+gradle-git-properties = { id = "com.gorylenko.gradle-git-properties", version.ref = "gradle-git-properties" }
+gradle-plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-plugin-publish" }