From 3bfce11d2c38787bf8cdfddbcc48cca74a2dd362 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Mon, 17 Sep 2018 16:06:11 -0400
Subject: [PATCH] Add OSGI dependency for commons-text

---
 .../src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java          | 4 ++--
 .../src/main/java/ca/uhn/fhir/jpa/migrate/DriverTypeEnum.java | 4 ++--
 osgi/hapi-fhir-karaf-features/src/main/resources/features.xml | 1 +
 pom.xml                                                       | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java
index a61a81d6f38..a5f281a00ce 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/util/TestUtil.java
@@ -9,9 +9,9 @@ package ca.uhn.fhir.jpa.util;
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/DriverTypeEnum.java b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/DriverTypeEnum.java
index 6b708429d83..533c7adf396 100644
--- a/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/DriverTypeEnum.java
+++ b/hapi-fhir-jpaserver-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/DriverTypeEnum.java
@@ -23,9 +23,9 @@ import java.util.Enumeration;
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/osgi/hapi-fhir-karaf-features/src/main/resources/features.xml b/osgi/hapi-fhir-karaf-features/src/main/resources/features.xml
index 449ad9db4f7..b9ebbd52150 100644
--- a/osgi/hapi-fhir-karaf-features/src/main/resources/features.xml
+++ b/osgi/hapi-fhir-karaf-features/src/main/resources/features.xml
@@ -24,6 +24,7 @@
 	  <bundle dependency='true'>mvn:com.google.code.gson/gson/${gson_version}</bundle>
 	  <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons_lang3_version}</bundle>
 	  <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons_codec_version}</bundle>
+	  <bundle dependency='true'>mvn:org.apache.commons/commons-text/${commons_text_version}</bundle>
 	  <bundle dependency='true'>mvn:commons-io/commons-io/${commons_io_version}</bundle>
 	  <bundle dependency='true'>mvn:com.google.guava/guava/${guava_version}</bundle>
 	  <bundle dependency='true'>wrap:mvn:com.google.errorprone/error_prone_annotations/${error_prone_annotations_version}</bundle>
diff --git a/pom.xml b/pom.xml
index e1d6d0bf8de..573e997c66d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,6 +498,7 @@
 		<aries_spifly_version>1.0.10</aries_spifly_version>
 		<caffeine_version>2.6.2</caffeine_version>
 		<commons_codec_version>1.11</commons_codec_version>
+		<commons_text_version>1.4</commons_text_version>
 		<commons_io_version>2.6</commons_io_version>
 		<commons_lang3_version>3.8</commons_lang3_version>
 		<derby_version>10.14.2.0</derby_version>
@@ -843,7 +844,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-text</artifactId>
-				<version>1.4</version>
+				<version>${commons_text_version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.derby</groupId>