diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
index 4b2c5d012780..5dda7cd9da16 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
@@ -20,7 +20,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @ServiceRegistry(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
index e0df60dee92c..d3c0c048be2a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
@@ -20,7 +20,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @ServiceRegistry(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
index 4c7473821c39..b760ecd92560 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
@@ -20,7 +20,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @ServiceRegistry(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
index be50c88f3351..d9f3b72b6b81 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
@@ -20,7 +20,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @ServiceRegistry(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
index 2a287b669a9c..a062efee99d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
@@ -20,7 +20,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @ServiceRegistry(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeTest.java
index ec2adc8115f2..640bd4a62a3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/circle/MultiPathCircleCascadeTest.java
@@ -39,7 +39,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @ServiceRegistry(
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java
index ab353c2d3f0f..e38ac82eb622 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultiPathCascadeTest.java
@@ -30,7 +30,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/MultiPathCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/MultiPathCascade.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java
index 9d6fad9f5c44..bff709d33017 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/BidirectionalOneToManyCascadeTest.java
@@ -25,9 +25,9 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/Child.hbm.xml",
-				"org/hibernate/orm/test/cascade/DeleteOrphanChild.hbm.xml",
-				"org/hibernate/orm/test/cascade/Parent.hbm.xml"
+				"org/hibernate/orm/test/cascade/Child.orm.xml",
+				"org/hibernate/orm/test/cascade/DeleteOrphanChild.orm.xml",
+				"org/hibernate/orm/test/cascade/Parent.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java
index c88cbd3ae3c7..1ef083d1bce0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/CascadeTestWithAssignedParentIdTest.java
@@ -23,8 +23,8 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/ChildForParentWithAssignedId.hbm.xml",
-				"org/hibernate/orm/test/cascade/ParentWithAssignedId.hbm.xml"
+				"org/hibernate/orm/test/cascade/ChildForParentWithAssignedId.orm.xml",
+				"org/hibernate/orm/test/cascade/ParentWithAssignedId.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Job.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Job.java
deleted file mode 100644
index 7ff47a55f633..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/Job.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.cascade;
-
-
-/**
- * Implementation of Job.
- *
- * @author Steve Ebersole
- */
-public class Job {
-	private Long id;
-	private JobBatch batch;
-	private String processingInstructions;
-	private int status;
-
-	/** GCLIB constructor */
-	Job() {}
-
-	protected Job(JobBatch batch) {
-		this.batch = batch;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	/*package*/ void setId(Long id) {
-		this.id = id;
-	}
-
-	public JobBatch getBatch() {
-		return batch;
-	}
-
-	/*package*/ void setBatch(JobBatch batch) {
-		this.batch = batch;
-	}
-
-	public String getProcessingInstructions() {
-		return processingInstructions;
-	}
-
-	public void setProcessingInstructions(String processingInstructions) {
-		this.processingInstructions = processingInstructions;
-	}
-
-	public int getStatus() {
-		return status;
-	}
-
-	public void setStatus(int status) {
-		this.status = status;
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/JobBatch.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/JobBatch.java
deleted file mode 100644
index 06e2ddc64d66..000000000000
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/JobBatch.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.orm.test.cascade;
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Implementation of JobBatch.
- *
- * @author Steve Ebersole
- */
-public class JobBatch {
-	private Long id;
-	private Date batchDate;
-	private Set jobs = new HashSet();
-
-	/** CGLIB constructor */
-	JobBatch() {}
-
-	public JobBatch(Date batchDate) {
-		this.batchDate = batchDate;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Date getBatchDate() {
-		return batchDate;
-	}
-
-	public void setBatchDate(Date batchDate) {
-		this.batchDate = batchDate;
-	}
-
-	public Set getJobs() {
-		return jobs;
-	}
-
-	public void setJobs(Set jobs) {
-		this.jobs = jobs;
-	}
-
-	public Job createJob() {
-		Job job = new Job( this );
-		jobs.add( job );
-		return job;
-	}
-}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java
index 5395f96c6d97..7ddce2d46ef9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/MultiPathCascadeTest.java
@@ -24,7 +24,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/MultiPathCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/MultiPathCascade.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java
index 3c7b41d51f12..5df00e8c9256 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParentTest.java
@@ -38,7 +38,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParent.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
index 7b1a89cbd127..c5ac1f5ce71c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullFalseDelayedInsertTest.java
@@ -16,7 +16,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
index fcc8408427b5..a9947e5d9c2d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullTrueDelayedInsertTest.java
@@ -16,7 +16,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
index 32c17dd0f0ae..953519f7c2cf 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityFalseTest.java
@@ -16,7 +16,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
index 49f539f497de..1b71350a3590 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeCheckNullibilityTrueTest.java
@@ -16,7 +16,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
index e73fdedcfe38..75ee990bf965 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsertTest.java
@@ -16,7 +16,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeTest.java
index 76c1658bbaa3..cc5c130434b4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeTest.java
@@ -35,7 +35,7 @@
  */
 @DomainModel(
 		xmlMappings = {
-				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml"
+				"org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml"
 		}
 )
 @SessionFactory
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java
index 96ecb7f3fc0d..5f7b817c43fa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/annotations/EagerManyToOneFetchModeJoinWhereTest.java
@@ -52,7 +52,7 @@ void dropTestData(SessionFactoryScope factoryScope) {
 
 	@Test
 	@JiraKey(value = "HHH-12104")
-	@FailureExpected
+	@FailureExpected(jiraKey = "HHH-2737")
 	public void testAssociatedWhereClause(SessionFactoryScope factoryScope) {
 		var product = new Product();
 		var category = new Category();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerManyToOneFetchModeJoinWhereTest.java
similarity index 91%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerManyToOneFetchModeJoinWhereTest.java
index 76d5405422cd..e163fdedc0bb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeJoinWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerManyToOneFetchModeJoinWhereTest.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.where.hbm;
+package org.hibernate.orm.test.where.xml;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -23,9 +23,8 @@
 /**
  * @author Gail Badner
  */
-@SuppressWarnings("JUnitMalformedDeclaration")
-@DomainModel(xmlMappings = "hbm/where/EagerManyToOneFetchModeJoinWhereTest.hbm.xml")
-@SessionFactory(exportSchema = false)
+@DomainModel(xmlMappings = "mappings/where/EagerManyToOneFetchModeJoinWhereTest.orm.xml")
+@SessionFactory
 public class EagerManyToOneFetchModeJoinWhereTest {
 	@AfterEach
 	void dropTestData(SessionFactoryScope factoryScope) {
@@ -33,8 +32,8 @@ void dropTestData(SessionFactoryScope factoryScope) {
 	}
 
 	@Test
-	@JiraKey( value = "HHH-12104" )
-	@FailureExpected( jiraKey = "HHH-12104")
+	@JiraKey( value = "HHH-2737" )
+	@FailureExpected( jiraKey = "HHH-2737")
 	public void testAssociatedWhereClause(SessionFactoryScope factoryScope) {
 		var product = new Product();
 		var category = new Category();
@@ -44,9 +43,9 @@ public void testAssociatedWhereClause(SessionFactoryScope factoryScope) {
 		product.containedCategory.category = category;
 		product.containedCategories.add( new ContainedCategory( category ) );
 
-		factoryScope.inTransaction( (session) -> {
-			session.persist( product );
-		} );
+		factoryScope.inTransaction( (session) ->
+				session.persist( product )
+		);
 
 		factoryScope.inTransaction( (session) -> {
 			var p = session.find( Product.class, product.id );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerManyToOneFetchModeSelectWhereTest.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerManyToOneFetchModeSelectWhereTest.java
index 35230ba6654e..875dd127dd6c 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerManyToOneFetchModeSelectWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerManyToOneFetchModeSelectWhereTest.java
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.where.hbm;
+package org.hibernate.orm.test.where.xml;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -28,7 +28,7 @@
  */
 @SuppressWarnings("JUnitMalformedDeclaration")
 @ServiceRegistry(settings = @Setting(name=IMPLICIT_NAMING_STRATEGY, value = "legacy-jpa"))
-@DomainModel(xmlMappings = "hbm/where/EagerManyToOneFetchModeSelectWhereTest.hbm.xml")
+@DomainModel(xmlMappings = "mappings/where/EagerManyToOneFetchModeSelectWhereTest.orm.xml")
 @SessionFactory
 public class EagerManyToOneFetchModeSelectWhereTest {
 	@AfterEach
@@ -47,9 +47,9 @@ public void testAssociatedWhereClause(SessionFactoryScope factoryScope) {
 		product.containedCategory.category = category;
 		product.containedCategories.add( new ContainedCategory( category ) );
 
-		factoryScope.inTransaction( (session) -> {
-			session.persist( product );
-		} );
+		factoryScope.inTransaction( (session) ->
+				session.persist( product )
+		);
 
 		factoryScope.inTransaction( (session) -> {
 			var p = session.find( Product.class, product.id );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerToManyWhereTest.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerToManyWhereTest.java
index 954302c49e49..357e7a83bbf1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerToManyWhereTest.java
@@ -2,8 +2,10 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.where.hbm;
+package org.hibernate.orm.test.where.xml;
 
+import org.hibernate.orm.test.where.hbm.Category;
+import org.hibernate.orm.test.where.hbm.Product;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -27,7 +29,7 @@
  * @author Gail Badner
  */
 @SuppressWarnings("JUnitMalformedDeclaration")
-@DomainModel(xmlMappings = "hbm/where/EagerToManyWhere.hbm.xml")
+@DomainModel(xmlMappings = "mappings/where/EagerToManyWhere.orm.xml")
 @SessionFactory
 public class EagerToManyWhereTest {
 	@AfterEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerToManyWhereUseClassWhereTest.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerToManyWhereUseClassWhereTest.java
index 6e2a67220253..30c4e1ccc9a9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/EagerToManyWhereUseClassWhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/EagerToManyWhereUseClassWhereTest.java
@@ -2,8 +2,10 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.where.hbm;
+package org.hibernate.orm.test.where.xml;
 
+import org.hibernate.orm.test.where.hbm.Category;
+import org.hibernate.orm.test.where.hbm.Product;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -24,7 +26,7 @@
  * @author Gail Badner
  */
 @SuppressWarnings("JUnitMalformedDeclaration")
-@DomainModel(xmlMappings = "hbm/where/EagerToManyWhere.hbm.xml")
+@DomainModel(xmlMappings = "mappings/where/EagerToManyWhere.orm.xml")
 @SessionFactory
 public class EagerToManyWhereUseClassWhereTest {
 	@AfterEach
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/WhereTest.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java
rename to hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/WhereTest.java
index 0d31695b5ac5..46ec1b357116 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/WhereTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/where/xml/WhereTest.java
@@ -2,13 +2,14 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.orm.test.where.hbm;
+package org.hibernate.orm.test.where.xml;
 
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.JoinType;
 import jakarta.persistence.criteria.Root;
 import org.hibernate.Hibernate;
+import org.hibernate.orm.test.where.hbm.File;
 import org.hibernate.query.NativeQuery;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -28,7 +29,7 @@
  * @author Max Rydahl Andersen
  */
 @SuppressWarnings("JUnitMalformedDeclaration")
-@DomainModel(xmlMappings = "hbm/where/File.hbm.xml")
+@DomainModel(xmlMappings = "mappings/where/File.orm.xml")
 @SessionFactory
 public class WhereTest {
 	@BeforeEach
diff --git a/hibernate-core/src/test/resources/hbm/where/EagerManyToOneFetchModeJoinWhereTest.hbm.xml b/hibernate-core/src/test/resources/hbm/where/EagerManyToOneFetchModeJoinWhereTest.hbm.xml
deleted file mode 100644
index f35fcf0dcd9a..000000000000
--- a/hibernate-core/src/test/resources/hbm/where/EagerManyToOneFetchModeJoinWhereTest.hbm.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.orm.test.where.hbm" default-access="property">
-    <class name="EagerManyToOneFetchModeJoinWhereTest$Product" table="PRODUCT">
-        <id name="id" column="ID">
-            <generator class="increment" />
-        </id>
-
-        <many-to-one name="category" lazy="false" fetch="join" cascade="all"
-                     not-found="ignore" column="categoryId"/>
-
-        <component name="containedCategory" class="EagerManyToOneFetchModeJoinWhereTest$ContainedCategory">
-            <many-to-one name="category" lazy="false" fetch="join" cascade="all"
-                         not-found="ignore" column="containedCategoryId"/>
-        </component>
-
-        <set name="containedCategories" lazy="false">
-            <key column="PRODUCT_ID"/>
-            <composite-element class="EagerManyToOneFetchModeJoinWhereTest$ContainedCategory">
-                <many-to-one name="category" lazy="false" fetch="join" cascade="all"
-                             not-found="ignore" column="containedCategoryId"/>
-            </composite-element>
-        </set>
-
-    </class>
-
-    <class name="EagerManyToOneFetchModeJoinWhereTest$Category" table="CATEGORY" where="inactive = 0">
-        <id name="id" column="ID">
-            <generator class="increment" />
-        </id>
-
-        <property name="name"/>
-
-        <property name="inactive"/>
-
-    </class>
-
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/hbm/where/EagerManyToOneFetchModeSelectWhereTest.hbm.xml b/hibernate-core/src/test/resources/hbm/where/EagerManyToOneFetchModeSelectWhereTest.hbm.xml
deleted file mode 100644
index 19105e4e8fe7..000000000000
--- a/hibernate-core/src/test/resources/hbm/where/EagerManyToOneFetchModeSelectWhereTest.hbm.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.orm.test.where.hbm" default-access="property">
-    <class name="EagerManyToOneFetchModeSelectWhereTest$Product" table="PRODUCT">
-        <id name="id" column="ID">
-            <generator class="increment" />
-        </id>
-
-        <many-to-one name="category" lazy="false" fetch="select" cascade="all"
-                     not-found="ignore" column="categoryId"/>
-
-        <component name="containedCategory" class="EagerManyToOneFetchModeSelectWhereTest$ContainedCategory">
-            <many-to-one name="category" lazy="false" fetch="select" cascade="all"
-                         not-found="ignore" column="containedCategoryId"/>
-        </component>
-
-        <set name="containedCategories" lazy="false">
-            <key column="PRODUCT_ID"/>
-            <composite-element class="EagerManyToOneFetchModeSelectWhereTest$ContainedCategory">
-                <many-to-one name="category" lazy="false" fetch="select" cascade="all"
-                             not-found="ignore" column="containedCategoryId"/>
-            </composite-element>
-        </set>
-
-    </class>
-
-    <class name="EagerManyToOneFetchModeSelectWhereTest$Category" table="CATEGORY" where="inactive = 0">
-        <id name="id" column="ID">
-            <generator class="increment" />
-        </id>
-
-        <property name="name"/>
-
-        <property name="inactive"/>
-
-    </class>
-
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/hbm/where/EagerToManyWhere.hbm.xml b/hibernate-core/src/test/resources/hbm/where/EagerToManyWhere.hbm.xml
deleted file mode 100644
index 4426cb642ba4..000000000000
--- a/hibernate-core/src/test/resources/hbm/where/EagerToManyWhere.hbm.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC
-        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.orm.test.where.hbm" default-access="property">
-    <class name="Product" table="PRODUCT">
-        <id name="id" column="ID">
-            <generator class="increment" />
-        </id>
-
-        <set name="categoriesOneToMany" lazy="false" outer-join="true">
-            <key column="productOneToManyId"/>
-            <one-to-many class="Category"/>
-        </set>
-
-        <set name="categoriesWithDescOneToMany" lazy="false" outer-join="true" where="description is not null">
-            <key column="productWithDescOneToManyId"/>
-            <one-to-many class="Category"/>
-        </set>
-
-        <set name="categoriesManyToMany" table="categoriesManyToMany" lazy="false" outer-join="true">
-            <key column="productId"/>
-            <many-to-many class="Category" column="categoryId"/>
-        </set>
-
-
-        <set name="categoriesWithDescManyToMany" table="categoriesWithDescManyToMany" lazy="false" outer-join="true">
-            <key column="productId"/>
-            <many-to-many class="Category" column="categoryId" where="description is not null"/>
-        </set>
-
-        <set name="categoriesWithDescIdLt4ManyToMany" table = "categoriesWithDescIdLt4MToM" lazy="false" outer-join="true"
-             where="categoryId != 4">
-            <key column="productId"/>
-            <many-to-many class="Category" column="categoryId" where="description is not null"/>
-        </set>
-
-    </class>
-
-    <class name="Category" table="CATEGORY" where="inactive = 0">
-        <id name="id" column="ID"/>
-
-        <property name="name"/>
-
-        <property name="description"/>
-
-        <property name="inactive"/>
-
-    </class>
-
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/hbm/where/File.hbm.xml b/hibernate-core/src/test/resources/hbm/where/File.hbm.xml
deleted file mode 100644
index 76206810c068..000000000000
--- a/hibernate-core/src/test/resources/hbm/where/File.hbm.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC
-	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<!--
-    Demonstrates use of a class-level where restriction
- -->
-<hibernate-mapping package="org.hibernate.orm.test.where.hbm">
-
-    <class name="File" where="deleted=0" table="T_FILE">
-    	<id name="id">
-    		<generator class="increment"/>
-    	</id>
-    	<property name="name"/>
-    	<property name="deleted" type="numeric_boolean"/>
-    	<many-to-one name="parent"/>
-    	<set name="children" inverse="true" where="deleted=0">
-    		<key column="parent"/>
-    		<one-to-many class="File"/>
-    	</set>
-    </class>
-
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/mappings/where/EagerManyToOneFetchModeJoinWhereTest.orm.xml b/hibernate-core/src/test/resources/mappings/where/EagerManyToOneFetchModeJoinWhereTest.orm.xml
new file mode 100644
index 000000000000..de7b1b8f2c71
--- /dev/null
+++ b/hibernate-core/src/test/resources/mappings/where/EagerManyToOneFetchModeJoinWhereTest.orm.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://www.hibernate.org/xsd/orm/mapping
+                 https://www.hibernate.org/xsd/orm/mapping/mapping-7.0.xsd"
+                 version="7.0">
+
+    <package>org.hibernate.orm.test.where.xml</package>
+
+    <entity class="EagerManyToOneFetchModeJoinWhereTest$Product" access="PROPERTY">
+        <table name="PRODUCT"/>
+
+        <attributes>
+            <id name="id">
+                <column name="ID"/>
+                <generated-value generator="increment"/>
+            </id>
+
+            <many-to-one name="category" fetch="EAGER" fetch-mode="JOIN" not-found="IGNORE">
+                <join-column name="categoryId"/>
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </many-to-one>
+
+            <element-collection name="containedCategories" fetch="EAGER">
+                <target>EagerManyToOneFetchModeJoinWhereTest$ContainedCategory</target>
+                <collection-table name="PRODUCT_CATEGORY">
+                    <join-column name="PRODUCT_ID"/>
+                </collection-table>
+            </element-collection>
+
+            <embedded name="containedCategory">
+                <target>EagerManyToOneFetchModeJoinWhereTest$ContainedCategory</target>
+            </embedded>
+        </attributes>
+    </entity>
+
+    <entity class="EagerManyToOneFetchModeJoinWhereTest$Category" access="PROPERTY">
+        <table name="CATEGORY"/>
+        <sql-restriction>inactive = 0</sql-restriction>
+
+        <attributes>
+            <id name="id">
+                <column name="ID"/>
+                <generated-value generator="increment"/>
+            </id>
+
+            <basic name="name"/>
+
+            <basic name="inactive"/>
+        </attributes>
+    </entity>
+
+    <embeddable class="EagerManyToOneFetchModeJoinWhereTest$ContainedCategory">
+        <attributes>
+            <many-to-one name="category" fetch="EAGER" fetch-mode="JOIN" not-found="IGNORE">
+                <join-column name="containedCategoryId"/>
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </many-to-one>
+        </attributes>
+    </embeddable>
+
+</entity-mappings>
diff --git a/hibernate-core/src/test/resources/mappings/where/EagerManyToOneFetchModeSelectWhereTest.orm.xml b/hibernate-core/src/test/resources/mappings/where/EagerManyToOneFetchModeSelectWhereTest.orm.xml
new file mode 100644
index 000000000000..098c74e40cb5
--- /dev/null
+++ b/hibernate-core/src/test/resources/mappings/where/EagerManyToOneFetchModeSelectWhereTest.orm.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://www.hibernate.org/xsd/orm/mapping
+                 https://www.hibernate.org/xsd/orm/mapping/mapping-7.0.xsd"
+                 version="7.0">
+
+    <package>org.hibernate.orm.test.where.xml</package>
+
+    <entity class="EagerManyToOneFetchModeSelectWhereTest$Product" access="PROPERTY">
+        <table name="PRODUCT"/>
+
+        <attributes>
+            <id name="id">
+                <column name="ID"/>
+                <generated-value generator="increment"/>
+            </id>
+
+            <many-to-one name="category" fetch="EAGER" fetch-mode="SELECT" not-found="IGNORE">
+                <join-column name="categoryId"/>
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </many-to-one>
+
+            <element-collection name="containedCategories" fetch="EAGER" fetch-mode="SELECT">
+                <target>EagerManyToOneFetchModeSelectWhereTest$ContainedCategory</target>
+                <collection-table>
+                    <join-column name="PRODUCT_ID"/>
+                </collection-table>
+            </element-collection>
+
+            <embedded name="containedCategory">
+                <target>EagerManyToOneFetchModeSelectWhereTest$ContainedCategory</target>
+            </embedded>
+        </attributes>
+    </entity>
+
+    <entity class="EagerManyToOneFetchModeSelectWhereTest$Category" access="PROPERTY">
+        <table name="CATEGORY"/>
+        <sql-restriction>inactive = 0</sql-restriction>
+
+        <attributes>
+            <id name="id">
+                <column name="ID"/>
+                <generated-value generator="increment"/>
+            </id>
+
+            <basic name="name"/>
+
+            <basic name="inactive"/>
+        </attributes>
+    </entity>
+
+    <embeddable class="EagerManyToOneFetchModeSelectWhereTest$ContainedCategory">
+        <attributes>
+            <many-to-one name="category" fetch="EAGER" fetch-mode="SELECT" not-found="IGNORE">
+                <join-column name="containedCategoryId"/>
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </many-to-one>
+        </attributes>
+    </embeddable>
+
+</entity-mappings>
diff --git a/hibernate-core/src/test/resources/mappings/where/EagerToManyWhere.orm.xml b/hibernate-core/src/test/resources/mappings/where/EagerToManyWhere.orm.xml
new file mode 100644
index 000000000000..7643b92e54d0
--- /dev/null
+++ b/hibernate-core/src/test/resources/mappings/where/EagerToManyWhere.orm.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://www.hibernate.org/xsd/orm/mapping
+                 https://www.hibernate.org/xsd/orm/mapping/mapping-7.0.xsd"
+                 version="7.0">
+
+    <package>org.hibernate.orm.test.where.hbm</package>
+
+    <entity class="Product" access="PROPERTY">
+        <table name="PRODUCT"/>
+
+        <attributes>
+            <id name="id">
+                <column name="ID"/>
+                <generated-value generator="increment"/>
+            </id>
+
+            <one-to-many name="categoriesOneToMany" fetch="EAGER" fetch-mode="JOIN" target-entity="Category" classification="SET">
+                <join-column name="productOneToManyId"/>
+            </one-to-many>
+
+            <one-to-many name="categoriesWithDescOneToMany" fetch="EAGER" fetch-mode="JOIN" target-entity="Category" classification="SET">
+                <sql-restriction>description is not null</sql-restriction>
+                <join-column name="productWithDescOneToManyId"/>
+            </one-to-many>
+
+            <many-to-many name="categoriesManyToMany" fetch="EAGER" fetch-mode="JOIN" target-entity="Category" classification="SET">
+                <join-table name="categoriesManyToMany">
+                    <join-column name="productId"/>
+                    <inverse-join-column name="categoryId"/>
+                </join-table>
+            </many-to-many>
+
+            <many-to-many name="categoriesWithDescManyToMany" fetch="EAGER" fetch-mode="JOIN" target-entity="Category" classification="SET">
+                <sql-restriction>description is not null</sql-restriction>
+                <join-table name="categoriesWithDescManyToMany">
+                    <join-column name="productId"/>
+                    <inverse-join-column name="categoryId"/>
+                </join-table>
+            </many-to-many>
+
+            <many-to-many name="categoriesWithDescIdLt4ManyToMany" fetch="EAGER" fetch-mode="JOIN" target-entity="Category" classification="SET">
+                <sql-restriction>description is not null</sql-restriction>
+                <join-table name="categoriesWithDescIdLt4MToM">
+                    <join-column name="productId"/>
+                    <inverse-join-column name="categoryId"/>
+                </join-table>
+                <sql-join-table-restriction>categoryId != 4</sql-join-table-restriction>
+            </many-to-many>
+        </attributes>
+    </entity>
+
+    <entity class="Category" access="PROPERTY">
+        <table name="CATEGORY"/>
+        <sql-restriction>inactive = 0</sql-restriction>
+
+        <attributes>
+            <id name="id">
+                <column name="ID"/>
+            </id>
+
+            <basic name="name"/>
+
+            <basic name="description"/>
+
+            <basic name="inactive"/>
+        </attributes>
+    </entity>
+
+</entity-mappings>
diff --git a/hibernate-core/src/test/resources/mappings/where/File.orm.xml b/hibernate-core/src/test/resources/mappings/where/File.orm.xml
new file mode 100644
index 000000000000..2a3495e2002d
--- /dev/null
+++ b/hibernate-core/src/test/resources/mappings/where/File.orm.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+	~ SPDX-License-Identifier: Apache-2.0
+	~ Copyright Red Hat Inc. and Hibernate Authors
+-->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping"
+				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				xsi:schemaLocation="http://www.hibernate.org/xsd/orm/mapping
+                https://www.hibernate.org/xsd/orm/mapping/mapping-7.0.xsd"
+				version="7.0">
+	<package>org.hibernate.orm.test.where.hbm</package>
+	<attribute-accessor>property</attribute-accessor>
+	<entity class="File" metadata-complete="true">
+		<table name="T_FILE"/>
+		<sql-restriction>deleted=0</sql-restriction>
+		<attributes>
+			<id name="id">
+				<generated-value generator="increment"/>
+			</id>
+			<basic name="name" fetch="EAGER"/>
+			<basic name="deleted" fetch="EAGER" >
+				<convert converter="org.hibernate.type.NumericBooleanConverter"/>
+			</basic>
+			<many-to-one name="parent" fetch="LAZY" fetch-mode="SELECT" optional="true" >
+				<join-column name="parent" table="T_FILE"/>
+				<cascade/>
+			</many-to-one>
+			<one-to-many name="children" target-entity="File" fetch="LAZY" mapped-by="parent"  classification="SET" >
+				<sql-restriction>deleted=0</sql-restriction>
+				<cascade/>
+			</one-to-many>
+		</attributes>
+	</entity>
+</entity-mappings>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Child.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Child.hbm.xml
deleted file mode 100644
index 94608b6df0fd..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Child.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade">
-    <class name="Child" table="Child">
-        <id name="id" column="id" type="java.lang.Long">
-            <generator class="increment"/>
-        </id>
-        <many-to-one name="parent" class="Parent" not-null="false" cascade="all"/>
-    </class>
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Child.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Child.orm.xml
new file mode 100644
index 000000000000..15a5ec4f0df8
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Child.orm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!--
+          ~ SPDX-License-Identifier: Apache-2.0
+          ~ Copyright Red Hat Inc. and Hibernate Authors
+          -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0">
+    <package>org.hibernate.orm.test.cascade</package>
+    <entity class="Child" >
+        <table name="Child"/>
+        <attributes>
+            <id name="id">
+                <generated-value generator="increment"/>
+                <type value="Long"/>
+            </id>
+            <many-to-one name="parent" target-entity="Parent" optional="false">
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ChildForParentWithAssignedId.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ChildForParentWithAssignedId.hbm.xml
deleted file mode 100644
index e8f54c4fad08..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ChildForParentWithAssignedId.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade">
-    <class name="Child" table="Child">
-        <id name="id" column="id" type="java.lang.Long">
-            <generator class="native"/>
-        </id>
-        <many-to-one name="parent" class="Parent" not-null="true" cascade="all"  />
-    </class>
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ChildForParentWithAssignedId.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ChildForParentWithAssignedId.orm.xml
new file mode 100644
index 000000000000..d0a0584af57c
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ChildForParentWithAssignedId.orm.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0">
+    <package>org.hibernate.orm.test.cascade</package>
+    <entity class="Child" >
+        <table name="Child"/>
+        <attributes>
+            <id name="id">
+                <generated-value generator="native"/>
+                <type value="Long"/>
+            </id>
+            <many-to-one name="parent" target-entity="Parent" optional="false">
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/DeleteOrphanChild.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/DeleteOrphanChild.hbm.xml
deleted file mode 100644
index 18cf97cea64c..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/DeleteOrphanChild.hbm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade">
-    <class name="DeleteOrphanChild" table="DeleteOrphanChild">
-        <id name="id" column="id" type="java.lang.Long">
-            <generator class="native"/>
-        </id>
-        <many-to-one name="parent" class="Parent" not-null="false" cascade="all"/>
-    </class>
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/DeleteOrphanChild.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/DeleteOrphanChild.orm.xml
new file mode 100644
index 000000000000..eb221c9d41c4
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/DeleteOrphanChild.orm.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0">
+    <package>org.hibernate.orm.test.cascade</package>
+
+    <entity class="DeleteOrphanChild">
+        <table name="DeleteOrphanChild"/>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+                <generated-value generator="native"/>
+                <type value="Long"/>
+            </id>
+            <many-to-one name="parent" target-entity="Parent" optional="false">
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </many-to-one>
+        </attributes>
+    </entity>
+</entity-mappings>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Job.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Job.hbm.xml
deleted file mode 100644
index 92eeb127623c..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Job.hbm.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping SYSTEM "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade">
-
-	<class name="Job" table="T_JOB">
-		<id name="id" column="JOB_ID">
-			<generator class="native"/>
-		</id>
-
-		<many-to-one name="batch" class="JobBatch" cascade="none" column="BATCH_ID"/>
-
-		<property name="status" type="int" column="JOB_STATUS" not-null="true"/>
-		<property name="processingInstructions" type="string" column="PI" not-null="true"/>
-
-	</class>
-
-</hibernate-mapping>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/JobBatch.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/JobBatch.hbm.xml
deleted file mode 100644
index 6fbae5c2a8e1..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/JobBatch.hbm.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping SYSTEM "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade">
-
-	<class name="JobBatch" table="T_JOB_BATCH">
-		<id name="id" column="BATCH_ID">
-			<generator class="native"/>
-		</id>
-
-		<property name="batchDate" type="timestamp" column="BATCH_DATE" not-null="true"/>
-
-		<set name="jobs" inverse="true" fetch="select" lazy="true" cascade="all, refresh">
-			<key column="BATCH_ID"/>
-			<one-to-many class="Job"/>
-		</set>
-
-	</class>
-
-</hibernate-mapping>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/MultiPathCascade.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/MultiPathCascade.hbm.xml
deleted file mode 100644
index 8ae78002911e..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/MultiPathCascade.hbm.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping SYSTEM "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade">
-
-    <class name="A" table="HB_A">
-
-        <id name="id" type="long"><generator class="native"/></id>
-
-        <property name="data" column="`data`" type="string" not-null="true"/>
-
-        <!--
-             Associations
-        -->
-
-        <set name="hs" inverse="true" cascade="all">
-            <key column="a_fk"/>
-            <one-to-many class="H"/>
-        </set>
-        <one-to-one name="g" class="G" property-ref="a" cascade="all"/>
-
-    </class>
-
-    <class name="G" table="HB_G">
-
-        <id name="id" type="long"><generator class="native"/></id>
-
-        <property name="data" column="`data`" type="string" not-null="true"/>
-
-        <!--
-             Associations
-        -->
-
-        <set name="hs" inverse="true" table="HB_G_H" cascade="all">
-            <key column="g_fk"/>
-            <many-to-many class="H" column="h_fk"/>
-        </set>
-
-        <many-to-one name="a"
-            column="aId"
-            unique="true"
-            not-null="false"/>
-
-    </class>
-
-    <class name="H" table="HB_H">
-
-        <id name="id" type="long"><generator class="native"/></id>
-
-        <property name="data" column="`data`" type="string" not-null="true"/>
-
-        <!--
-            Associations
-        -->
-
-        <!-- *NOT* cascaded -->
-        <set name="gs" table="HB_G_H">
-            <key column="h_fk"/>
-            <many-to-many class="G" column="g_fk"/>
-        </set>
-
-        <many-to-one name="a" column="a_fk" class="A"/>
-
-    </class>
-
-
-</hibernate-mapping>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/MultiPathCascade.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/MultiPathCascade.orm.xml
new file mode 100644
index 000000000000..ced09a0a3136
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/MultiPathCascade.orm.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0">
+    <package>org.hibernate.orm.test.cascade</package>
+    <entity class="A">
+        <table name="HB_A"/>
+        <attributes>
+            <id name="id">
+                <generated-value generator="native"/>
+            </id>
+            <basic name="data">
+                <column name="data" nullable="false"/>
+            </basic>
+            <one-to-many name="hs" target-entity="H" mapped-by="a">
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </one-to-many>
+            <one-to-one name="g" target-entity="G" mapped-by="a">
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </one-to-one>
+        </attributes>
+    </entity>
+
+    <entity class="G">
+        <table name="HB_G"/>
+        <attributes>
+            <id name="id">
+                <generated-value generator="native"/>
+            </id>
+            <basic name="data">
+                <column name="data" nullable="false"/>
+            </basic>
+            <many-to-one name="a" target-entity="A">
+                <join-column name="aId" unique="true" nullable="true"/>
+            </many-to-one>
+            <many-to-many name="hs" target-entity="H" mapped-by="gs">
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </many-to-many>
+        </attributes>
+    </entity>
+
+    <entity class="H">
+        <table name="HB_H"/>
+        <attributes>
+            <id name="id">
+                <generated-value generator="native"/>
+            </id>
+            <basic name="data">
+                <column name="data" nullable="false"/>
+            </basic>
+            <many-to-one name="a" target-entity="A">
+                <join-column name="a_fk"/>
+            </many-to-one>
+            <many-to-many name="gs" target-entity="G">
+                <join-table name="HB_G_H">
+                    <join-column name="h_fk"/>
+                    <inverse-join-column name="g_fk"/>
+                </join-table>
+            </many-to-many>
+        </attributes>
+    </entity>
+</entity-mappings>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Parent.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Parent.hbm.xml
deleted file mode 100644
index 5c7c17caea51..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Parent.hbm.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade">
-    <class name="Parent" table="Parent">
-        <id name="id" column="id" type="java.lang.Long">
-            <generator class="increment"/>
-        </id>
-        <set name="children" cascade="all" inverse="true">
-            <key column="parent"/>
-            <one-to-many class="Child"/>
-        </set>
-        <set name="deleteOrphanChildren" cascade="all-delete-orphan" inverse="true">
-            <key column="parent"/>
-            <one-to-many class="DeleteOrphanChild"/>
-        </set>
-    </class>
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Parent.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Parent.orm.xml
new file mode 100644
index 000000000000..8072f6b5dad7
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/Parent.orm.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0">
+    <package>org.hibernate.orm.test.cascade</package>
+
+    <entity class="Parent">
+        <table name="Parent"/>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+                <generated-value generator="increment"/>
+                <type value="Long"/>
+            </id>
+            <one-to-many name="children" target-entity="Child" mapped-by="parent">
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </one-to-many>
+            <one-to-many name="deleteOrphanChildren" target-entity="DeleteOrphanChild" mapped-by="parent" orphan-removal="true">
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </one-to-many>
+        </attributes>
+    </entity>
+
+</entity-mappings>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ParentWithAssignedId.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ParentWithAssignedId.hbm.xml
deleted file mode 100644
index b44cf22dda9d..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ParentWithAssignedId.hbm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade">
-    <class name="Parent" table="Parent">
-        <id name="id" column="id" type="java.lang.Long">
-            <generator class="assigned"/>
-        </id>
-        <set name="children" cascade="all" inverse="true">
-            <key column="parent"/>
-            <one-to-many class="Child"/>
-        </set>
-    </class>
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ParentWithAssignedId.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ParentWithAssignedId.orm.xml
new file mode 100644
index 000000000000..727b527a7a4e
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/ParentWithAssignedId.orm.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+        <!--
+          ~ SPDX-License-Identifier: Apache-2.0
+          ~ Copyright Red Hat Inc. and Hibernate Authors
+          -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0">
+    <package>org.hibernate.orm.test.cascade</package>
+    <entity class="Parent">
+        <table name="Parent"/>
+        <attributes>
+            <id name="id">
+                <column name="id"/>
+                <generated-value generator="assigned"/>
+                <type value="Long"/>
+            </id>
+            <one-to-many name="children" target-entity="Child" mapped-by="parent">
+                <cascade>
+                    <cascade-all/>
+                </cascade>
+            </one-to-many>
+            <transient name="deleteOrphanChildren"/>
+        </attributes>
+    </entity>
+
+</entity-mappings>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml
deleted file mode 100644
index 02584c558324..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParent.hbm.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping SYSTEM "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade.circle">
-
-    <class name="Route" table="HB_Route">
-
-        <id name="routeID" type="long"><generator class="native"/></id>
-        <version name="version" column="VERS" type="long" />
-
-        <property name="name" type="string" not-null="true"/>
-
-        <set name="nodes" inverse="true" cascade="persist,merge,refresh">
-            <key column="routeID"/>
-            <one-to-many class="Node"/>
-        </set>
-        <set name="vehicles" inverse="true" cascade="persist,merge,refresh">
-            <key column="routeID"/>
-            <one-to-many class="Vehicle"/>
-        </set>
-    </class>
-
-   <class name="Tour" table="HB_Tour">
-
-        <id name="tourID" type="long"><generator class="native"/></id>
-        <version name="version" column="VERS" type="long" />
-
-        <property name="name" type="string" not-null="true"/>
-
-        <set name="nodes" inverse="true" lazy="true" cascade="merge,refresh">
-            <key column="tourID"/>
-            <one-to-many class="Node"/>
-        </set>
-    </class>
-    
-    <class name="Transport" table="HB_Transport">
-
-        <id name="transportID" type="long"><generator class="native"/></id>
-        <version name="version" column="VERS" type="long" />
-
-        <property name="name" type="string" not-null="true"/>
-
-        <many-to-one name="pickupNode"
-            column="pickupNodeID"
-            unique="true"
-            not-null="true"
-            cascade="merge,refresh"
-            lazy="false"/> 
-
-        <many-to-one name="deliveryNode"
-            column="deliveryNodeID"
-            unique="true"
-            not-null="true"
-            cascade="merge,refresh"
-            lazy="false"/> 
-
-        <many-to-one name="vehicle"
-            column="vehicleID"
-            unique="false"
-            not-null="true"
-            cascade="none"
-            lazy="false"/>
-    </class>
-
-    <class name="Vehicle" table="HB_Vehicle">
-        <id name="vehicleID" type="long"><generator class="native"/></id>
-        <version name="version" column="VERS" type="long" />
-
-        <property name="name"/>
-        <set name="transports" inverse="true" lazy="true" cascade="merge,refresh">
-           <key column="vehicleID"/>
-           <one-to-many class="Transport" not-found="exception"/>
-       </set>
-        <many-to-one name="route"
-            column="routeID"
-            unique="false"
-            not-null="true"
-            cascade="none"
-            lazy="false"/>
-    </class>
-
-
-    <class name="Node" table="HB_Node">
-
-        <id name="nodeID" type="long"><generator class="native"/></id>
-        <version name="version" column="VERS" type="long" />
-
-        <property name="name" type="string" not-null="true"/>
-
-         <set name="deliveryTransports" inverse="true" lazy="true" cascade="merge,refresh">
-            <key column="deliveryNodeID"/>
-            <one-to-many class="Transport"/>
-        </set>
-
-        <set name="pickupTransports" inverse="true" lazy="true" cascade="merge,refresh">
-            <key column="pickupNodeID"/>
-            <one-to-many class="Transport"/>
-        </set>
-
-        <many-to-one name="route"
-            column="routeID"
-            unique="false"
-            not-null="true"
-            cascade="none"
-            lazy="false"/> 
-
-        <many-to-one name="tour"
-            column="tourID"
-            unique="false"
-            not-null="false"
-            cascade="merge,refresh"
-            lazy="false"/>                 
-    </class>
-
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParent.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParent.orm.xml
new file mode 100644
index 000000000000..045ce6762298
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/CascadeMergeToChildBeforeParent.orm.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0" >
+    <persistence-unit-metadata>
+        <xml-mapping-metadata-complete/>
+    </persistence-unit-metadata>
+    <package>org.hibernate.orm.test.cascade.circle</package>
+    <entity class="Route">
+        <table name="HB_Route"/>
+        <attributes>
+            <id name="routeID">
+                <generated-value generator="native"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <column nullable="false"/>
+                <type value="String"/>
+            </basic>
+            <version name="version">
+                <column name="VERS"/>
+            </version>
+            <one-to-many name="nodes" target-entity="Node" mapped-by="route">
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+            <one-to-many name="vehicles" target-entity="Vehicle" mapped-by="route">
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+            <transient name="transientField"/>
+        </attributes>
+    </entity>
+
+    <entity class="Tour">
+        <table name="HB_Tour"/>
+        <attributes>
+            <id name="tourID">
+                <generated-value generator="native"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <column nullable="false"/>
+                <type value="String"/>
+            </basic>
+            <version name="version">
+                <column name="VERS"/>
+            </version>
+            <one-to-many name="nodes" target-entity="Node" mapped-by="tour" fetch="LAZY">
+                <cascade>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+        </attributes>
+    </entity>
+
+    <entity class="Transport">
+        <table name="HB_Transport"/>
+        <attributes>
+            <id name="transportID">
+                <generated-value generator="native"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <column nullable="false"/>
+                <type value="String"/>
+            </basic>
+            <version name="version">
+                <column name="VERS"/>
+            </version>
+            <many-to-one name="pickupNode" target-entity="Node" fetch="EAGER">
+                <join-column name="pickupNodeID" nullable="false" unique="true"/>
+                <cascade>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </many-to-one>
+            <many-to-one name="deliveryNode" target-entity="Node" fetch="EAGER">
+                <join-column name="deliveryNodeID" nullable="false" unique="true"/>
+                <cascade>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </many-to-one>
+            <many-to-one name="vehicle" target-entity="Vehicle" fetch="EAGER">
+                <join-column name="vehicleID" nullable="false" unique="false"/>
+            </many-to-one>
+            <transient name="transientField"/>
+        </attributes>
+    </entity>
+
+    <entity class="Vehicle">
+        <table name="HB_Vehicle"/>
+        <attributes>
+            <id name="vehicleID">
+                <generated-value generator="native"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <type value="String"/>
+            </basic>
+            <version name="version">
+                <column name="VERS"/>
+            </version>
+            <many-to-one name="route" target-entity="Route" fetch="EAGER">
+                <join-column name="routeID" nullable="false" unique="false"/>
+            </many-to-one>
+            <one-to-many name="transports" target-entity="Transport" mapped-by="vehicle" fetch="LAZY">
+                <cascade>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+            <transient name="transientField"/>
+        </attributes>
+    </entity>
+
+    <entity class="Node">
+        <table name="HB_Node"/>
+        <attributes>
+            <id name="nodeID">
+                <generated-value generator="native"/>
+            </id>
+            <basic name="name">
+                <column nullable="false"/>
+                <type value="String"/>
+            </basic>
+            <version name="version">
+                <column name="VERS"/>
+            </version>
+            <many-to-one name="route" target-entity="Route" fetch="EAGER">
+                <join-column name="routeID" nullable="false" unique="false"/>
+            </many-to-one>
+            <many-to-one name="tour" target-entity="Tour" fetch="EAGER">
+                <join-column name="tourID" nullable="true" unique="false"/>
+                <cascade>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </many-to-one>
+            <one-to-many name="deliveryTransports" target-entity="Transport" mapped-by="deliveryNode" fetch="LAZY">
+                <cascade>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+            <one-to-many name="pickupTransports" target-entity="Transport" mapped-by="pickupNode" fetch="LAZY">
+                <cascade>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+            <transient name="transientField"/>
+        </attributes>
+    </entity>
+</entity-mappings>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml
deleted file mode 100644
index 51cfb94638f5..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.hbm.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping SYSTEM "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade.circle">
-
-    <class name="Route" table="HB_Route">
-
-        <id name="routeID" type="long"><generator class="native"/></id>
-
-        <property name="name" type="string" not-null="true"/>
-
-        <set name="nodes" inverse="true" cascade="persist,merge,refresh">
-            <key column="routeID"/>
-            <one-to-many class="Node"/>
-        </set>
-    </class>
-
-   <class name="Tour" table="HB_Tour">
-
-        <id name="tourID" type="long"><generator class="native"/></id>
-
-        <property name="name" type="string" not-null="true"/>
-
-        <set name="nodes" inverse="true" lazy="true" cascade="merge,persist,refresh">
-            <key column="tourID"/>
-            <one-to-many class="Node"/>
-        </set>
-    </class>
-    
-    <class name="Transport" table="HB_Transport">
-
-        <id name="transportID" type="long"><generator class="native"/></id>
-
-        <property name="name" type="string" not-null="true"/>
-
-        <many-to-one name="pickupNode"
-            column="pickupNodeID"
-            unique="true"
-            not-null="true"
-            cascade="merge,persist,refresh"
-            lazy="false"/> 
-
-        <many-to-one name="deliveryNode"
-            column="deliveryNodeID"
-            unique="true"
-            not-null="true"
-            cascade="merge,persist,refresh"
-            lazy="false"/> 
-    </class>
-
-    <class name="Node" table="HB_Node">
-
-        <id name="nodeID" type="long"><generator class="native"/></id>
-
-        <property name="name" type="string" not-null="true"/>
-
-         <set name="deliveryTransports" inverse="true" lazy="true" cascade="merge,persist,refresh">
-            <key column="deliveryNodeID"/>
-            <one-to-many class="Transport"/>
-        </set>
-
-        <set name="pickupTransports" inverse="true" lazy="true" cascade="merge,persist,refresh">
-            <key column="pickupNodeID"/>
-            <one-to-many class="Transport"/>
-        </set>
-
-        <many-to-one name="route"
-            column="routeID"
-            unique="false"
-            not-null="true"
-            cascade="none"
-            lazy="false"/> 
-
-        <many-to-one name="tour"
-            column="tourID"
-            unique="false"
-            not-null="false"
-            cascade="merge,persist,refresh"
-            lazy="false"/>                 
-    </class>
-
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml
new file mode 100644
index 000000000000..69df366b1a86
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascade.orm.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0" >
+    <persistence-unit-metadata>
+        <xml-mapping-metadata-complete/>
+    </persistence-unit-metadata>
+    <package>org.hibernate.orm.test.cascade.circle</package>
+
+    <entity class="Route">
+        <table name="HB_Route"/>
+        <attributes>
+            <id name="routeID">
+                <generated-value generator="native"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <column nullable="false"/>
+                <type value="String"/>
+            </basic>
+            <one-to-many name="nodes" target-entity="Node" mapped-by="route">
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+
+            <transient name="vehicles"/>
+            <transient name="transientField"/>
+            <transient name="version"/>
+        </attributes>
+    </entity>
+
+    <entity class="Tour">
+        <table name="HB_Tour"/>
+        <attributes>
+            <id name="tourID">
+                <generated-value generator="native"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <column nullable="false"/>
+                <type value="String"/>
+            </basic>
+            <one-to-many name="nodes" target-entity="Node" mapped-by="tour" fetch="LAZY">
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+            <transient name="version"/>
+        </attributes>
+    </entity>
+
+    <entity class="Transport">
+        <table name="HB_Transport"/>
+        <attributes>
+            <id name="transportID">
+                <generated-value generator="native"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <column nullable="false"/>
+                <type value="String"/>
+            </basic>
+            <many-to-one name="pickupNode" target-entity="Node" fetch="EAGER">
+                <join-column name="pickupNodeID" nullable="false" unique="true"/>
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </many-to-one>
+            <many-to-one name="deliveryNode" target-entity="Node" fetch="EAGER">
+                <join-column name="deliveryNodeID" nullable="false" unique="true"/>
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </many-to-one>
+            <transient name="vehicle"/>
+            <transient name="transientField"/>
+            <transient name="version"/>
+        </attributes>
+    </entity>
+
+    <entity class="Node">
+        <table name="HB_Node"/>
+        <attributes>
+            <id name="nodeID">
+                <generated-value generator="native"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <column nullable="false"/>
+                <type value="String"/>
+            </basic>
+            <many-to-one name="route" target-entity="Route" fetch="EAGER">
+                <join-column name="routeID" nullable="false"/>
+            </many-to-one>
+            <many-to-one name="tour" target-entity="Tour" fetch="EAGER">
+                <join-column name="tourID" nullable="true"/>
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </many-to-one>
+            <one-to-many name="deliveryTransports" target-entity="Transport" mapped-by="deliveryNode" fetch="LAZY">
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+            <one-to-many name="pickupTransports" target-entity="Transport" mapped-by="pickupNode" fetch="LAZY">
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+
+
+            <transient name="transientField"/>
+            <transient name="version"/>
+        </attributes>
+    </entity>
+</entity-mappings>
\ No newline at end of file
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml
deleted file mode 100644
index d670ce385266..000000000000
--- a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.hbm.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ SPDX-License-Identifier: Apache-2.0
-  ~ Copyright Red Hat Inc. and Hibernate Authors
-  -->
-<!DOCTYPE hibernate-mapping SYSTEM "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
-
-<hibernate-mapping package="org.hibernate.orm.test.cascade.circle">
-
-    <class name="Route" table="HB_Route">
-
-        <id name="routeID" type="long"><generator class="increment"/></id>
-
-        <property name="name" type="string" not-null="true"/>
-
-        <set name="nodes" inverse="true" cascade="persist,persist,merge,refresh">
-            <key column="routeID"/>
-            <one-to-many class="Node"/>
-        </set>
-    </class>
-
-   <class name="Tour" table="HB_Tour">
-
-        <id name="tourID" type="long"><generator class="increment"/></id>
-
-        <property name="name" type="string" not-null="true"/>
-
-        <set name="nodes" inverse="true" lazy="true" cascade="persist,merge,refresh">
-            <key column="tourID"/>
-            <one-to-many class="Node"/>
-        </set>
-    </class>
-    
-    <class name="Transport" table="HB_Transport">
-
-        <id name="transportID" type="long"><generator class="increment"/></id>
-
-        <property name="name" type="string" not-null="true"/>
-
-        <many-to-one name="pickupNode"
-            column="pickupNodeID"
-            unique="true"
-            not-null="true"
-            cascade="persist,merge,refresh"
-            lazy="false"/> 
-
-        <many-to-one name="deliveryNode"
-            column="deliveryNodeID"
-            unique="true"
-            not-null="true"
-            cascade="persist,merge,refresh"
-            lazy="false"/> 
-    </class>
-
-    <class name="Node" table="HB_Node">
-
-        <id name="nodeID" type="long"><generator class="increment"/></id>
-
-        <property name="name" type="string" not-null="true"/>
-
-         <set name="deliveryTransports" inverse="true" lazy="true" cascade="persist,merge,refresh">
-            <key column="deliveryNodeID"/>
-            <one-to-many class="Transport"/>
-        </set>
-
-        <set name="pickupTransports" inverse="true" lazy="true" cascade="persist,merge,refresh">
-            <key column="pickupNodeID"/>
-            <one-to-many class="Transport"/>
-        </set>
-
-        <many-to-one name="route"
-            column="routeID"
-            unique="false"
-            not-null="true"
-            cascade="none"
-            lazy="false"/> 
-
-        <many-to-one name="tour"
-            column="tourID"
-            unique="false"
-            not-null="false"
-            cascade="persist,merge,refresh"
-            lazy="false"/>                 
-    </class>
-
-</hibernate-mapping>
diff --git a/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml
new file mode 100644
index 000000000000..78b2b92cdffb
--- /dev/null
+++ b/hibernate-core/src/test/resources/org/hibernate/orm/test/cascade/circle/MultiPathCircleCascadeDelayedInsert.orm.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright Red Hat Inc. and Hibernate Authors
+  -->
+<entity-mappings xmlns="http://www.hibernate.org/xsd/orm/mapping" version="7.0" >
+    <persistence-unit-metadata>
+        <xml-mapping-metadata-complete/>
+    </persistence-unit-metadata>
+    <package>org.hibernate.orm.test.cascade.circle</package>
+
+    <entity class="Route">
+        <table name="HB_Route"/>
+        <attributes>
+            <id name="routeID" >
+                <generated-value generator="increment"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name" >
+                <column name="name" nullable="false"/>
+                <type value="String"/>
+            </basic>
+
+            <one-to-many name="nodes" target-entity="Node" fetch="LAZY" mapped-by="route">
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+
+            <transient name="vehicles"/>
+            <transient name="transientField"/>
+            <transient name="version"/>
+        </attributes>
+    </entity>
+    <entity class="Tour">
+        <table name="HB_Tour"/>
+        <attributes>
+            <id name="tourID">
+                <generated-value generator="increment"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <column name="name" nullable="false"/>
+                <type value="String"/>
+            </basic>
+
+            <one-to-many name="nodes" target-entity="Node" fetch="LAZY" mapped-by="tour" >
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+            <transient name="version"/>
+        </attributes>
+    </entity>
+    <entity class="Transport">
+        <table name="HB_Transport"/>
+        <attributes>
+            <id name="transportID">
+                <generated-value generator="increment"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <column name="name" nullable="false"/>
+                <type value="String"/>
+            </basic>
+
+            <many-to-one name="pickupNode" target-entity="Node" fetch="EAGER">
+                <join-column name="pickupNodeID" unique="true" nullable="false"/>
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </many-to-one>
+
+            <many-to-one name="deliveryNode" target-entity="Node" fetch="EAGER">
+                <join-column name="deliveryNodeID" unique="true" nullable="false"/>
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </many-to-one>
+
+            <transient name="vehicle"/>
+            <transient name="transientField"/>
+            <transient name="version"/>
+        </attributes>
+    </entity>
+
+    <entity class="Node">
+        <table name="HB_Node"/>
+        <attributes>
+            <id name="nodeID">
+                <generated-value generator="increment"/>
+                <type value="Long"/>
+            </id>
+            <basic name="name">
+                <column name="name" nullable="false"/>
+                <type value="String"/>
+            </basic>
+
+            <many-to-one name="route" target-entity="Route" fetch="EAGER">
+                <join-column name="routeID" nullable="false"/>
+            </many-to-one>
+
+            <many-to-one name="tour" target-entity="Tour" fetch="EAGER">
+                <join-column name="tourID" nullable="true"/>
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </many-to-one>
+
+            <one-to-many name="deliveryTransports" target-entity="Transport" fetch="LAZY" mapped-by="deliveryNode">
+<!--                <foreign-key name="deliveryNodeID"/>-->
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+
+            <one-to-many name="pickupTransports" target-entity="Transport" fetch="LAZY" mapped-by="pickupNode">
+                <foreign-key name="pickupNodeID"/>
+                <cascade>
+                    <cascade-persist/>
+                    <cascade-merge/>
+                    <cascade-refresh/>
+                </cascade>
+            </one-to-many>
+
+            <transient name="transientField"/>
+            <transient name="version"/>
+        </attributes>
+    </entity>
+
+
+</entity-mappings>