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

HHH-12525 Allow JBoss module definition to eventually import an Infinispan 2LC module

This commit is contained in:
Sanne Grinovero 2018-04-26 12:11:21 +01:00
parent 898667772c
commit 89b8bb5372
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,7 @@ featurepack {
// Just the minor ORM version, e.g. "5.3"; Is used as an alias for the exact version // Just the minor ORM version, e.g. "5.3"; Is used as an alias for the exact version
variables['minorSlot'] = rootProject.hibernateMajorMinorVersion variables['minorSlot'] = rootProject.hibernateMajorMinorVersion
variables['bytebuddySlot'] = bytebuddyVersion variables['bytebuddySlot'] = bytebuddyVersion
variables['infinispan2lcSlot'] = 'for-orm-' + rootProject.hibernateMajorMinorVersion
//Dependency on another Feature Pack: //Dependency on another Feature Pack:
dependency "org.wildfly:wildfly-feature-pack:${project.wildflyVersion}" // It will assume it is "zip" by default dependency "org.wildfly:wildfly-feature-pack:${project.wildflyVersion}" // It will assume it is "zip" by default
//Ensure we declare all source repositories explicitly //Ensure we declare all source repositories explicitly

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

@ -30,8 +30,6 @@
<module name="org.hibernate.commons-annotations"/> <module name="org.hibernate.commons-annotations"/>
<module name="org.hibernate.orm.jipijapa-hibernate5" services="import" slot="${slot}"/> <module name="org.hibernate.orm.jipijapa-hibernate5" services="import" slot="${slot}"/>
<module name="net.bytebuddy" slot="${bytebuddySlot}" /> <module name="net.bytebuddy" slot="${bytebuddySlot}" />
<!-- need an ORM 5.3 slot version of this service created <module name="org.infinispan.hibernate-cache" services="import" optional="true" slot="${infinispan2lcSlot}"/>
<module name="org.infinispan.hibernate-cache" services="import" optional="true"/>
-->
</dependencies> </dependencies>
</module> </module>

4
hibernate-orm-modules/module-templates/jipijapa.xml
View File

@ -29,8 +29,6 @@
<module name="org.jboss.vfs"/> <module name="org.jboss.vfs"/>
<module name="org.hibernate.commons-annotations"/> <module name="org.hibernate.commons-annotations"/>
<module name="org.infinispan" services="import"/> <module name="org.infinispan" services="import"/>
<!-- need an ORM 5.3 slot version of this service created <module name="org.infinispan.hibernate-cache" services="import" optional="true" slot="${infinispan2lcSlot}"/>
<module name="org.infinispan.hibernate-cache" services="import"/>
-->
</dependencies> </dependencies>
</module> </module>