Gradle 9.0 prep

annotation-descriptor-generator/annotation-descriptor-generator.gradle

@@ -1,3 +1,3 @@
 apply from: rootProject.file( 'gradle/java-module.gradle' )
-apply plugin: 'version-injection'
+apply plugin: 'org.hibernate.build.version-injection'
 

build.gradle

@@ -11,7 +11,6 @@ buildscript {
 //	}
 
 	dependencies {
-		classpath 'org.hibernate.build.gradle:version-injection-plugin:1.0.0'
 //		classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.7'
 		classpath 'de.thetaphi:forbiddenapis:3.2'
 		classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.1'
@@ -21,14 +20,15 @@ buildscript {
 
 plugins {
 	id 'org.hibernate.build.xjc-jakarta' version '2.0.3' apply false
+	id "org.hibernate.build.version-injection" version "2.0.0" apply false
 	id 'org.hibernate.matrix-test' version '3.1.1' apply false
 	id 'org.hibernate.orm.database-service' apply false
-	id 'biz.aQute.bnd' version '6.3.1' apply false
+	id 'biz.aQute.bnd' version '7.0.0' apply false
 
 	id 'org.checkerframework' version '0.6.40'
 	id 'org.hibernate.orm.build.jdks'
 
-	id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
+	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 
 	id 'idea'
 	id 'org.jetbrains.gradle.plugin.idea-ext' version '1.0'

settings.gradle

@@ -30,14 +30,14 @@ dependencyResolutionManagement {
             url( rootProject.property( "mavenMirror" ) )
         }
         mavenCentral()
-        if (System.getProperty('JPA_PREVIEW') != null) {            // Needed for the RC versions of Jakarta Persistence
+        if (System.getProperty('JPA_PREVIEW') != null) {
 			maven {
 				url "https://jakarta.oss.sonatype.org/content/repositories/releases/"
 			}
-			// Needed for the SNAPSHOT versions of Jakarta Persistence
-			maven {
-				url "https://jakarta.oss.sonatype.org/content/repositories/snapshots/"
-			}
+            // Needed for the SNAPSHOT versions of Jakarta Persistence
+            maven {
+                url "https://jakarta.oss.sonatype.org/content/repositories/snapshots/"
+            }
 		}
 
         mavenLocal()

tooling/hibernate-ant/hibernate-ant.gradle

@@ -2,7 +2,7 @@
 description = 'Annotation Processor to generate JPA 2 static metamodel classes'
 
 apply from: rootProject.file( 'gradle/published-java-module.gradle' )
-apply plugin: 'version-injection'
+apply plugin: 'org.hibernate.build.version-injection'
 
 dependencies {
     compileOnly libs.ant

tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle

@@ -9,7 +9,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
 	id 'java-gradle-plugin'
-	id 'com.gradle.plugin-publish' version '0.20.0'
+	id 'com.gradle.plugin-publish' version '1.2.1'
 
 	id 'checkstyle'
 
@@ -23,11 +23,6 @@ apply from: rootProject.file( 'gradle/releasable.gradle' )
 
 description = "Gradle plugin for integrating Hibernate aspects into your build"
 
-ext {
-	pluginId = 'org.hibernate.orm'
-	pluginVersion = project.version
-}
-
 dependencies {
 	implementation project(':hibernate-core')
 	implementation libs.byteBuddy
@@ -48,35 +43,21 @@ dependencies {
 }
 
 gradlePlugin {
-	plugins {
-		ormPlugin {
-			id = project.pluginId
-			implementationClass = 'org.hibernate.orm.tooling.gradle.HibernateOrmPlugin'
-		}
-	}
-}
-
-pluginBundle {
 	website = 'https://github.com/hibernate/hibernate-orm/tree/main/tooling/hibernate-gradle-plugin'
 	vcsUrl = 'https://github.com/hibernate/hibernate-orm/tree/main/tooling/hibernate-gradle-plugin'
-	tags = ['hibernate','orm','bytecode','enhancement','bytebuddy']
-
-	// sigh
-	mavenCoordinates {
-		groupId = project.group.toString()
-		artifactId = project.name
-		version = project.version.toString()
-	}
 
 	plugins {
 		ormPlugin {
-			id = project.pluginId
+			id = "org.hibernate.orm"
+			implementationClass = "org.hibernate.orm.tooling.gradle.HibernateOrmPlugin"
 			displayName = 'Gradle plugin for Hibernate ORM'
 			description = 'Applies Hibernate aspects into the build'
+			tags = ['hibernate','orm','bytecode','enhancement','bytebuddy']
 		}
 	}
 }
 
+
 test {
 	useJUnitPlatform()
 	if ( project.hasProperty( 'excludeTests' ) ) {

tooling/metamodel-generator/hibernate-processor.gradle

@@ -7,7 +7,7 @@
 description = 'Hibernate compile-time tooling'
 
 apply from: rootProject.file( 'gradle/published-java-module.gradle' )
-apply plugin: 'version-injection'
+apply plugin: 'org.hibernate.build.version-injection'
 
 //java {
 //	sourceCompatibility = jdks.versions.baseline.get()