From 8fee057de326f395f67547e21fa62bbd717f0935 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Sun, 20 Sep 2015 10:18:33 -0400
Subject: [PATCH] Bump Spring and Hibernate versions

---
 hapi-fhir-jpaserver-base/pom.xml              |  2 --
 .../jpa/util/HapiDerbyTenSevenDialect.java    | 16 ++++++++++++
 .../src/main/resources/fhir-spring-config.xml |  2 +-
 .../test/resources/META-INF/persistence.xml   |  5 ----
 .../fhir-jpabase-spring-test-config.xml       |  2 +-
 .../hapi-fhir-server-database-config.xml      |  2 +-
 .../META-INF/fhirtest_persistence.xml         |  2 +-
 ...hapi-fhir-server-database-config-dstu1.xml |  2 +-
 ...hapi-fhir-server-database-config-dstu2.xml |  2 +-
 .../resources/fhir-spring-test-config.xml     |  2 +-
 .../resources/fhir_jpatest_persistence.xml    |  2 +-
 .../test/resources/META-INF/persistence.xml   |  2 +-
 .../fhir-jpabase-spring-test-config.xml       |  2 +-
 pom.xml                                       | 26 ++++++++++++++-----
 src/changes/changes.xml                       | 10 +++++++
 15 files changed, 55 insertions(+), 24 deletions(-)
 create mode 100644 hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/HapiDerbyTenSevenDialect.java

diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
index 6b9aa9ac6a6..9237ebd9ce4 100644
--- a/hapi-fhir-jpaserver-base/pom.xml
+++ b/hapi-fhir-jpaserver-base/pom.xml
@@ -287,7 +287,6 @@
 			<plugin>
 				<groupId>de.juplo</groupId>
 				<artifactId>hibernate4-maven-plugin</artifactId>
-				<version>1.0.5</version>
 				<configuration>
 					<force>true</force>
 					<target>SCRIPT</target>
@@ -417,7 +416,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jxr-plugin</artifactId>
-				<version>${maven_jxr_plugin_version}</version>
 			</plugin>
 		</plugins>
 	</reporting>
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/HapiDerbyTenSevenDialect.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/HapiDerbyTenSevenDialect.java
new file mode 100644
index 00000000000..c71c054a85f
--- /dev/null
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/HapiDerbyTenSevenDialect.java
@@ -0,0 +1,16 @@
+package ca.uhn.fhir.jpa.util;
+
+import org.hibernate.dialect.DerbyTenSevenDialect;
+
+/**
+ * As of Hibernate 5.0.1, DerbyTenSevenDialect doesn't seem to work when updating
+ * the schema, as it tries to create a duplicate schema
+ */
+public class HapiDerbyTenSevenDialect extends DerbyTenSevenDialect {
+
+	@Override
+	public String getQuerySequencesString() {
+		return "select SEQUENCENAME from sys.syssequences";
+	}
+
+}
diff --git a/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-config.xml b/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-config.xml
index 05bfbe60266..31c1630d367 100644
--- a/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-config.xml
+++ b/hapi-fhir-jpaserver-base/src/main/resources/fhir-spring-config.xml
@@ -35,7 +35,7 @@
 				<property name="showSql" value="false" />
 				<property name="generateDdl" value="true" />
 				<!-- <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect" />  -->
-				<property name="databasePlatform" value="org.hibernate.dialect.DerbyTenSevenDialect" />
+				<property name="databasePlatform" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
 			</bean>
 		</property>
 	</bean>
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/META-INF/persistence.xml b/hapi-fhir-jpaserver-base/src/test/resources/META-INF/persistence.xml
index 6feb16c727e..f990e6c30cf 100644
--- a/hapi-fhir-jpaserver-base/src/test/resources/META-INF/persistence.xml
+++ b/hapi-fhir-jpaserver-base/src/test/resources/META-INF/persistence.xml
@@ -25,12 +25,7 @@
 		
 		<exclude-unlisted-classes>false</exclude-unlisted-classes>
 		<properties>
-			<property name="hibernate.connection.url" value="jdbc:hsqldb:mem:unit-testing-jpa" />
-			<property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.DerbyTenSevenDialect" />
 			<property name="hibernate.hbm2ddl.auto" value="update" />
-			<property name="hibernate.connection.username" value="sa" />
-			<property name="hibernate.connection.password" value="" />
 			<property name="hibernate.jdbc.batch_size" value="0" />
 			<property name="hibernate.cache.use_minimal_puts" value="false" />
 			<property name="hibernate.cache.use_query_cache" value="false" />
diff --git a/hapi-fhir-jpaserver-base/src/test/resources/fhir-jpabase-spring-test-config.xml b/hapi-fhir-jpaserver-base/src/test/resources/fhir-jpabase-spring-test-config.xml
index cc840460f79..3ff4d8ca889 100644
--- a/hapi-fhir-jpaserver-base/src/test/resources/fhir-jpabase-spring-test-config.xml
+++ b/hapi-fhir-jpaserver-base/src/test/resources/fhir-jpabase-spring-test-config.xml
@@ -33,7 +33,7 @@
 				<property name="showSql" value="false" />
 				<property name="generateDdl" value="true" />
 				<!-- <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect" />  -->
-				<property name="databasePlatform" value="org.hibernate.dialect.DerbyTenSevenDialect" />
+				<property name="databasePlatform" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
 			</bean>
 		</property>
 	</bean>
diff --git a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
index 8e993d11811..c2dafc4915c 100644
--- a/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
+++ b/hapi-fhir-jpaserver-example/src/main/webapp/WEB-INF/hapi-fhir-server-database-config.xml
@@ -40,7 +40,7 @@
 			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
 				<property name="showSql" value="false" />
 				<property name="generateDdl" value="true" />
-				<property name="databasePlatform" value="org.hibernate.dialect.DerbyTenSevenDialect" />
+				<property name="databasePlatform" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
 			</bean>
 		</property>
 	</bean>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/META-INF/fhirtest_persistence.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/META-INF/fhirtest_persistence.xml
index 8c4c112e780..a1d85bfa9c8 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/META-INF/fhirtest_persistence.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/META-INF/fhirtest_persistence.xml
@@ -24,7 +24,7 @@
 		
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 		<properties>
-			<property name="hibernate.dialect" value="org.hibernate.dialect.DerbyTenSevenDialect" />
+			<property name="hibernate.dialect" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
 			<property name="hibernate.hbm2ddl.auto" value="update" />
 			<property name="hibernate.jdbc.batch_size" value="20" />
 			<property name="hibernate.cache.use_minimal_puts" value="true" />
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/hapi-fhir-server-database-config-dstu1.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/hapi-fhir-server-database-config-dstu1.xml
index 40f2e402ccb..13c6c5fdad2 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/hapi-fhir-server-database-config-dstu1.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/hapi-fhir-server-database-config-dstu1.xml
@@ -44,7 +44,7 @@
 			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
 				<property name="showSql" value="false" />
 				<property name="generateDdl" value="true" />
-				<property name="databasePlatform" value="org.hibernate.dialect.DerbyTenSevenDialect" />
+				<property name="databasePlatform" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
 				<!-- <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect" />-->
 				<!-- <property name="databasePlatform" value="org.hibernate.dialect.MySQL5Dialect" /> -->
 			</bean>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/hapi-fhir-server-database-config-dstu2.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/hapi-fhir-server-database-config-dstu2.xml
index 0d67234ab21..95fbacb6f31 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/hapi-fhir-server-database-config-dstu2.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/resources/hapi-fhir-server-database-config-dstu2.xml
@@ -31,7 +31,7 @@
 			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
 				<property name="showSql" value="false" />
 				<property name="generateDdl" value="true" />
-				<property name="databasePlatform" value="org.hibernate.dialect.DerbyTenSevenDialect" />
+				<property name="databasePlatform" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
 				<!-- <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect" /> -->
 				<!-- <property name="databasePlatform" value="org.hibernate.dialect.MySQL5Dialect" /> -->
 			</bean>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/test/resources/fhir-spring-test-config.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/test/resources/fhir-spring-test-config.xml
index 6f24773a275..7e98295ef90 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/test/resources/fhir-spring-test-config.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/test/resources/fhir-spring-test-config.xml
@@ -42,7 +42,7 @@
 			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
 				<property name="showSql" value="false" />
 				<property name="generateDdl" value="true" />
-				<property name="databasePlatform" value="org.hibernate.dialect.DerbyTenSevenDialect" />
+				<property name="databasePlatform" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
 			</bean>
 		</property>
 	</bean>
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/test/resources/fhir_jpatest_persistence.xml b/hapi-fhir-jpaserver-uhnfhirtest/src/test/resources/fhir_jpatest_persistence.xml
index cd25b565b8d..56306183fa6 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/test/resources/fhir_jpatest_persistence.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/test/resources/fhir_jpatest_persistence.xml
@@ -21,7 +21,7 @@
 		<properties>
 			<property name="hibernate.connection.url" value="jdbc:hsqldb:mem:unit-testing-jpa" />
 			<property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.DerbyTenSevenDialect" />
+			<property name="hibernate.dialect" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
 			<property name="hibernate.hbm2ddl.auto" value="update" />
 			<property name="hibernate.connection.username" value="sa" />
 			<property name="hibernate.connection.password" value="" />
diff --git a/hapi-fhir-testpage-overlay/src/test/resources/META-INF/persistence.xml b/hapi-fhir-testpage-overlay/src/test/resources/META-INF/persistence.xml
index 6feb16c727e..3dcefdcd452 100644
--- a/hapi-fhir-testpage-overlay/src/test/resources/META-INF/persistence.xml
+++ b/hapi-fhir-testpage-overlay/src/test/resources/META-INF/persistence.xml
@@ -27,7 +27,7 @@
 		<properties>
 			<property name="hibernate.connection.url" value="jdbc:hsqldb:mem:unit-testing-jpa" />
 			<property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" />
-			<property name="hibernate.dialect" value="org.hibernate.dialect.DerbyTenSevenDialect" />
+			<property name="hibernate.dialect" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
 			<property name="hibernate.hbm2ddl.auto" value="update" />
 			<property name="hibernate.connection.username" value="sa" />
 			<property name="hibernate.connection.password" value="" />
diff --git a/hapi-fhir-testpage-overlay/src/test/resources/fhir-jpabase-spring-test-config.xml b/hapi-fhir-testpage-overlay/src/test/resources/fhir-jpabase-spring-test-config.xml
index 2a8f7ae311b..65e49701718 100644
--- a/hapi-fhir-testpage-overlay/src/test/resources/fhir-jpabase-spring-test-config.xml
+++ b/hapi-fhir-testpage-overlay/src/test/resources/fhir-jpabase-spring-test-config.xml
@@ -38,7 +38,7 @@
 				<property name="showSql" value="false" />
 				<property name="generateDdl" value="true" />
 				<!-- <property name="databasePlatform" value="org.hibernate.dialect.HSQLDialect" />  -->
-				<property name="databasePlatform" value="org.hibernate.dialect.DerbyTenSevenDialect" />
+				<property name="databasePlatform" value="ca.uhn.fhir.jpa.util.HapiDerbyTenSevenDialect" />
 			</bean>
 		</property>
 	</bean>
diff --git a/pom.xml b/pom.xml
index bcc3c08f1e7..574f0aa7cba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,15 +214,13 @@
 		<derby_version>10.11.1.1</derby_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... <hibernate_version>4.3.7.Final</hibernate_version> -->
-		<hibernate_version>4.2.17.Final</hibernate_version>
-		<hibernate_validator_version>5.1.0.Final</hibernate_validator_version>
+			for that plugin... -->
+		<hibernate_version>5.0.1.Final</hibernate_version>
+		<hibernate_validator_version>5.2.1.Final</hibernate_validator_version>
 		<jetty_version>9.2.6.v20141205</jetty_version>
 		<maven_build_helper_plugin_version>1.9.1</maven_build_helper_plugin_version>
 		<maven_assembly_plugin_version>2.5.3</maven_assembly_plugin_version>
 		<maven_failsafe_plugin_version>2.18.1</maven_failsafe_plugin_version>
-		<maven_gpg_plugin_version>1.6</maven_gpg_plugin_version>
-		<maven_jxr_plugin_version>2.5</maven_jxr_plugin_version>
 		<maven_license_plugin_version>1.8</maven_license_plugin_version>
 		<maven_project_info_plugin_version>2.8</maven_project_info_plugin_version>
 		<maven_surefire_plugin_version>2.18.1</maven_surefire_plugin_version>
@@ -231,7 +229,7 @@
 		<mitreid-connect-version>1.1.8</mitreid-connect-version>
 		<phloc_schematron_version>2.7.1</phloc_schematron_version>
 		<phloc_commons_version>4.3.6</phloc_commons_version>
-		<spring_version>4.1.5.RELEASE</spring_version>
+		<spring_version>4.2.1.RELEASE</spring_version>
 		<thymeleaf-version>2.1.4.RELEASE</thymeleaf-version>
 		<ebay_cors_filter_version>1.0.1</ebay_cors_filter_version>
 		<xmlunit_version>1.6</xmlunit_version>
@@ -541,6 +539,11 @@
 	<build>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>de.juplo</groupId>
+					<artifactId>hibernate4-maven-plugin</artifactId>
+					<version>1.1.0</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
@@ -590,11 +593,21 @@
 					<artifactId>maven-deploy-plugin</artifactId>
 					<version>2.8.2</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-gpg-plugin</artifactId>
+					<version>1.6</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
 					<version>2.10.1</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jxr-plugin</artifactId>
+					<version>2.5</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
@@ -1223,7 +1236,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>${maven_gpg_plugin_version}</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5de0f193023..500eda8e512 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -8,6 +8,16 @@
 	<body>
 		<release version="1.3" date="TBD">
 			<action type="add">
+            Bump the version of a few dependencies to the
+            latest versions (dependent HAPI modules listed in brackets):
+            <![CDATA[
+               <ul>
+                  <li>Springframework (JPA, Web Tester): 4.1.5 -> 4.2.1</li>
+                  <li>Hibernate (JPA, Web Tester): 4.2.17 -> 5.0.1</li>
+               </ul>
+            ]]>
+         </action>
+			<action type="add">
 				JPA server removes duplicate resource index entries before storing them 
 				(e.g. if a patient has the same name twice, only one index entry is created
 				for that name)