Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-12526 WildFly integration tests no longer need to override the Javassist module

This commit is contained in:
Sanne Grinovero 2018-04-26 12:16:55 +01:00
parent 89b8bb5372
commit 712bc4af89
4 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateEnversOnWildflyTest.java
View File

@ -44,7 +44,6 @@ public class HibernateEnversOnWildflyTest {
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" );
}

1
hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/HibernateModulesOnWildflyTest.java
View File

@ -45,7 +45,6 @@ public class HibernateModulesOnWildflyTest {
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" );
}

1
hibernate-orm-modules/src/test/java/org/hibernate/wildfly/integrationtest/TransactionRollbackTest.java
View File

@ -47,7 +47,6 @@ public class TransactionRollbackTest {
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" );
}

21
hibernate-orm-modules/src/test/resources/jboss-deployment-structure.xml
View File

@ -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>