From 89b8bb5372d5a7613d73e6b6790368e1fafe76d4 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Thu, 26 Apr 2018 12:11:21 +0100
Subject: [PATCH] HHH-12525 Allow JBoss module definition to eventually import
 an Infinispan 2LC module

---
 hibernate-orm-modules/hibernate-orm-modules.gradle        | 1 +
 hibernate-orm-modules/module-templates/hibernate-core.xml | 4 +---
 hibernate-orm-modules/module-templates/jipijapa.xml       | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/hibernate-orm-modules/hibernate-orm-modules.gradle b/hibernate-orm-modules/hibernate-orm-modules.gradle
index dd23b5c0dc..414c659285 100644
--- a/hibernate-orm-modules/hibernate-orm-modules.gradle
+++ b/hibernate-orm-modules/hibernate-orm-modules.gradle
@@ -72,6 +72,7 @@ featurepack {
 	// Just the minor ORM version, e.g. "5.3"; Is used as an alias for the exact version
 	variables['minorSlot'] = rootProject.hibernateMajorMinorVersion
 	variables['bytebuddySlot'] = bytebuddyVersion
+	variables['infinispan2lcSlot'] = 'for-orm-' + rootProject.hibernateMajorMinorVersion
 	//Dependency on another Feature Pack:
 	dependency "org.wildfly:wildfly-feature-pack:${project.wildflyVersion}" // It will assume it is "zip" by default
 	//Ensure we declare all source repositories explicitly
diff --git a/hibernate-orm-modules/module-templates/hibernate-core.xml b/hibernate-orm-modules/module-templates/hibernate-core.xml
index b5b740af51..6ee11801bc 100644
--- a/hibernate-orm-modules/module-templates/hibernate-core.xml
+++ b/hibernate-orm-modules/module-templates/hibernate-core.xml
@@ -30,8 +30,6 @@
         <module name="org.hibernate.commons-annotations"/>
         <module name="org.hibernate.orm.jipijapa-hibernate5" services="import" slot="${slot}"/>
         <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"/>
--->
+        <module name="org.infinispan.hibernate-cache" services="import" optional="true" slot="${infinispan2lcSlot}"/>
     </dependencies>
 </module>
diff --git a/hibernate-orm-modules/module-templates/jipijapa.xml b/hibernate-orm-modules/module-templates/jipijapa.xml
index 9ec1ac6a93..f41fea1b30 100644
--- a/hibernate-orm-modules/module-templates/jipijapa.xml
+++ b/hibernate-orm-modules/module-templates/jipijapa.xml
@@ -29,8 +29,6 @@
         <module name="org.jboss.vfs"/>
         <module name="org.hibernate.commons-annotations"/>
         <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"/>
---> 
+        <module name="org.infinispan.hibernate-cache" services="import" optional="true" slot="${infinispan2lcSlot}"/>
     </dependencies>
 </module>