From a0fa752eacc2d405ac51e7e7ab8d4b60e30d47c0 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Fri, 7 Jun 2019 09:06:30 -0400
Subject: [PATCH] A number of dependency updates

---
 pom.xml                 | 32 +++++++++++---------------------
 src/changes/changes.xml | 15 +++++++++++++++
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 11d9269ffdd..e55a63dc53c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -546,11 +546,11 @@
 		<apache_karaf_version>4.2.5</apache_karaf_version>
 		<aries_spifly_version>1.2</aries_spifly_version>
 		<caffeine_version>2.7.0</caffeine_version>
-		<commons_codec_version>1.11</commons_codec_version>
+		<commons_codec_version>1.12</commons_codec_version>
 		<commons_text_version>1.6</commons_text_version>
 		<commons_io_version>2.6</commons_io_version>
 		<commons_lang3_version>3.8.1</commons_lang3_version>
-		<derby_version>10.14.2.0</derby_version>
+		<derby_version>10.15.1.3</derby_version>
 		<error_prone_annotations_version>2.3.3</error_prone_annotations_version>
 		<error_prone_core_version>2.3.3</error_prone_core_version>
 		<guava_version>27.1-jre</guava_version>
@@ -569,8 +569,8 @@
 		<hibernate_search_version>5.11.1.Final</hibernate_search_version>
 		<lucene_version>5.5.5</lucene_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>
+		<httpcore_version>4.4.11</httpcore_version>
+		<httpclient_version>4.5.8</httpclient_version>
 		<jackson_version>2.9.9</jackson_version>
 		<maven_assembly_plugin_version>3.1.0</maven_assembly_plugin_version>
 		<maven_license_plugin_version>1.8</maven_license_plugin_version>
@@ -582,7 +582,7 @@
 		<servicemix_xmlresolver_version>1.2_5</servicemix_xmlresolver_version>
 		<slf4j_version>1.7.25</slf4j_version>
 		<spring_version>5.1.6.RELEASE</spring_version>
-		<spring_data_version>2.1.6.RELEASE</spring_data_version>
+		<spring_data_version>2.1.8.RELEASE</spring_data_version>
 		<spring_boot_version>2.1.1.RELEASE</spring_boot_version>
 		<spring_retry_version>1.2.2.RELEASE</spring_retry_version>
 
@@ -662,11 +662,6 @@
 				<artifactId>greenmail-spring</artifactId>
 				<version>1.5.10</version>
 			</dependency>
-			<dependency>
-				<groupId>com.github.bkiers</groupId>
-				<artifactId>Liqp</artifactId>
-				<version>0.6.4</version>
-			</dependency>
 			<dependency>
 				<groupId>com.github.dnault</groupId>
 				<artifactId>xml-patch</artifactId>
@@ -745,7 +740,7 @@
 			<dependency>
 				<groupId>org.jetbrains</groupId>
 				<artifactId>annotations</artifactId>
-				<version>16.0.3</version>
+				<version>17.0.0</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-io</groupId>
@@ -964,17 +959,17 @@
 			<dependency>
 				<groupId>org.apache.maven.scm</groupId>
 				<artifactId>maven-scm-api</artifactId>
-				<version>1.10.0</version>
+				<version>1.11.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven.scm</groupId>
 				<artifactId>maven-scm-manager-plexus</artifactId>
-				<version>1.10.0</version>
+				<version>1.11.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven.scm</groupId>
 				<artifactId>maven-scm-provider-gitexe</artifactId>
-				<version>1.10.0</version>
+				<version>1.11.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.maven.wagon</groupId>
@@ -1101,15 +1096,10 @@
 				<artifactId>websocket-server</artifactId>
 				<version>${jetty_version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.flywaydb</groupId>
-				<artifactId>flyway-core</artifactId>
-				<version>5.1.4</version>
-			</dependency>
 			<dependency>
 				<groupId>org.fusesource.jansi</groupId>
 				<artifactId>jansi</artifactId>
-				<version>1.17.1</version>
+				<version>1.18</version>
 			</dependency>
 			<dependency>
 				<groupId>org.glassfish</groupId>
@@ -1209,7 +1199,7 @@
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>
-				<version>2.27.0</version>
+				<version>2.28.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.postgresql</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 08c9e2dc529..f1d6aab5bb1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -7,6 +7,21 @@
 	</properties>
 	<body>
 		<release version="4.0.0" date="TBD" description="Igloo">
+			<action type="add">
+				The version of a few dependencies have been bumped to the
+				latest versions (dependent HAPI modules listed in brackets):
+				<![CDATA[
+				<ul>
+					<li>Commons Codec (Core): 1.11 -&gt; 1.12</li>
+					<li>Apache HTTPClient (Client): 4.5.3 -&gt; 4.5.8</li>
+					<li>Apache HTTPCore (Client>: 4.4.6 -&gt; 4.4.11</li>
+					<li>Spring (JPA): 5.1.6.RELEASE -&gt; 5.1.7.RELEASE</li>
+					<li>Spring-Data (JPA): 2.0.6.RELEASE -&gt; 2.0.8.RELEASE</li>
+					<li>Derby (CLI and JPA Examples): 10.14.2.0 -&gt; 10.15.1.3</li>
+					<li>JANSI (CLI): 1.17.1 -&gt; 1.18</li>
+				</ul>
+				]]>
+			</action>
 			<action type="add">
 				The $expunge global everything operation has been refactored to do deletes
 				in small batches. This change will likely reduce performance, but does allow