#67 - Coordinate JPA 3.2 work in ORM

- add dependency on `hibernate-core:7.0.0-SNAPSHOT` - add dependency on newly externalized `hibernate-models` library - remove local modules other than `hibernate-modules-orm`
sebersole · Nov 10, 2023 · 5d9e336 · 5d9e336
1 parent 0287ffa
commit 5d9e336
Show file tree

Hide file tree

Showing 232 changed files with 302 additions and 8,256 deletions.
diff --git a/hibernate-models-common/hibernate-models-common.gradle b/hibernate-models-common/hibernate-models-common.gradle
diff --git a/hibernate-models-common/src/main/java/org/hibernate/models/Incubating.java b/hibernate-models-common/src/main/java/org/hibernate/models/Incubating.java
diff --git a/hibernate-models-common/src/main/java/org/hibernate/models/Internal.java b/hibernate-models-common/src/main/java/org/hibernate/models/Internal.java
diff --git a/hibernate-models-common/src/main/java/org/hibernate/models/ModelsException.java b/hibernate-models-common/src/main/java/org/hibernate/models/ModelsException.java
diff --git a/hibernate-models-common/src/main/java/org/hibernate/models/internal/ArrayHelper.java b/hibernate-models-common/src/main/java/org/hibernate/models/internal/ArrayHelper.java
diff --git a/hibernate-models-common/src/main/java/org/hibernate/models/internal/CollectionHelper.java b/hibernate-models-common/src/main/java/org/hibernate/models/internal/CollectionHelper.java
diff --git a/hibernate-models-common/src/main/java/org/hibernate/models/internal/IndexedBiConsumer.java b/hibernate-models-common/src/main/java/org/hibernate/models/internal/IndexedBiConsumer.java
diff --git a/hibernate-models-common/src/main/java/org/hibernate/models/internal/IndexedConsumer.java b/hibernate-models-common/src/main/java/org/hibernate/models/internal/IndexedConsumer.java
diff --git a/hibernate-models-common/src/main/java/org/hibernate/models/internal/StringHelper.java b/hibernate-models-common/src/main/java/org/hibernate/models/internal/StringHelper.java
diff --git a/hibernate-models-common/src/main/java/org/hibernate/models/spi/ClassLoading.java b/hibernate-models-common/src/main/java/org/hibernate/models/spi/ClassLoading.java
diff --git a/hibernate-models-orm/hibernate-models-orm.gradle b/hibernate-models-orm/hibernate-models-orm.gradle
@@ -9,8 +9,7 @@ dependencies {
     api platform( libs.hibernatePlatform )
     api libs.hibernateCore
 
-    implementation project( ":hibernate-models-common" )
-    implementation project( ":hibernate-models-source" )
+    implementation libs.hibernateModels
     implementation libs.jandex
     implementation libs.byteBuddy
     implementation libs.classmate
@@ -23,7 +22,6 @@ dependencies {
     annotationProcessor libs.loggingAnnotations
 
     testImplementation platform( libs.hibernatePlatform )
-    testImplementation project( ":hibernate-models-testing" )
     testImplementation libs.hibernateTesting
 
     // for compile access to ReflectionManager for testing impl of BootstrapContext

diff --git a/...ernate/models/internal/KeyedConsumer.java → ...ibernate/internal/util/KeyedConsumer.java b/...ernate/models/internal/KeyedConsumer.java → ...ibernate/internal/util/KeyedConsumer.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.models.internal;
+package org.hibernate.internal.util;
 
 /**
  * A consumer, like {@link java.util.function.Consumer}, accepting a key and a value (Map entry e.g.)