From e5b9aa4536f6f3c25d1613dcd65dda2172598ff8 Mon Sep 17 00:00:00 2001
From: James <jamesagnew@gmail.com>
Date: Mon, 30 Jan 2017 17:59:01 -0500
Subject: [PATCH] Bump some dependency versions

---
 .../uhn/fhir/jpa/config/TestDstu1Config.java  |  3 +++
 pom.xml                                       | 20 +++++++++----------
 src/changes/changes.xml                       |  7 +++++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu1Config.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu1Config.java
index 6af61ccbf24..ac66224b0d2 100644
--- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu1Config.java
+++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/config/TestDstu1Config.java
@@ -58,6 +58,9 @@ public class TestDstu1Config extends BaseJavaConfigDstu1 {
 		extraProperties.put("hibernate.format_sql", "false");
 		extraProperties.put("hibernate.show_sql", "false");
 		extraProperties.put("hibernate.hbm2ddl.auto", "update");
+		extraProperties.put("hibernate.dialect", "org.hibernate.dialect.DerbyTenSevenDialect");
+		extraProperties.put("hibernate.search.default.directory_provider", "ram");
+		extraProperties.put("hibernate.search.lucene_version","LUCENE_CURRENT");
 		return extraProperties;
 	}
 
diff --git a/pom.xml b/pom.xml
index 63286b29d3e..b5913d2d832 100644
--- a/pom.xml
+++ b/pom.xml
@@ -315,18 +315,18 @@
 		<derby_version>10.13.1.1</derby_version>
 		<jersey_version>2.24</jersey_version>
 		<jetty_version>9.3.14.v20161028</jetty_version>
-		<!-- Note on Hibernate versions: Hibernate 4.3+ uses JPA 2.1, which is too new for a number of platforms including JBoss EAP 6.x and Glassfish 3.0. Upgrade this version with caution! Also note that if 
-			you change this, you may get a failure in hibernate4-maven-plugin. See the note in hapi-fhir-jpaserver-base/pom.xml's configuration for that plugin... -->
-		<!-- 5.2.0 has issues with hibernate-search 5.5.3 -->
-		<hibernate_version>5.1.0.Final</hibernate_version>
-		<hibernate_validator_version>5.2.4.Final</hibernate_validator_version>
+		<hibernate_version>5.2.7.Final</hibernate_version>
+		<hibernate_validator_version>5.3.4.Final</hibernate_validator_version>
+		<!-- Update lucene version when you update hibernate-search version -->
+		<hibernate_search_version>5.7.0.CR1</hibernate_search_version>
+		<lucene_version>5.5.2</lucene_version>
 		<maven_assembly_plugin_version>2.5.3</maven_assembly_plugin_version>
 		<maven_license_plugin_version>1.8</maven_license_plugin_version>
 		<maven_source_plugin_version>2.4</maven_source_plugin_version>
 		<phloc_schematron_version>2.7.1</phloc_schematron_version>
 		<phloc_commons_version>4.4.6</phloc_commons_version>
-		<spring_version>4.3.4.RELEASE</spring_version>
-		<thymeleaf-version>3.0.1.RELEASE</thymeleaf-version>
+		<spring_version>4.3.6.RELEASE</spring_version>
+		<thymeleaf-version>3.0.2.RELEASE</thymeleaf-version>
 		<xmlunit_version>1.6</xmlunit_version>
 
 		<!-- We are aiming to still work on a very old version of SLF4j even though we depend on the newest, just to be nice to users of the API. This version is tested in the hapi-fhir-cobertura. -->
@@ -515,12 +515,12 @@
 			<dependency>
 				<groupId>org.apache.lucene</groupId>
 				<artifactId>lucene-highlighter</artifactId>
-				<version>5.3.1</version>
+				<version>${lucene_version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.lucene</groupId>
 				<artifactId>lucene-analyzers-phonetic</artifactId>
-				<version>5.3.1</version>
+				<version>${lucene_version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven.doxia</groupId>
@@ -675,7 +675,7 @@
 			<dependency>
 				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-search-orm</artifactId>
-				<version>5.5.4.Final</version>
+				<version>${hibernate_search_version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.javassist</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2d651282ea0..9b85d7a26de 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -11,8 +11,11 @@
 				Bump the version of a few dependencies to the
 				latest versions (dependent HAPI modules listed in brackets):
 				<![CDATA[
-					<ul>
-						<li>spring (JPA): 4.3.1 -&gt; 4.3.4</li>
+				<ul>
+						<li>Hibernate (JPA): 5.1.0 -&gt; 5.2.7</li>
+						<li>Hibernate Search (JPA): 5.5.4 -&gtp; 5.7.0.CR1</li>
+						<li>Hibernate Validator (JPA): 5.2.4 -&gtp; 5.3.4</li>
+						<li>Spring (JPA): 4.3.1 -&gt; 4.3.6</li>
 						<li>Derby (CLI): 10.12.1.1 -&gt; 10.13.1.1</li>
 						<li>Jetty (CLI): 9.3.10.v20160621 -&gt; 9.3.14.v20161028</li>
 						<li>JAnsi (CLI): 1.13 -&gt; 1.14</li>