From 0d78972dc6cd2d5998c5ee4fc69d034a3b43285c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarren=CC=83o?= <galder@zamarreno.com>
Date: Fri, 1 Dec 2017 08:50:50 +0100
Subject: [PATCH] ISPN-8570 Create Hibernate 5.2 cache module and test it

---
 bom/pom.xml                                  |  5 ++
 hibernate/cache-commons/pom.xml              | 27 +++++++
 {hibernate-cache => hibernate/cache}/pom.xml | 84 ++------------------
 hibernate/pom.xml                            |  1 +
 pom.xml                                      |  2 +-
 5 files changed, 41 insertions(+), 78 deletions(-)
 rename {hibernate-cache => hibernate/cache}/pom.xml (50%)

diff --git a/bom/pom.xml b/bom/pom.xml
index d239e8f977b..84840472ed7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -380,6 +380,11 @@
             <artifactId>infinispan-hibernate-cache-v51</artifactId>
             <version>${project.version}</version>
          </dependency>
+         <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>infinispan-hibernate-cache</artifactId>
+            <version>${project.version}</version>
+         </dependency>
          <dependency>
             <groupId>${project.groupId}.server</groupId>
             <artifactId>infinispan-server-commons</artifactId>
diff --git a/hibernate/cache-commons/pom.xml b/hibernate/cache-commons/pom.xml
index 85fa2d66888..5e1b9f0d91d 100644
--- a/hibernate/cache-commons/pom.xml
+++ b/hibernate/cache-commons/pom.xml
@@ -18,6 +18,33 @@
       <version.hibernate.core>5.1.10.Final</version.hibernate.core>
    </properties>
 
+   <dependencies>
+      <dependency>
+         <groupId>org.hibernate</groupId>
+         <artifactId>hibernate-core</artifactId>
+         <version>${version.hibernate.core}</version>
+      </dependency>
+
+      <dependency>
+         <groupId>org.hibernate</groupId>
+         <artifactId>hibernate-testing</artifactId>
+         <version>${version.hibernate.core}</version>
+         <scope>test</scope>
+         <exclusions>
+            <exclusion>
+               <groupId>log4j</groupId>
+               <artifactId>log4j</artifactId>
+            </exclusion>
+         </exclusions>
+      </dependency>
+      <dependency>
+         <groupId>org.hibernate</groupId>
+         <artifactId>hibernate-entitymanager</artifactId>
+         <version>${version.hibernate.core}</version>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+
    <build>
       <plugins>
          <plugin>
diff --git a/hibernate-cache/pom.xml b/hibernate/cache/pom.xml
similarity index 50%
rename from hibernate-cache/pom.xml
rename to hibernate/cache/pom.xml
index 63b4f1d647d..c4c94512680 100644
--- a/hibernate-cache/pom.xml
+++ b/hibernate/cache/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
       <groupId>org.infinispan</groupId>
-      <artifactId>infinispan-parent</artifactId>
+      <artifactId>infinispan-hibernate-parent</artifactId>
       <version>9.2.0-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>
    </parent>
@@ -15,74 +15,20 @@
 
    <properties>
       <module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
-      <version.hibernate.core>5.1.10.Final</version.hibernate.core>
+      <version.hibernate.core>5.2.11.Final</version.hibernate.core>
    </properties>
 
    <dependencies>
       <dependency>
          <groupId>${project.groupId}</groupId>
-         <artifactId>infinispan-commons-test</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>${project.groupId}</groupId>
-         <artifactId>infinispan-core</artifactId>
+         <artifactId>infinispan-hibernate-cache-commons</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.hibernate</groupId>
-         <artifactId>hibernate-core</artifactId>
-         <version>${version.hibernate.core}</version>
-      </dependency>
-
       <dependency>
          <groupId>${project.groupId}</groupId>
-         <artifactId>infinispan-core</artifactId>
+         <artifactId>infinispan-hibernate-cache-commons</artifactId>
          <type>test-jar</type>
          <scope>test</scope>
       </dependency>
-      <dependency>
-         <groupId>org.hibernate</groupId>
-         <artifactId>hibernate-testing</artifactId>
-         <version>${version.hibernate.core}</version>
-         <scope>test</scope>
-         <exclusions>
-            <exclusion>
-               <groupId>log4j</groupId>
-               <artifactId>log4j</artifactId>
-            </exclusion>
-         </exclusions>
-      </dependency>
-      <dependency>
-         <groupId>org.hibernate</groupId>
-         <artifactId>hibernate-entitymanager</artifactId>
-         <version>${version.hibernate.core}</version>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.mockito</groupId>
-         <artifactId>mockito-core</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss</groupId>
-         <artifactId>jboss-common-core</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.naming</groupId>
-         <artifactId>jnp-client</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>org.jboss.naming</groupId>
-         <artifactId>jnpserver</artifactId>
-         <scope>test</scope>
-      </dependency>
-      <dependency>
-         <groupId>com.h2database</groupId>
-         <artifactId>h2</artifactId>
-         <scope>test</scope>
-      </dependency>
    </dependencies>
 
    <build>
@@ -90,9 +36,6 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <configuration>
-               <configLocation>checkstyle-hibernate-cache.xml</configLocation>
-            </configuration>
          </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -101,6 +44,9 @@
                <groups combine.self="override">${defaultJUnitGroups}</groups>
                <excludedGroups combine.self="override">${defaultExcludedJUnitGroups}</excludedGroups>
                <trimStackTrace>false</trimStackTrace>
+               <dependenciesToScan>
+                  <dependency>${project.groupId}:infinispan-hibernate-cache-commons</dependency>
+               </dependenciesToScan>
                <systemPropertyVariables>
                   <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
                   <jgroups.ping.timeout>500</jgroups.ping.timeout>
@@ -121,20 +67,4 @@
       </plugins>
    </build>
 
-   <profiles>
-      <profile>
-         <id>smoke</id>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-surefire-plugin</artifactId>
-                  <configuration>
-                     <groups>org.infinispan.commons.test.categories.Smoke</groups>
-                  </configuration>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
 </project>
diff --git a/hibernate/pom.xml b/hibernate/pom.xml
index 381829cbd3e..e0e2a3cca6a 100644
--- a/hibernate/pom.xml
+++ b/hibernate/pom.xml
@@ -15,6 +15,7 @@
    <modules>
       <module>cache-commons</module>
       <module>cache-v51</module>
+      <module>cache</module>
    </modules>
 
    <dependencies>
diff --git a/pom.xml b/pom.xml
index 550182c15e1..57b0dfbf25f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
       <module>integrationtests/all-remote-it</module>
       <module>integrationtests/spring-boot-it</module>
       <module>client/marshaller</module>
-      <module>hibernate-cache</module>
+      <module>hibernate</module>
    </modules>
    <properties>