From e6adcdbe401a5d50d72515fe08004ce25a872c50 Mon Sep 17 00:00:00 2001
From: "Carlos A. Munoz" <camunoz@redhat.com>
Date: Fri, 5 Sep 2014 13:53:28 +1000
Subject: [PATCH] Upgrade hibernate and fix infinispan dependency.

Using hibernate dependency as specified by the JBoss AS 7 bom.
---
 pom.xml            | 9 ++++++++-
 zanata-war/pom.xml | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0451c31dab..c67abe15ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
     <!-- Hibernate Search 4.4.x is for Hibernate Core 4.2.x:
      http://in.relation.to/Bloggers/HibernateSearchWeekendReleasesFromBothMaintenanceBranches
      -->
-    <hibernate.search.version>4.4.2.Final</hibernate.search.version>
+    <hibernate.search.version>4.4.4.Final</hibernate.search.version>
     <hibernate.entitymanager.version>${hibernate.version}</hibernate.entitymanager.version>
     <war_bundles_jsf_impl>false</war_bundles_jsf_impl>
     <hibernate.validator.version>4.3.1.Final</hibernate.validator.version>
@@ -590,6 +590,13 @@
         <artifactId>hibernate-search-infinispan</artifactId>
         <version>${hibernate.search.version}</version>
         <scope>${hibernate.search.scope}</scope>
+        <exclusions>
+          <!-- Slightly older version provided by the app server -->
+          <exclusion>
+            <groupId>org.infinispan</groupId>
+            <artifactId>infinispan-core</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index 735c902fff..c696d8b66b 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -1780,6 +1780,12 @@
       <artifactId>hibernate-search-infinispan</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>javax.el</groupId>
       <artifactId>el-api</artifactId>