Skip to content

HSEARCH-4509 Upgrade -orm6 artifacts to Hibernate ORM 6.0.0.CR2 #2942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2022
Merged

HSEARCH-4509 Upgrade -orm6 artifacts to Hibernate ORM 6.0.0.CR2 #2942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions orm6/mapper/orm/ant-src-changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,19 @@ index d6ed099098..e3fee26f2c 100644
++concreteSubTypesCount;
}
}
diff --git a/main/java/org/hibernate/search/mapper/orm/event/impl/HibernateSearchEventListener.java b/main/java/org/hibernate/search/mapper/orm/event/impl/HibernateSearchEventListener.java
index ca9492a6a8..6875a0c582 100644
--- a/main/java/org/hibernate/search/mapper/orm/event/impl/HibernateSearchEventListener.java
+++ b/main/java/org/hibernate/search/mapper/orm/event/impl/HibernateSearchEventListener.java
@@ -318,7 +318,7 @@ private void processCollectionEvent(AbstractCollectionEvent event) {
*/
@Override
@SuppressWarnings("deprecation") // Deprecated but abstract, so we have to implement it...
- public boolean requiresPostCommitHanding(EntityPersister persister) {
+ public boolean requiresPostCommitHandling(EntityPersister persister) {
// TODO Tests seem to pass using _false_ but we might be able to take
// advantage of this new hook?
return false;
diff --git a/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmEntityIdEntityLoadingStrategy.java b/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmEntityIdEntityLoadingStrategy.java
index 21503d08be..45b9fc0a50 100644
--- a/main/java/org/hibernate/search/mapper/orm/loading/impl/HibernateOrmEntityIdEntityLoadingStrategy.java
Expand Down
6 changes: 6 additions & 0 deletions orm6/mapper/orm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
<!-- DO NOT REMOVE and DO NOT MANAGE this dependency. See the version property declaration. -->
<version>${version.org.jboss.jandex}</version>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
Expand Down
35 changes: 23 additions & 12 deletions orm6/v5migrationhelper/orm/ant-src-changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/main/java/org/hibernate/search/FullTextSharedSessionBuilder.java b/main/java/org/hibernate/search/FullTextSharedSessionBuilder.java
index 8d32aa9852..a505240580 100644
index 8d32aa9852..72c93d0d27 100644
--- a/main/java/org/hibernate/search/FullTextSharedSessionBuilder.java
+++ b/main/java/org/hibernate/search/FullTextSharedSessionBuilder.java
@@ -10,7 +10,6 @@
Expand All @@ -10,18 +10,22 @@ index 8d32aa9852..a505240580 100644
import org.hibernate.Interceptor;
import org.hibernate.Session;
import org.hibernate.SharedSessionBuilder;
@@ -40,10 +39,6 @@ public interface FullTextSharedSessionBuilder extends SharedSessionBuilder {
@@ -40,14 +39,6 @@ public interface FullTextSharedSessionBuilder extends SharedSessionBuilder {
@Override
FullTextSharedSessionBuilder autoClose();

- @Deprecated
- @Override
- FullTextSharedSessionBuilder flushBeforeCompletion();
-
@Deprecated
- @Deprecated
- @Override
- FullTextSharedSessionBuilder transactionContext();
-
@Override
FullTextSharedSessionBuilder transactionContext();
@@ -57,10 +52,6 @@ public interface FullTextSharedSessionBuilder extends SharedSessionBuilder {
FullTextSharedSessionBuilder interceptor(Interceptor interceptor);

@@ -57,10 +48,6 @@ public interface FullTextSharedSessionBuilder extends SharedSessionBuilder {
@Override
FullTextSharedSessionBuilder connection(Connection connection);

Expand All @@ -32,7 +36,7 @@ index 8d32aa9852..a505240580 100644
@Override
FullTextSharedSessionBuilder autoJoinTransactions(boolean autoJoinTransactions);

@@ -68,10 +59,6 @@ public interface FullTextSharedSessionBuilder extends SharedSessionBuilder {
@@ -68,10 +55,6 @@ public interface FullTextSharedSessionBuilder extends SharedSessionBuilder {
@Override
FullTextSharedSessionBuilder autoClose(boolean autoClose);

Expand All @@ -44,7 +48,7 @@ index 8d32aa9852..a505240580 100644
FullTextSession openSession();

diff --git a/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java b/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java
index 9f6bfae665..741c9c5898 100644
index 9f6bfae665..6c5728910f 100644
--- a/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java
+++ b/main/java/org/hibernate/search/impl/FullTextSharedSessionBuilderDelegator.java
@@ -9,7 +9,6 @@
Expand All @@ -55,7 +59,7 @@ index 9f6bfae665..741c9c5898 100644
import org.hibernate.FlushMode;
import org.hibernate.Interceptor;
import org.hibernate.SessionBuilder;
@@ -63,13 +62,6 @@ public FullTextSharedSessionBuilder autoClose() {
@@ -63,20 +62,6 @@ public FullTextSharedSessionBuilder autoClose() {
return this;
}

Expand All @@ -66,10 +70,17 @@ index 9f6bfae665..741c9c5898 100644
- return this;
- }
-
@Deprecated
- @Deprecated
- @Override
- public FullTextSharedSessionBuilder transactionContext() {
- builder.transactionContext();
- return this;
- }
-
@Override
public FullTextSharedSessionBuilder transactionContext() {
@@ -95,13 +87,6 @@ public FullTextSharedSessionBuilder connection(Connection connection) {
public FullTextSharedSessionBuilder interceptor(Interceptor interceptor) {
builder.interceptor( interceptor );
@@ -95,13 +80,6 @@ public FullTextSharedSessionBuilder connection(Connection connection) {
return this;
}

Expand All @@ -83,7 +94,7 @@ index 9f6bfae665..741c9c5898 100644
@Override
public FullTextSharedSessionBuilder autoJoinTransactions(boolean autoJoinTransactions) {
builder.autoJoinTransactions( autoJoinTransactions );
@@ -115,13 +100,6 @@ public FullTextSharedSessionBuilder autoClose(boolean autoClose) {
@@ -115,13 +93,6 @@ public FullTextSharedSessionBuilder autoClose(boolean autoClose) {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
<version.javax.persistence>2.2</version.javax.persistence>

<!-- >>> ORM 6 / Jakarta Persistence -->
<version.org.hibernate.orm>6.0.0.CR1</version.org.hibernate.orm>
<version.org.hibernate.orm>6.0.0.CR2</version.org.hibernate.orm>
<javadoc.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/javadocs/</javadoc.org.hibernate.orm.url>
<documentation.org.hibernate.orm.url>https://docs.jboss.org/hibernate/orm/${parsed-version.org.hibernate.orm.majorVersion}.${parsed-version.org.hibernate.orm.minorVersion}/userguide/html_single/Hibernate_User_Guide.html</documentation.org.hibernate.orm.url>
<version.org.hibernate.commons.annotations.orm6>6.0.0.CR1</version.org.hibernate.commons.annotations.orm6>
Expand Down