From 712bc4af8968071f91ae38b34fb33d53ca1427f9 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Thu, 26 Apr 2018 12:16:55 +0100
Subject: [PATCH] HHH-12526 WildFly integration tests no longer need to
 override the Javassist module

---
 .../HibernateEnversOnWildflyTest.java         |  1 -
 .../HibernateModulesOnWildflyTest.java        |  1 -
 .../TransactionRollbackTest.java              |  1 -
 .../resources/jboss-deployment-structure.xml  | 21 -------------------
 4 files changed, 24 deletions(-)
 delete mode 100644 hibernate-orm-modules/src/test/resources/jboss-deployment-structure.xml

diff --git a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateEnversOnWildflyTest.java b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateEnversOnWildflyTest.java
index da71740390..05178337d4 100644
--- a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateEnversOnWildflyTest.java
+++ b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateEnversOnWildflyTest.java
@@ -44,7 +44,6 @@ public static WebArchive createDeployment() {
 		return ShrinkWrap.create( WebArchive.class )
 				.addClass( AuditedEntity.class )
 				.addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" )
-				.addAsWebInfResource( "jboss-deployment-structure.xml" )
 				.addAsResource( new StringAsset( persistenceXml().exportAsString() ), "META-INF/persistence.xml" );
 	}
 
diff --git a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateModulesOnWildflyTest.java b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateModulesOnWildflyTest.java
index b1a850a844..f35dd758ed 100644
--- a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateModulesOnWildflyTest.java
+++ b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateModulesOnWildflyTest.java
@@ -45,7 +45,6 @@ public static WebArchive createDeployment() {
 		return ShrinkWrap.create( WebArchive.class )
 				.addClass( Kryptonite.class )
 				.addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" )
-				.addAsWebInfResource( "jboss-deployment-structure.xml" )
 				.addAsResource( new StringAsset( persistenceXml().exportAsString() ), "META-INF/persistence.xml" );
 	}
 
diff --git a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/TransactionRollbackTest.java b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/TransactionRollbackTest.java
index 32860893e5..dd57243050 100644
--- a/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/TransactionRollbackTest.java
+++ b/hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/TransactionRollbackTest.java
@@ -47,7 +47,6 @@ public static WebArchive createDeployment() {
 		return ShrinkWrap.create( WebArchive.class )
 				.addClass( Kryptonite.class )
 				.addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" )
-				.addAsWebInfResource( "jboss-deployment-structure.xml" )
 				.addAsResource( new StringAsset( persistenceXml().exportAsString() ), "META-INF/persistence.xml" );
 	}
 
diff --git a/hibernate-orm-modules/src/test/resources/jboss-deployment-structure.xml b/hibernate-orm-modules/src/test/resources/jboss-deployment-structure.xml
deleted file mode 100644
index 7bcb4a3cc8..0000000000
--- a/hibernate-orm-modules/src/test/resources/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Hibernate, Relational Persistence for Idiomatic Java
-  ~
-  ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
-  ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
-  -->
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
-    <deployment>
-        <exclusions>
-            <!--
-            The org.javassist:main module is automatically injected by the current WildFly JPADependencyProcessor;
-            this module is necessary for users of the standard Hibernate ORM version included in WildFly,
-            but when testing the very latest Hibernate ORM it could be the wrong version.
-            We therefore exclude it here from the deployment, and have the custom ORM modules bring their own version.
-            See also: http://lists.jboss.org/pipermail/wildfly-dev/2017-January/005681.html
-            -->
-            <module name="org.javassist" />
-        </exclusions>
-    </deployment>
-</jboss-deployment-structure>