rename hibernate-jpamodelgen to hibernate-processor

This commit is contained in:
Gavin King 2024-03-19 13:16:21 +01:00 committed by Steve Ebersole
parent 9df49675ee
commit e086674878
15 changed files with 76 additions and 17 deletions

View File

@ -138,7 +138,7 @@ dependencies {
reportAggregation project(':hibernate-vibur') reportAggregation project(':hibernate-vibur')
reportAggregation project(':hibernate-ant') reportAggregation project(':hibernate-ant')
reportAggregation project(':hibernate-enhance-maven-plugin') reportAggregation project(':hibernate-enhance-maven-plugin')
reportAggregation project(':hibernate-jpamodelgen') reportAggregation project(':hibernate-processor')
asciidoctorGems 'rubygems:rouge:4.1.1' asciidoctorGems 'rubygems:rouge:4.1.1'
@ -172,8 +172,8 @@ dependencies {
jcache project( ':hibernate-jcache' ) jcache project( ':hibernate-jcache' )
javadocSources project( path: ':hibernate-jcache', configuration: 'javadocSources' ) javadocSources project( path: ':hibernate-jcache', configuration: 'javadocSources' )
jpamodelgen project( ':hibernate-jpamodelgen' ) jpamodelgen project( ':hibernate-processor' )
javadocSources project( path: ':hibernate-jpamodelgen', configuration: 'javadocSources' ) javadocSources project( path: ':hibernate-processor', configuration: 'javadocSources' )
javadocClasspath libs.loggingAnnotations javadocClasspath libs.loggingAnnotations
javadocClasspath jakartaLibs.validation javadocClasspath jakartaLibs.validation

View File

@ -102,7 +102,7 @@ or `org.slf4j:slf4j-jdk14`
| A JDBC connection pool, for example, {agroal}[Agroal] | | A JDBC connection pool, for example, {agroal}[Agroal] |
`org.hibernate.orm:hibernate-agroal` + `org.hibernate.orm:hibernate-agroal` +
and `io.agroal:agroal-pool` 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` | 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] | | {validator}[Hibernate Validator], an implementation of {bean-validation}[Bean Validation] |
`org.hibernate.validator:hibernate-validator` + `org.hibernate.validator:hibernate-validator` +

View File

@ -168,7 +168,7 @@ dependencies {
implementation 'org.apache.logging.log4j:log4j-core:2.20.0' implementation 'org.apache.logging.log4j:log4j-core:2.20.0'
// JPA Metamodel Generator // JPA Metamodel Generator
annotationProcessor 'org.hibernate.orm:hibernate-jpamodelgen:{fullVersion}' annotationProcessor 'org.hibernate.orm:hibernate-processor:{fullVersion}'
// Compile-time checking for HQL // Compile-time checking for HQL
//implementation 'org.hibernate:query-validator:2.0-SNAPSHOT' //implementation 'org.hibernate:query-validator:2.0-SNAPSHOT'

View File

@ -42,7 +42,7 @@ transitive dependencies based on the features being used or not.
|hibernate-core| The core object/relational mapping engine |hibernate-core| The core object/relational mapping engine
|hibernate-envers| Entity versioning and auditing |hibernate-envers| Entity versioning and auditing
|hibernate-spatial| Support for spatial/GIS data types using https://github.com/GeoLatte/geolatte-geom[GeoLatte] |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) |hibernate-vector| Support for mathematical vector types and functions useful for AI/ML topics like vector similarity search and Retrieval-Augmented Generation (RAG)
|=== |===

View File

@ -9,7 +9,7 @@
<annotationProcessorPaths> <annotationProcessorPaths>
<path> <path>
<groupId>org.hibernate.orm</groupId> <groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-jpamodelgen</artifactId> <artifactId>hibernate-processor</artifactId>
<version>$currentHibernateVersion</version> <version>$currentHibernateVersion</version>
<!-- Optionally exclude transitive dependencies --> <!-- Optionally exclude transitive dependencies -->
<exclusions> <exclusions>

View File

@ -60,13 +60,13 @@ It also exposes the following method forms:
==== Static Metamodel Generation ==== Static Metamodel Generation
Static metamodel generation can be incorporated into Gradle builds via the 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 - an annotation processor in Gradle is super easy -
[source,gradle] [source,gradle]
---- ----
dependencies { dependencies {
annotationProcessor "org.hibernate.orm:hibernate-jpamodelgen:${hibernateVersion}" annotationProcessor "org.hibernate.orm:hibernate-processor:${hibernateVersion}"
} }
---- ----

View File

@ -14,7 +14,7 @@
Jakarta Persistence defines a typesafe Criteria API which allows <<criteria,`Criteria`>> Jakarta Persistence defines a typesafe Criteria API which allows <<criteria,`Criteria`>>
queries to be constructed in a strongly-typed manner, utilizing so-called static metamodel queries to be constructed in a strongly-typed manner, utilizing so-called static metamodel
classes. The Hibernate Static Metamodel Generator, available via the published 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. used to generate these static metamodel classes.
[NOTE] [NOTE]

View File

@ -72,7 +72,7 @@ dependencies {
testRuntimeOnly libs.jacksonXml testRuntimeOnly libs.jacksonXml
testRuntimeOnly libs.jacksonJsr310 testRuntimeOnly libs.jacksonJsr310
testAnnotationProcessor project( ':hibernate-jpamodelgen' ) testAnnotationProcessor project( ':hibernate-processor' )
// NOTE: it seems like, since 4.10, the Antlr Tool no longer defines // NOTE: it seems like, since 4.10, the Antlr Tool no longer defines
// transitive dep on the corresponding Antlr Runtime. At least, I get // transitive dep on the corresponding Antlr Runtime. At least, I get

View File

@ -22,7 +22,7 @@
* <p> * <p>
* Annotations in this package control Hibernate's compile-time * Annotations in this package control Hibernate's compile-time
* tooling, and depend on the use of the annotation processors * 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 * modules. If the appropriate annotation processor is not enabled
* at build time, these annotations have no effect. * at build time, these annotations have no effect.
* <p> * <p>

View File

@ -20,7 +20,7 @@ dependencies {
compileOnly libs.ant compileOnly libs.ant
annotationProcessor project( ':hibernate-jpamodelgen' ) annotationProcessor project( ':hibernate-processor' )
compileOnly jakartaLibs.annotation compileOnly jakartaLibs.annotation
testImplementation project( ':hibernate-testing' ) testImplementation project( ':hibernate-testing' )

View File

@ -8,7 +8,7 @@ dependencies {
testImplementation project( ':hibernate-testing' ) testImplementation project( ':hibernate-testing' )
testAnnotationProcessor project( ':hibernate-jpamodelgen' ) testAnnotationProcessor project( ':hibernate-processor' )
testCompileOnly jakartaLibs.annotation testCompileOnly jakartaLibs.annotation
} }

View File

@ -30,7 +30,7 @@ dependencies {
api project( ":hibernate-micrometer" ) api project( ":hibernate-micrometer" )
api project( ":hibernate-graalvm") api project( ":hibernate-graalvm")
api project( ":hibernate-jpamodelgen" ) api project( ":hibernate-processor" )
api project( ":hibernate-gradle-plugin" ) api project( ":hibernate-gradle-plugin" )
api project( ":hibernate-enhance-maven-plugin" ) api project( ":hibernate-enhance-maven-plugin" )
api project( ":hibernate-ant" ) api project( ":hibernate-ant" )

View File

@ -46,7 +46,7 @@ dependencies {
implementation testLibs.junit5Engine implementation testLibs.junit5Engine
implementation testLibs.junit5Launcher implementation testLibs.junit5Launcher
annotationProcessor project( ':hibernate-jpamodelgen' ) annotationProcessor project( ':hibernate-processor' )
} }
tasks.checkstyleMain { tasks.checkstyleMain {

View File

@ -342,7 +342,7 @@ if ( "OpenJDK Runtime Environment".equals( System.getProperty( "java.runtime.nam
include 'metamodel-generator' include 'metamodel-generator'
project(':metamodel-generator').projectDir = new File(rootProject.projectDir, "tooling/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' include 'hibernate-gradle-plugin'
project(':hibernate-gradle-plugin').projectDir = new File(rootProject.projectDir, "tooling/hibernate-gradle-plugin") project(':hibernate-gradle-plugin').projectDir = new File(rootProject.projectDir, "tooling/hibernate-gradle-plugin")

View File

@ -120,4 +120,63 @@ compileTestJava {
"-proc:none", "-proc:none",
"-AsuppressJakartaDataMetamodel=true" "-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
}
}
}
}
}
} }