From 74a73e74c574eed9f6bb0215c5519a6a54430fd4 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Wed, 14 Dec 2016 09:21:00 -0500
Subject: [PATCH] Dependency version bumps

---
 hapi-fhir-jpaserver-base/.classpath |  1 -
 pom.xml                             | 22 +++++++++++-----------
 src/changes/changes.xml             | 10 +++++++---
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/hapi-fhir-jpaserver-base/.classpath b/hapi-fhir-jpaserver-base/.classpath
index 36f00e3c87a..5bd66fbcc59 100644
--- a/hapi-fhir-jpaserver-base/.classpath
+++ b/hapi-fhir-jpaserver-base/.classpath
@@ -20,7 +20,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sql"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/pom.xml b/pom.xml
index defa68ab7bd..506dee251ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,9 +311,9 @@
 		<scmPubCheckoutDirectory>${user.home}/sites/scm/hapi-fhir</scmPubCheckoutDirectory>
 
 		<!-- Dependency Versions -->
-		<derby_version>10.12.1.1</derby_version>
-		<jersey_version>2.23.1</jersey_version>
-		<jetty_version>9.3.10.v20160621</jetty_version>
+		<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 -->
@@ -323,7 +323,7 @@
 		<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.5</phloc_commons_version>
+		<phloc_commons_version>4.4.6</phloc_commons_version>
 		<spring_version>4.3.1.RELEASE</spring_version>
 		<thymeleaf-version>3.0.1.RELEASE</thymeleaf-version>
 		<xmlunit_version>1.6</xmlunit_version>
@@ -416,7 +416,7 @@
 			<dependency>
 				<groupId>javax.mail</groupId>
 				<artifactId>javax.mail-api</artifactId>
-				<version>1.5.5</version>
+				<version>1.5.6</version>
 			</dependency>
 			<dependency>
 				<groupId>javax.servlet</groupId>
@@ -604,7 +604,7 @@
 			<dependency>
 				<groupId>org.fusesource.jansi</groupId>
 				<artifactId>jansi</artifactId>
-				<version>1.13</version>
+				<version>1.14</version>
 			</dependency>
 			<dependency>
 				<groupId>org.glassfish</groupId>
@@ -793,7 +793,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.5.1</version>
+					<version>3.6.0</version>
 					<configuration>
 						<source>1.6</source>
 						<target>1.6</target>
@@ -817,12 +817,12 @@
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-compiler-javac</artifactId>
-							<version>2.7</version>
+							<version>2.8.1</version>
 						</dependency>
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-compiler-javac-errorprone</artifactId>
-							<version>2.7</version>
+							<version>2.8.1</version>
 						</dependency>
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
@@ -934,7 +934,7 @@
 				<plugin>
 					<groupId>org.eluder.coveralls</groupId>
 					<artifactId>coveralls-maven-plugin</artifactId>
-					<version>4.2.0</version>
+					<version>4.3.0</version>
 					<configuration>
 						<coberturaReports>
 						</coberturaReports>
@@ -1456,7 +1456,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-changes-plugin</artifactId>
-				<version>2.12</version>
+				<version>2.12.1</version>
 				<inherited>false</inherited>
 				<reportSets>
 					<reportSet>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 58626c29d78..3fd0f128ca3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -7,15 +7,19 @@
 	</properties>
 	<body>
 		<release version="2.2" date="TBD">
-			<!--<action type="add">
+			<action type="add">
 				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>
+						<!--<li>spring (JPA): 4.3.1 -&gt; 4.3.4</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>
+						<li>Phloc Commons (SCH Validator): 4.4.5 -&gt; 4.4.6</li>
 					</ul>
 				]]>
-			</action>-->
+			</action>
 		<action type="fix">
 				Fix issue in AuthorizationIntetceptor where
 				transactions are blocked even when they