From c7da4b0914fb3573a18e492a9e94145616bef3a6 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Mon, 11 May 2020 13:25:58 -0400
Subject: [PATCH] Build Cleanup

---
 hapi-fhir-converter/pom.xml                          |  7 +++++++
 .../ca/uhn/hapi/fhir/changelog/5_0_0/changes.yaml    |  1 +
 hapi-fhir-structures-r5/pom.xml                      | 12 ++++++++++++
 pom.xml                                              |  3 ++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml
index 63dd461e26e..df0d0b6f7f5 100644
--- a/hapi-fhir-converter/pom.xml
+++ b/hapi-fhir-converter/pom.xml
@@ -189,6 +189,13 @@
 					<dependencySourceIncludes>
 						<include>ca.uhn.hapi.fhir:org.hl7.fhir.convertors</include>
 					</dependencySourceIncludes>
+					<additionalDependencies>
+						<dependency>
+							<groupId>org.apache.commons</groupId>
+							<artifactId>commons-compress</artifactId>
+							<version>${commons_compress_version}</version>
+						</dependency>
+					</additionalDependencies>
 				</configuration>
 			</plugin>
 
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_0_0/changes.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_0_0/changes.yaml
index 0f8a09c5ead..60f01a39265 100644
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_0_0/changes.yaml
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_0_0/changes.yaml
@@ -12,6 +12,7 @@
     <li>FlywayDB (JPA) 6.1.0 -&gt; 6.4.1</li>
     <li>Apache HTTPCliient (JPA): 4.5.9 -&gt; 4.5.12</li>
     <li>Apache HTTPCore (JPA): 4.4.11 -&gt; 4.4.14</li>
+    <li>Commons Compress (All): 1.19 -&gt; 1.20</li>
     </ul>"
 - item:
     issue: "1583"
diff --git a/hapi-fhir-structures-r5/pom.xml b/hapi-fhir-structures-r5/pom.xml
index f5d1094edaa..72922cbf87c 100644
--- a/hapi-fhir-structures-r5/pom.xml
+++ b/hapi-fhir-structures-r5/pom.xml
@@ -59,6 +59,11 @@
 			<artifactId>xpp3</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<optional>true</optional>
+		</dependency>
 
 		<!-- Used by the validator -->
 		<dependency>
@@ -351,6 +356,13 @@
 					<dependencySourceIncludes>
 						<include>ca.uhn.hapi.fhir:org.hl7.fhir.r5</include>
 					</dependencySourceIncludes>
+					<additionalDependencies>
+						<dependency>
+							<groupId>com.google.guava</groupId>
+							<artifactId>guava</artifactId>
+							<version>${guava_version}</version>
+						</dependency>
+					</additionalDependencies>
 				</configuration>
 			</plugin>
 		</plugins>
diff --git a/pom.xml b/pom.xml
index 94506f53617..979e3ac0178 100644
--- a/pom.xml
+++ b/pom.xml
@@ -664,6 +664,7 @@
 		<aries_spifly_version>1.2</aries_spifly_version>
 		<caffeine_version>2.7.0</caffeine_version>
 		<commons_codec_version>1.12</commons_codec_version>
+		<commons_compress_version>1.20</commons_compress_version>
 		<commons_text_version>1.7</commons_text_version>
 		<commons_io_version>2.6</commons_io_version>
 		<commons_lang3_version>3.9</commons_lang3_version>
@@ -862,7 +863,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-compress</artifactId>
-				<version>1.19</version>
+				<version>${commons_compress_version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>