From 8f6431ff32090e6029a6debaac1382e14b09fabd Mon Sep 17 00:00:00 2001
From: Koen Aers <koen.aers@gmail.com>
Date: Mon, 2 Jun 2025 16:26:46 +0200
Subject: [PATCH] HBX-2949: hbm2ddl stopped working correctly after update to
 ORM 7.0.0.Beta3

Signed-off-by: Koen Aers <koen.aers@gmail.com>
---
 pom.xml                                                      | 5 +++++
 test/common/pom.xml                                          | 4 ++++
 .../org/hibernate/tool/ant/EJB3Configuration/TestCase.java   | 2 --
 .../main/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java  | 2 --
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6972123596..06abe412c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,6 +199,11 @@
                 <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-ant</artifactId>
                 <version>${hibernate-orm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-scan-jandex</artifactId>
+                <version>${hibernate-orm.version}</version>
             </dependency>
   		    <dependency>
 			    <groupId>org.hibernate.common</groupId>
diff --git a/test/common/pom.xml b/test/common/pom.xml
index 99c4e19098..1a5bd58f84 100644
--- a/test/common/pom.xml
+++ b/test/common/pom.xml
@@ -35,6 +35,10 @@
 	   	<dependency>
     		<groupId>org.hibernate.tool</groupId>
     		<artifactId>hibernate-tools-orm</artifactId>
+    	</dependency>
+	   	<dependency>
+    		<groupId>org.hibernate.orm</groupId>
+    		<artifactId>hibernate-scan-jandex</artifactId>
     	</dependency>
      	<dependency>
     		<groupId>org.hibernate.tool</groupId>
diff --git a/test/common/src/main/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java
index 88c89f7298..02a695234f 100644
--- a/test/common/src/main/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java
+++ b/test/common/src/main/java/org/hibernate/tool/ant/EJB3Configuration/TestCase.java
@@ -55,8 +55,6 @@ public void tearDown() {
 		JdbcUtil.dropDatabase(this);
 	}
 	
-	// TODO HBX-2949 - Investigate failure and reenable following test if possible
-	@Disabled
 	@Test
 	public void testEJB3ConfigurationFailureExpected() {
 
diff --git a/test/common/src/main/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java b/test/common/src/main/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java
index e81b8369e8..1780337c1d 100644
--- a/test/common/src/main/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java
+++ b/test/common/src/main/java/org/hibernate/tool/ant/JPAPUnit/TestCase.java
@@ -55,8 +55,6 @@ public void tearDown() {
 		JdbcUtil.dropDatabase(this);
 	}
 	
-	// TODO HBX-2949 - Investigate failure and reenable following test if possible
-	@Disabled
 	@Test
 	public void testJPAPUnit() {