From 7faf1c4d43bca93c55bd2867bc9482927a558c2e Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Tue, 2 Jan 2018 17:13:07 -0600
Subject: [PATCH] HHH-12177 - Drop hibernate-infinispan module - relocated
 HHH-12171 - Fix tests for hibernate-orm-modules

---
 .../org/hibernate/infinispan/module.xml       | 11 --------
 .../modules/org/hibernate/core/module.xml     |  1 -
 .../org/hibernate/infinispan/module.xml       | 26 -------------------
 .../hibernate/jipijapa-hibernate5/module.xml  |  2 --
 4 files changed, 40 deletions(-)
 delete mode 100644 hibernate-orm-modules/src/main/aliases/org/hibernate/infinispan/module.xml
 delete mode 100644 hibernate-orm-modules/src/main/modules/org/hibernate/infinispan/module.xml

diff --git a/hibernate-orm-modules/src/main/aliases/org/hibernate/infinispan/module.xml b/hibernate-orm-modules/src/main/aliases/org/hibernate/infinispan/module.xml
deleted file mode 100644
index d50a4393ab..0000000000
--- a/hibernate-orm-modules/src/main/aliases/org/hibernate/infinispan/module.xml
+++ /dev/null
@@ -1,11 +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>.
-  -->
-<module-alias xmlns="urn:jboss:module:1.3"
-    name="org.hibernate.infinispan" slot="${minorSlot}"
-    target-name="org.hibernate.infinispan" target-slot="${slot}"
-/>
diff --git a/hibernate-orm-modules/src/main/modules/org/hibernate/core/module.xml b/hibernate-orm-modules/src/main/modules/org/hibernate/core/module.xml
index a6167ffb3b..fb5c60faf9 100644
--- a/hibernate-orm-modules/src/main/modules/org/hibernate/core/module.xml
+++ b/hibernate-orm-modules/src/main/modules/org/hibernate/core/module.xml
@@ -29,7 +29,6 @@
         <module name="org.jboss.vfs"/>
         <module name="org.javassist" export="true"/>
         <module name="org.hibernate.commons-annotations"/>
-        <module name="org.hibernate.infinispan" services="import" optional="true" slot="${slot}"/>
         <module name="org.hibernate.jipijapa-hibernate5" services="import" slot="${slot}"/>
     </dependencies>
 </module>
diff --git a/hibernate-orm-modules/src/main/modules/org/hibernate/infinispan/module.xml b/hibernate-orm-modules/src/main/modules/org/hibernate/infinispan/module.xml
deleted file mode 100644
index 95fb69b4c9..0000000000
--- a/hibernate-orm-modules/src/main/modules/org/hibernate/infinispan/module.xml
+++ /dev/null
@@ -1,26 +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>.
-  -->
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate.infinispan" slot="${slot}">
-
-    <properties>
-        <property name="jboss.api" value="private"/>
-    </properties>
-
-    <resources>
-        <resource-root path="hibernate-infinispan-${version}.jar"/>
-    </resources>
-
-    <dependencies>
-        <module name="org.hibernate" slot="${slot}"/>
-        <module name="javax.api"/>
-        <module name="javax.transaction.api"/>
-        <module name="org.infinispan" services="import"/>
-        <module name="org.infinispan.commons"/>
-        <module name="org.jboss.logging"/>
-    </dependencies>
-</module>
diff --git a/hibernate-orm-modules/src/main/modules/org/hibernate/jipijapa-hibernate5/module.xml b/hibernate-orm-modules/src/main/modules/org/hibernate/jipijapa-hibernate5/module.xml
index 6b43d43a2f..21e41ee345 100644
--- a/hibernate-orm-modules/src/main/modules/org/hibernate/jipijapa-hibernate5/module.xml
+++ b/hibernate-orm-modules/src/main/modules/org/hibernate/jipijapa-hibernate5/module.xml
@@ -28,7 +28,5 @@
         <module name="org.jboss.logging"/>
         <module name="org.jboss.vfs"/>
         <module name="org.hibernate.commons-annotations"/>
-        <module name="org.hibernate.infinispan" services="import" slot="${slot}"/>
-        <module name="org.infinispan" services="import"/>
     </dependencies>
 </module>