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

Re-enabled hibernate-orm-modules

This commit is contained in:
Andrea Boriero 2020-03-12 14:42:38 +00:00
parent 7ee45f68ee
commit d88d4a8d7b
7 changed files with 74 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/libraries.gradle
View File

@ -51,12 +51,14 @@ ext {
//GraalVM
graalvmVersion = '19.3.1'
antlrVersion = '4.7.1'
libraries = [
// Ant
ant: 'org.apache.ant:ant:1.8.2',
// Antlr
antlr: 'org.antlr:antlr4:4.7.1',
antlr: "org.antlr:antlr4:${antlrVersion}",
// Annotations
commons_annotations: "org.hibernate.common:hibernate-commons-annotations:${hibernateCommonsVersion}",

30
hibernate-core/hibernate-core.gradle
View File

@ -296,21 +296,21 @@ task generateEnversStaticMetamodel(
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// todo (6.0) : fix after fixing hibernate-spatial
//processTestResources {
// doLast {
// copy {
// from file( 'src/test/resources' )
// into file( "${buildDir}/resources/test" )
// include 'arquillian.xml'
// include 'org/hibernate/test/wf/ddl/manifest.mf'
// expand wildFlyInstallDir: project( ':hibernate-orm-modules' ).wildFlyInstallDir,
// hibernateMajorMinorVersion: "${project.ormVersion.family}",
// arquillianDeploymentExportDir: "${rootProject.buildDir.absolutePath}/arquillian-deployments"
// }
// }
//}
//
//test.dependsOn ':hibernate-orm-modules:prepareWildFlyForTests'
processTestResources {
doLast {
copy {
from file( 'src/test/resources' )
into file( "${buildDir}/resources/test" )
include 'arquillian.xml'
include 'org/hibernate/test/wf/ddl/manifest.mf'
expand wildFlyInstallDir: project( ':hibernate-orm-modules' ).wildFlyInstallDir,
hibernateMajorMinorVersion: "${project.ormVersion.family}",
arquillianDeploymentExportDir: "${rootProject.buildDir.absolutePath}/arquillian-deployments"
}
}
}
test.dependsOn ':hibernate-orm-modules:prepareWildFlyForTests'
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
test {

9
hibernate-orm-modules/hibernate-orm-modules.gradle
View File

@ -34,6 +34,7 @@ ext {
// "10" for WildFly 10.x, "11" for 11.x, etc
wildFlyMajorVersion = project.wildflyVersion.split( '\\.' )[0]
bytebuddyVersion = project.byteBuddyVersion
antlrVersion = project.antlrVersion
artifactClassifier = "wildfly-${wildFlyMajorVersion}-dist"
wildFlyInstallDir = "$rootProject.buildDir/wildfly"
fpackStagingDir = file( "target/featurepack" ) //Target build directory for the Feature Pack
@ -73,7 +74,8 @@ featurepack {
variables['slot'] = rootProject.ormVersion.fullName
// Just the minor ORM version, e.g. "5.3"; Is used as an alias for the exact version
variables['minorSlot'] = rootProject.ormVersion.family
variables['bytebuddySlot'] = bytebuddyVersion
variables['bytebuddySlot'] = antlrVersion
variables['antlrSlot'] = '4.7.1'
variables['infinispan2lcSlot'] = 'for-orm-' + rootProject.ormVersion.family
//Dependency on another Feature Pack:
dependency "org.wildfly:wildfly-feature-pack:${project.wildflyVersion}" // It will assume it is "zip" by default
@ -106,6 +108,9 @@ dependencies {
testCompile project( ":hibernate-core" )
testCompile project( ":hibernate-envers" )
testCompile libraries.junit
testCompile 'org.antlr:antlr4-runtime:4.7.1'
testCompile libraries.antlr
testCompile libraries.arquillian_junit_container
testCompile libraries.arquillian_protocol_servlet
testCompile libraries.shrinkwrap_descriptors_api_javaee
@ -113,9 +118,11 @@ dependencies {
testCompile libraries.wildfly_arquillian_container_managed
featurePack libraries.byteBuddy
featurePack libraries.antlr
featurePack project( ":hibernate-core" )
featurePack project( ":hibernate-envers" )
featurePack "org.wildfly:jipijapa-hibernate5:${wildflyVersion}"
featurePack "org.antlr:antlr4-runtime:4.7.1"
}
publishing {

22
hibernate-orm-modules/module-templates/antlr.xml Normal file
View File

@ -0,0 +1,22 @@
<?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>.
-->
<module xmlns="urn:jboss:module:1.3" name="org.antlr" slot="${antlrSlot}">
<properties>
<property name="jboss.api" value="private"/>
</properties>
<resources>
<artifact name="${org.antlr:antlr4}"/>
</resources>
<dependencies>
<module name="org.antlr-runtime" slot="${antlrSlot}" />
</dependencies>
<!-- <dependencies>-->
<!-- &lt;!&ndash; ByteBuddy currently uses sun.misc.Unsafe &ndash;&gt;-->
<!-- <module name="sun.jdk"/>-->
</module>

19
hibernate-orm-modules/module-templates/antrl-runtime.xml Normal file
View File

@ -0,0 +1,19 @@
<?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>.
-->
<module xmlns="urn:jboss:module:1.3" name="org.antlr-runtime" slot="${antlrSlot}">
<properties>
<property name="jboss.api" value="private"/>
</properties>
<resources>
<artifact name="${org.antlr:antlr4-runtime}"/>
</resources>
<!-- <dependencies>-->
<!-- &lt;!&ndash; ByteBuddy currently uses sun.misc.Unsafe &ndash;&gt;-->
<!-- <module name="sun.jdk"/>-->
</module>

3
hibernate-orm-modules/module-templates/hibernate-core.xml
View File

@ -20,7 +20,8 @@
<module name="javax.transaction.api"/>
<module name="javax.validation.api"/>
<module name="javax.xml.bind.api"/>
<module name="org.antlr"/>
<module name="org.antlr" slot="${antlrSlot}"/>
<module name="org.antlr-runtime" slot="${antlrSlot}"/>
<module name="org.dom4j"/>
<module name="org.jboss.as.jpa.spi"/>
<module name="org.jboss.jandex"/>

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

@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceDescriptor;
import org.jboss.shrinkwrap.descriptor.api.persistence21.PersistenceUnitTransactionType;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.runner.RunWith;
import static org.junit.Assert.assertEquals;
@ -35,7 +36,9 @@ import static org.junit.Assert.assertEquals;
/**
* @author Chris Cranford
*/
@RunWith(Arquillian.class)
// todo (6.0) : re-enable the test when envers is fixed
//@RunWith(Arquillian.class)
public class HibernateEnversOnWildflyTest {
private static final String ORM_VERSION = Session.class.getPackage().getImplementationVersion();
@ -70,7 +73,7 @@ public class HibernateEnversOnWildflyTest {
@Inject
private UserTransaction userTransaction;
@Test
// @Test
public void testEnversCompatibility() throws Exception {
// revision 1
userTransaction.begin();