HHH-17941 - Apply incremental categorization to "annotation binding" - managed-type and persistent-attribute metadata

.github/workflows/atlas.yml

@@ -31,7 +31,7 @@ jobs:
   build:
     permissions:
       contents: read
-    name: Java 11
+    name: ORM
     #    runs-on: ubuntu-latest
     runs-on: [self-hosted, Linux, X64, OCI]
     strategy:
@@ -68,7 +68,7 @@ jobs:
           RDBMS: ${{ matrix.rdbms }}
           RUNID: ${{ github.run_number }}
         run: ci/database-start.sh
-      - name: Set up Java 11
+      - name: Set up Java 17
         uses: graalvm/setup-graalvm@v1
         with:
           distribution: 'graalvm'

.github/workflows/codeql.yml

@@ -35,6 +35,13 @@ jobs:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Checkout repository
         uses: actions/checkout@v4
 

.github/workflows/contributor-build.yml

@@ -10,11 +10,14 @@ on:
   push:
     branches:
       - 'main'
+      - 'wip/7.0'
   # WARNING: Using pull_request_target to access secrets, but we check out the PR head commit.
   # See checkout action for details.
   pull_request_target:
     branches:
       - 'main'
+      - 'wip/7.0'
+
 
 permissions: {} # none
 
@@ -31,7 +34,7 @@ jobs:
   build:
     permissions:
       contents: read
-    name: Java 11
+    name: Java 17
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -77,11 +80,11 @@ jobs:
         env:
           RDBMS: ${{ matrix.rdbms }}
         run: ci/database-start.sh
-      - name: Set up Java 11
+      - name: Set up Java 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Get year/month for cache key
         id: get-date
         run: echo "yearmonth=$(/bin/date -u "+%Y-%m")" >> $GITHUB_OUTPUT

Jenkinsfile

@@ -16,7 +16,7 @@ import org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper
 @Library('hibernate-jenkins-pipeline-helpers@1.9') _
 import org.hibernate.jenkins.pipeline.helpers.job.JobHelper
 
-@Field final String DEFAULT_JDK_VERSION = '11'
+@Field final String DEFAULT_JDK_VERSION = '17'
 @Field final String DEFAULT_JDK_TOOL = "OpenJDK ${DEFAULT_JDK_VERSION} Latest"
 @Field final String NODE_PATTERN_BASE = 'Worker&&Containers'
 @Field List<BuildEnvironment> environments
@@ -41,10 +41,9 @@ stage('Configure') {
 //		new BuildEnvironment( dbName: 'sybase' ),
 // Don't build with HANA by default, but only do it nightly until we receive a 3rd instance
 // 		new BuildEnvironment( dbName: 'hana_cloud', dbLockableResource: 'hana-cloud', dbLockResourceAsHost: true ),
-		new BuildEnvironment( node: 's390x' ),
+		new BuildEnvironment( node: 's390x', additionalOptions: '-PexcludeTests=**/KotlinProjectTests*' ),
 		new BuildEnvironment( dbName: 'tidb', node: 'tidb',
 				notificationRecipients: 'tidb_hibernate@pingcap.com' ),
-		new BuildEnvironment( testJdkVersion: '17' ),
 		// We want to enable preview features when testing newer builds of OpenJDK:
 		// even if we don't use these features, just enabling them can cause side effects
 		// and it's useful to test that.

changelog.txt

@@ -3,6 +3,28 @@ Hibernate 6 Changelog
 
 Note: Please refer to JIRA to learn more about each issue.
 
+Changes in 7.0.0.Alpha1 (April 16, 2024)
+------------------------------------------------------------------------------------------------------------------------
+
+https://hibernate.atlassian.net/projects/HHH/versions/32214
+
+** Deprecation
+    * [HHH-17441] - Deprecate @Comment
+
+** New Feature
+    * [HHH-17460] - Ongoing JPA 3.2 work
+    * [HHH-17459] - Allow resolution callbacks on select o.h.mapping objects
+
+** Remove Feature
+    * [HHH-17961] - Drop support for hibernate.mapping.precedence
+    * [HHH-17894] - Remove AdditionalJaxbMappingProducer
+    * [HHH-17893] - Remove MetadataContributor
+    * [HHH-17892] - Remove @Persister
+
+** Task
+    * [HHH-17444] - Ongoing JPA 32 work
+
+
 Changes in 6.4.1.Final (December 15, 2023)
 ------------------------------------------------------------------------------------------------------------------------
 

ci/snapshot-publish.Jenkinsfile

@@ -15,7 +15,7 @@ pipeline {
         label 'Fedora'
     }
     tools {
-        jdk 'OpenJDK 11 Latest'
+        jdk 'OpenJDK 17 Latest'
     }
     options {
   		rateLimitBuilds(throttle: [count: 1, durationName: 'hour', userBoost: true])

documentation/documentation.gradle

@@ -128,7 +128,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'
 
@@ -162,8 +162,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

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` +

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'

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
 |===
 
 [cols="40m,~"]

documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc

@@ -491,35 +491,4 @@ include::{extrasdir}/entity/entity-proxy-persist-mapping.sql[]
 ====
 
 As you can see in the associated SQL snippet, Hibernate issues no SQL SELECT query since the proxy can be
-constructed without needing to fetch the actual entity POJO.
-
-[[entity-persister]]
-==== Define a custom entity persister
-
-The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/Persister.html[`@Persister`] annotation is used to specify a custom entity or collection persister.
-
-For entities, the custom persister must implement the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/persister/entity/EntityPersister.html[`EntityPersister`] interface.
-
-For collections, the custom persister must implement the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/persister/collection/CollectionPersister.html[`CollectionPersister`] interface.
-
-NOTE: Supplying a custom persister has been allowed historically, but has never been fully supported.
-Hibernate 6 provides better, alternative ways to accomplish the use cases for a custom persister.  As
-of 6.2 `@Persister` has been formally deprecated.
-
-
-[[entity-persister-mapping]]
-.Entity persister mapping
-====
-[source,java]
-----
-include::{example-dir-persister}/Author.java[tag=entity-persister-mapping,indent=0]
-----
-
-[source,java]
-----
-include::{example-dir-persister}/Book.java[tag=entity-persister-mapping,indent=0]
-----
-====
-
-By providing your own `EntityPersister` and `CollectionPersister` implementations,
-you can control how entities and collections are persisted into the database.
+constructed without needing to fetch the actual entity POJO.

documentation/src/main/asciidoc/userguide/chapters/tooling/extras/maven-example-metamodel.pom

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

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}"
 }
 ----

documentation/src/main/asciidoc/userguide/chapters/tooling/modelgen.adoc

@@ -14,7 +14,7 @@
 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
 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]

gradle/version.properties

@@ -1 +1 @@
-hibernateVersion=6.6.0-SNAPSHOT
+hibernateVersion=7.0.0-SNAPSHOT

hibernate-core/hibernate-core.gradle

@@ -10,10 +10,6 @@ plugins {
     id 'org.hibernate.build.xjc-jakarta'
 }
 
-repositories {
-    gradlePluginPortal()
-}
-
 description = 'Hibernate\'s core ORM functionality'
 
 apply from: rootProject.file( 'gradle/published-java-module.gradle' )
@@ -31,7 +27,7 @@ dependencies {
     api jakartaLibs.jpa
     api jakartaLibs.jta
 
-    implementation libs.hcann
+    implementation libs.hibernateModels
     implementation libs.jandex
     implementation libs.classmate
     implementation libs.byteBuddy
@@ -75,7 +71,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
@@ -130,8 +126,13 @@ xjc {
             xjcBindingFile = file( 'src/main/xjb/hbm-mapping-bindings.xjb' )
             xjcExtensions += ['inheritance', 'simplify']
         }
+        configuration {
+            xsdFile = file( 'src/main/resources/org/hibernate/xsd/cfg/configuration-3.2.0.xsd' )
+            xjcBindingFile = file( 'src/main/xjb/configuration-bindings.xjb' )
+            xjcExtensions += ['inheritance', 'simplify']
+        }
         mapping {
-            xsdFile = file( 'src/main/resources/org/hibernate/xsd/mapping/mapping-3.1.0.xsd' )
+            xsdFile = file( 'src/main/resources/org/hibernate/xsd/mapping/mapping-7.0.xsd' )
             xjcBindingFile = file( 'src/main/xjb/mapping-bindings.xjb' )
             xjcExtensions += ['inheritance', 'simplify']
         }

hibernate-core/src/main/java/org/hibernate/Session.java

@@ -9,18 +9,20 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import jakarta.persistence.CacheRetrieveMode;
-import jakarta.persistence.CacheStoreMode;
-import jakarta.persistence.LockModeType;
-import jakarta.persistence.PessimisticLockScope;
 import org.hibernate.graph.RootGraph;
 import org.hibernate.jdbc.Work;
 import org.hibernate.query.Query;
 import org.hibernate.stat.SessionStatistics;
 
+import jakarta.persistence.CacheRetrieveMode;
+import jakarta.persistence.CacheStoreMode;
+import jakarta.persistence.ConnectionConsumer;
+import jakarta.persistence.ConnectionFunction;
 import jakarta.persistence.EntityGraph;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.FlushModeType;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.PessimisticLockScope;
 import jakarta.persistence.criteria.CriteriaDelete;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.CriteriaUpdate;
@@ -1585,4 +1587,32 @@ default LockRequest setLockScope(PessimisticLockScope scope) {
 	 */
 	@Override @Deprecated(since = "6.0") @SuppressWarnings("rawtypes")
 	Query createQuery(CriteriaUpdate updateQuery);
+
+
+	@Override
+	default <C> void runWithConnection(ConnectionConsumer<C> action) {
+		doWork( connection -> {
+			try {
+				//noinspection unchecked
+				action.accept( (C) connection );
+			}
+			catch (Exception e) {
+				throw new RuntimeException( e );
+			}
+		} );
+	}
+
+	@Override
+	default <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
+		return doReturningWork( (connection) -> {
+			try {
+				//noinspection unchecked
+				return function.apply( (C) connection );
+			}
+			catch (Exception e) {
+				throw new RuntimeException( e );
+			}
+		} );
+	}
+
 }

hibernate-core/src/main/java/org/hibernate/annotations/Comment.java

@@ -13,6 +13,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import jakarta.persistence.Table;
+
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
@@ -49,13 +51,14 @@
  * @author Yanming Zhou
  * @author Gavin King
  *
- * @remove JPA 3.2 adds a comment attribute to {@linkplain jakarta.persistence.Table}
+ * @deprecated Prefer {@linkplain Table#comment()}
  */
 @TypeBinderType(binder = CommentBinder.class)
 @AttributeBinderType(binder = CommentBinder.class)
 @Target({METHOD, FIELD, TYPE})
 @Retention(RUNTIME)
 @Repeatable(Comments.class)
+@Deprecated
 @Remove
 public @interface Comment {
 	/**