diff --git a/orm6/mapper/orm/ant-src-changes.patch b/orm6/mapper/orm/ant-src-changes.patch
index ea8fe42880c..85fe058fcf3 100644
--- a/orm6/mapper/orm/ant-src-changes.patch
+++ b/orm6/mapper/orm/ant-src-changes.patch
@@ -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
diff --git a/orm6/mapper/orm/pom.xml b/orm6/mapper/orm/pom.xml
index 3f70efda6a5..e1ac426e097 100644
--- a/orm6/mapper/orm/pom.xml
+++ b/orm6/mapper/orm/pom.xml
@@ -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>
diff --git a/orm6/v5migrationhelper/orm/ant-src-changes.patch b/orm6/v5migrationhelper/orm/ant-src-changes.patch
index 23b479c0691..7c9239f480f 100644
--- a/orm6/v5migrationhelper/orm/ant-src-changes.patch
+++ b/orm6/v5migrationhelper/orm/ant-src-changes.patch
@@ -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 @@
@@ -10,7 +10,7 @@ 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();
  
@@ -18,10 +18,14 @@ index 8d32aa9852..a505240580 100644
 -	@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);
  
@@ -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);
  
@@ -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 @@
@@ -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;
  	}
  
@@ -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;
  	}
  
@@ -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;
  	}
  
diff --git a/pom.xml b/pom.xml
index a757c858b65..2ce96f1ec72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>