diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/Remove.java b/hibernate-core/src/main/java/org/hibernate/Remove.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/annotations/Remove.java rename to hibernate-core/src/main/java/org/hibernate/Remove.java index a120471b77..832987a7c4 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/Remove.java +++ b/hibernate-core/src/main/java/org/hibernate/Remove.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html */ -package org.hibernate.annotations; +package org.hibernate; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java b/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java index 0d2afee2f3..0bc839b280 100644 --- a/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java +++ b/hibernate-core/src/main/java/org/hibernate/annotations/ForeignKey.java @@ -9,6 +9,8 @@ package org.hibernate.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import org.hibernate.Remove; + import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.TYPE; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheImplementor.java b/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheImplementor.java index 389bbaddfb..a0695d1c2d 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/spi/CacheImplementor.java @@ -12,7 +12,7 @@ import java.util.Set; import org.hibernate.Cache; import org.hibernate.HibernateException; import org.hibernate.Internal; -import org.hibernate.annotations.Remove; +import org.hibernate.Remove; import org.hibernate.cache.cfg.spi.DomainDataRegionConfig; import org.hibernate.cache.spi.access.CollectionDataAccess; import org.hibernate.cache.spi.access.EntityDataAccess; diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java index 81e5eb1274..90c23fad7a 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/model/convert/spi/EnumValueConverter.java @@ -9,7 +9,7 @@ package org.hibernate.metamodel.model.convert.spi; import java.sql.PreparedStatement; import java.sql.SQLException; -import org.hibernate.annotations.Remove; +import org.hibernate.Remove; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.sql.ast.tree.select.SelectStatement; import org.hibernate.sql.exec.spi.JdbcOperation; diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java index 4c7edd87ff..e6a11eb415 100644 --- a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java +++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmExpression.java @@ -13,7 +13,6 @@ import java.util.function.Consumer; import jakarta.persistence.criteria.Expression; import org.hibernate.Internal; -import org.hibernate.annotations.Remove; import org.hibernate.query.ReturnableType; import org.hibernate.metamodel.model.domain.DomainType; import org.hibernate.query.criteria.JpaExpression;