From e6a6c22783794e6fcba6ae63a2eeaa5e4a89da58 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Sun, 31 Mar 2019 13:57:02 -0400
Subject: [PATCH] Bump a few project dependencies

---
 hapi-fhir-testpage-overlay/pom.xml |  1 +
 pom.xml                            | 20 ++++++++++----------
 src/changes/changes.xml            | 16 +++++++++++++---
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml
index d88a4d70400..0e3a169a064 100644
--- a/hapi-fhir-testpage-overlay/pom.xml
+++ b/hapi-fhir-testpage-overlay/pom.xml
@@ -212,6 +212,7 @@
 				<configuration>
 					<attachClasses>true</attachClasses>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
+					<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/pom.xml b/pom.xml
index b450d5478af..75f360c7904 100755
--- a/pom.xml
+++ b/pom.xml
@@ -529,7 +529,7 @@
 		<activation_api_version>1.2.0</activation_api_version>
 		<apache_karaf_version>4.2.2</apache_karaf_version>
 		<aries_spifly_version>1.2</aries_spifly_version>
-		<caffeine_version>2.6.2</caffeine_version>
+		<caffeine_version>2.7.0</caffeine_version>
 		<commons_codec_version>1.11</commons_codec_version>
 		<commons_text_version>1.6</commons_text_version>
 		<commons_io_version>2.6</commons_io_version>
@@ -547,14 +547,14 @@
 		<jetty_version>9.4.14.v20181114</jetty_version>
 		<jsr305_version>3.0.2</jsr305_version>
 		<!--<hibernate_version>5.2.10.Final</hibernate_version>-->
-		<hibernate_version>5.4.1.Final</hibernate_version>
+		<hibernate_version>5.4.2.Final</hibernate_version>
 		<!-- Update lucene version when you update hibernate-search version -->
 		<hibernate_search_version>5.11.1.Final</hibernate_search_version>
 		<lucene_version>5.5.5</lucene_version>
-		<hibernate_validator_version>5.4.1.Final</hibernate_validator_version>
+		<hibernate_validator_version>5.4.2.Final</hibernate_validator_version>
 		<httpcore_version>4.4.6</httpcore_version>
 		<httpclient_version>4.5.3</httpclient_version>
-		<jackson_version>2.9.7</jackson_version>
+		<jackson_version>2.9.8</jackson_version>
 		<maven_assembly_plugin_version>3.1.0</maven_assembly_plugin_version>
 		<maven_license_plugin_version>1.8</maven_license_plugin_version>
 		<resteasy_version>4.0.0.Beta3</resteasy_version>
@@ -564,8 +564,8 @@
 		<servicemix_saxon_version>9.5.1-5_1</servicemix_saxon_version>
 		<servicemix_xmlresolver_version>1.2_5</servicemix_xmlresolver_version>
 		<slf4j_version>1.7.25</slf4j_version>
-		<spring_version>5.1.5.RELEASE</spring_version>
-		<spring_data_version>2.1.3.RELEASE</spring_data_version>
+		<spring_version>5.1.6.RELEASE</spring_version>
+		<spring_data_version>2.1.5.RELEASE</spring_data_version>
 		<spring_boot_version>2.1.1.RELEASE</spring_boot_version>
 		<spring_retry_version>1.2.2.RELEASE</spring_retry_version>
 
@@ -1087,7 +1087,7 @@
 			<dependency>
 				<groupId>org.fusesource.jansi</groupId>
 				<artifactId>jansi</artifactId>
-				<version>1.16</version>
+				<version>1.17.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.glassfish</groupId>
@@ -1187,7 +1187,7 @@
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
-				<version>2.23.4</version>
+				<version>2.25.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.postgresql</groupId>
@@ -1454,7 +1454,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.0.1</version>
+					<version>3.1.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -1530,7 +1530,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>license-maven-plugin</artifactId>
-					<version>1.16</version>
+					<version>1.19</version>
 					<configuration>
 						<verbose>true</verbose>
 						<addSvnKeyWords>false</addSvnKeyWords>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e4f8cb2a4b0..6beb7f5a18f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -11,9 +11,14 @@
 				The version of a few dependencies have been bumped to the
 				latest versions (dependent HAPI modules listed in brackets):
 				<![CDATA[
-					<ul>
-						<li>Spring (JPA): 5.1.3.RELEASE -&gt; 5.1.5.RELEASE</li>
-					</ul>
+				<ul>
+					<li>Hibernate (JPA): 5.4.1 -&gt; 5.4.2</li>
+					<li>Jackson (JPA): 2.9.7 -&gt; 2.9.8</li>
+					<li>Spring (JPA): 5.1.3.RELEASE -&gt; 5.1.6.RELEASE</li>
+					<li>Spring-Data (JPA): 2.1.3.RELEASE -&gt; 2.1.5.RELEASE</li>
+					<li>Caffeine (JPA): 2.6.2 -&gt; 2.7.0</li>
+					<li>JANSI (CLI): 1.16 -&gt; 1.17.1</li>
+				</ul>
 				]]>
 			</action>
 			<action type="add">
@@ -112,6 +117,11 @@
 				Bundle.entry.resource, even though the FHIR spec states that this field
 				should be empty. This was corrected.
 			</action>
+			<action type="change">
+				The hapi-fhir-testpage-overlay project no longer includes any library JARs
+				in the built WAR, in order to prevent duplicates and conflicts in implementing
+				projects.
+			</action>
 		</release>
 		<release version="3.7.0" date="2019-02-06" description="Gale">
 			<action type="add">