diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index 02b5f88298..9af4fee5b5 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -138,7 +138,7 @@ dependencies { reportAggregation project(':hibernate-vibur') reportAggregation project(':hibernate-ant') reportAggregation project(':hibernate-enhance-maven-plugin') - reportAggregation project(':hibernate-jpamodelgen') + reportAggregation project(':hibernate-processor') asciidoctorGems 'rubygems:rouge:4.1.1' @@ -172,8 +172,8 @@ dependencies { jcache project( ':hibernate-jcache' ) javadocSources project( path: ':hibernate-jcache', configuration: 'javadocSources' ) - jpamodelgen project( ':hibernate-jpamodelgen' ) - javadocSources project( path: ':hibernate-jpamodelgen', configuration: 'javadocSources' ) + jpamodelgen project( ':hibernate-processor' ) + javadocSources project( path: ':hibernate-processor', configuration: 'javadocSources' ) javadocClasspath libs.loggingAnnotations javadocClasspath jakartaLibs.validation diff --git a/documentation/src/main/asciidoc/introduction/Configuration.adoc b/documentation/src/main/asciidoc/introduction/Configuration.adoc index 9293cf6e0c..0c012841fc 100644 --- a/documentation/src/main/asciidoc/introduction/Configuration.adoc +++ b/documentation/src/main/asciidoc/introduction/Configuration.adoc @@ -102,7 +102,7 @@ or `org.slf4j:slf4j-jdk14` | A JDBC connection pool, for example, {agroal}[Agroal] | `org.hibernate.orm:hibernate-agroal` + and `io.agroal:agroal-pool` -| The {generator}[Hibernate Metamodel Generator], especially if you're using the JPA criteria query API | `org.hibernate.orm:hibernate-jpamodelgen` +| The {generator}[Hibernate Metamodel Generator], especially if you're using the JPA criteria query API | `org.hibernate.orm:hibernate-processor` | The {query-validator}[Query Validator], for compile-time checking of HQL | `org.hibernate:query-validator` | {validator}[Hibernate Validator], an implementation of {bean-validation}[Bean Validation] | `org.hibernate.validator:hibernate-validator` + diff --git a/documentation/src/main/asciidoc/introduction/Introduction.adoc b/documentation/src/main/asciidoc/introduction/Introduction.adoc index d7d33e0978..1e4ccc6049 100644 --- a/documentation/src/main/asciidoc/introduction/Introduction.adoc +++ b/documentation/src/main/asciidoc/introduction/Introduction.adoc @@ -168,7 +168,7 @@ dependencies { implementation 'org.apache.logging.log4j:log4j-core:2.20.0' // JPA Metamodel Generator - annotationProcessor 'org.hibernate.orm:hibernate-jpamodelgen:{fullVersion}' + annotationProcessor 'org.hibernate.orm:hibernate-processor:{fullVersion}' // Compile-time checking for HQL //implementation 'org.hibernate:query-validator:2.0-SNAPSHOT' diff --git a/documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc b/documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc index 81a9a507dc..dab911d9fa 100644 --- a/documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc +++ b/documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc @@ -42,7 +42,7 @@ transitive dependencies based on the features being used or not. |hibernate-core| The core object/relational mapping engine |hibernate-envers| Entity versioning and auditing |hibernate-spatial| Support for spatial/GIS data types using https://github.com/GeoLatte/geolatte-geom[GeoLatte] -|hibernate-jpamodelgen| An annotation processor that generates a JPA-compliant metamodel, plus optional Hibernate extras +|hibernate-processor| An annotation processor that generates a JPA-compliant metamodel, plus optional Hibernate extras |hibernate-vector| Support for mathematical vector types and functions useful for AI/ML topics like vector similarity search and Retrieval-Augmented Generation (RAG) |=== diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example-metamodel.pom b/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example-metamodel.pom index 56f4a3f1c9..73a4c40dd4 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example-metamodel.pom +++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example-metamodel.pom @@ -9,7 +9,7 @@ org.hibernate.orm - hibernate-jpamodelgen + hibernate-processor $currentHibernateVersion diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/gradle.adoc b/documentation/src/main/asciidoc/userguide/chapters/tooling/gradle.adoc index 39b882883a..0033759d9e 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/tooling/gradle.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/gradle.adoc @@ -60,13 +60,13 @@ It also exposes the following method forms: ==== Static Metamodel Generation Static metamodel generation can be incorporated into Gradle builds via the -annotation processor provided by the `org.hibernate.orm:hibernate-jpamodelgen` artifact. Applying +annotation processor provided by the `org.hibernate.orm:hibernate-processor` artifact. Applying an annotation processor in Gradle is super easy - [source,gradle] ---- dependencies { - annotationProcessor "org.hibernate.orm:hibernate-jpamodelgen:${hibernateVersion}" + annotationProcessor "org.hibernate.orm:hibernate-processor:${hibernateVersion}" } ---- diff --git a/documentation/src/main/asciidoc/userguide/chapters/tooling/modelgen.adoc b/documentation/src/main/asciidoc/userguide/chapters/tooling/modelgen.adoc index 99c0dcd9bc..893ba815ab 100644 --- a/documentation/src/main/asciidoc/userguide/chapters/tooling/modelgen.adoc +++ b/documentation/src/main/asciidoc/userguide/chapters/tooling/modelgen.adoc @@ -14,7 +14,7 @@ Jakarta Persistence defines a typesafe Criteria API which allows <> queries to be constructed in a strongly-typed manner, utilizing so-called static metamodel classes. The Hibernate Static Metamodel Generator, available via the published -`org.hibernate.orm:hibernate-jpamodelgen` artifact, is an link:{ann-proc}[annotation processor] +`org.hibernate.orm:hibernate-processor` artifact, is an link:{ann-proc}[annotation processor] used to generate these static metamodel classes. [NOTE] diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index 05d798e5ec..29f08b7526 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -72,7 +72,7 @@ dependencies { testRuntimeOnly libs.jacksonXml testRuntimeOnly libs.jacksonJsr310 - testAnnotationProcessor project( ':hibernate-jpamodelgen' ) + testAnnotationProcessor project( ':hibernate-processor' ) // NOTE: it seems like, since 4.10, the Antlr Tool no longer defines // transitive dep on the corresponding Antlr Runtime. At least, I get diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/processing/package-info.java b/hibernate-core/src/main/java/org/hibernate/annotations/processing/package-info.java index b4044a97e9..7e6fe20291 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/processing/package-info.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/processing/package-info.java @@ -22,7 +22,7 @@ *

* Annotations in this package control Hibernate's compile-time * tooling, and depend on the use of the annotation processors - * in the {@code hibernate-jpamodelgen} or {@code query-validator} + * in the {@code hibernate-processor} or {@code query-validator} * modules. If the appropriate annotation processor is not enabled * at build time, these annotations have no effect. *

diff --git a/hibernate-envers/hibernate-envers.gradle b/hibernate-envers/hibernate-envers.gradle index 95feba610f..409c61d187 100644 --- a/hibernate-envers/hibernate-envers.gradle +++ b/hibernate-envers/hibernate-envers.gradle @@ -20,7 +20,7 @@ dependencies { compileOnly libs.ant - annotationProcessor project( ':hibernate-jpamodelgen' ) + annotationProcessor project( ':hibernate-processor' ) compileOnly jakartaLibs.annotation testImplementation project( ':hibernate-testing' ) diff --git a/hibernate-micrometer/hibernate-micrometer.gradle b/hibernate-micrometer/hibernate-micrometer.gradle index 2f93bfd226..e4730808fa 100644 --- a/hibernate-micrometer/hibernate-micrometer.gradle +++ b/hibernate-micrometer/hibernate-micrometer.gradle @@ -8,7 +8,7 @@ dependencies { testImplementation project( ':hibernate-testing' ) - testAnnotationProcessor project( ':hibernate-jpamodelgen' ) + testAnnotationProcessor project( ':hibernate-processor' ) testCompileOnly jakartaLibs.annotation } diff --git a/hibernate-platform/hibernate-platform.gradle b/hibernate-platform/hibernate-platform.gradle index 46cd490f6f..7eaed1feb1 100644 --- a/hibernate-platform/hibernate-platform.gradle +++ b/hibernate-platform/hibernate-platform.gradle @@ -30,7 +30,7 @@ dependencies { api project( ":hibernate-micrometer" ) api project( ":hibernate-graalvm") - api project( ":hibernate-jpamodelgen" ) + api project( ":hibernate-processor" ) api project( ":hibernate-gradle-plugin" ) api project( ":hibernate-enhance-maven-plugin" ) api project( ":hibernate-ant" ) diff --git a/hibernate-testing/hibernate-testing.gradle b/hibernate-testing/hibernate-testing.gradle index 10d9bb6d51..5ff768da16 100644 --- a/hibernate-testing/hibernate-testing.gradle +++ b/hibernate-testing/hibernate-testing.gradle @@ -46,7 +46,7 @@ dependencies { implementation testLibs.junit5Engine implementation testLibs.junit5Launcher - annotationProcessor project( ':hibernate-jpamodelgen' ) + annotationProcessor project( ':hibernate-processor' ) } tasks.checkstyleMain { diff --git a/settings.gradle b/settings.gradle index b316344008..b7dbdd0e9d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -342,7 +342,7 @@ if ( "OpenJDK Runtime Environment".equals( System.getProperty( "java.runtime.nam include 'metamodel-generator' project(':metamodel-generator').projectDir = new File(rootProject.projectDir, "tooling/metamodel-generator") -project(':metamodel-generator').name = 'hibernate-jpamodelgen' +project(':metamodel-generator').name = 'hibernate-processor' include 'hibernate-gradle-plugin' project(':hibernate-gradle-plugin').projectDir = new File(rootProject.projectDir, "tooling/hibernate-gradle-plugin") diff --git a/tooling/metamodel-generator/hibernate-jpamodelgen.gradle b/tooling/metamodel-generator/hibernate-processor.gradle similarity index 73% rename from tooling/metamodel-generator/hibernate-jpamodelgen.gradle rename to tooling/metamodel-generator/hibernate-processor.gradle index 5297bce1f7..924d7d2678 100644 --- a/tooling/metamodel-generator/hibernate-jpamodelgen.gradle +++ b/tooling/metamodel-generator/hibernate-processor.gradle @@ -120,4 +120,63 @@ compileTestJava { "-proc:none", "-AsuppressJakartaDataMetamodel=true" ] +} + +publishing { + publications { + // relocation for the published artifacts based on the old groupId + relocationPom(MavenPublication) { + pom { + name = 'hibernate-jpamodelgen - relocation' + groupId = 'org.hibernate.orm' + artifactId = 'hibernate-jpamodelgen' + version = project.version + + description = project.description + url = 'https://hibernate.org/orm' + + organization { + name = 'Hibernate.org' + url = 'https://hibernate.org' + } + + licenses { + license { + name = 'GNU Library General Public License v2.1 or later' + url = 'https://www.opensource.org/licenses/LGPL-2.1' + comments = 'See discussion at https://hibernate.org/community/license/ for more details.' + distribution = 'repo' + } + } + + scm { + url = 'https://github.com/hibernate/hibernate-orm' + connection = 'scm:git:https://github.com/hibernate/hibernate-orm.git' + developerConnection = 'scm:git:git@github.com:hibernate/hibernate-orm.git' + } + + developers { + developer { + id = 'hibernate-team' + name = 'The Hibernate Development Team' + organization = 'Hibernate.org' + organizationUrl = 'https://hibernate.org' + } + } + + issueManagement { + system = 'jira' + url = 'https://hibernate.atlassian.net/browse/HHH' + } + + distributionManagement { + relocation { + groupId = 'org.hibernate.orm' + artifactId = project.name + version = project.version + } + } + } + } + } } \ No newline at end of file