From cda84c4b3a37fbde6ba7fb90384002372a86c48b Mon Sep 17 00:00:00 2001
From: jpoth <poth.john@gmail.com>
Date: Fri, 14 Dec 2018 17:11:28 +0100
Subject: [PATCH] Karaf related fixes for jdk11

---
 osgi/hapi-fhir-karaf-features/pom.xml         | 22 +++++++++++--------
 .../hapi-fhir-karaf-integration-tests/pom.xml |  2 +-
 .../karaf/dstu3/Dstu3XmlParserTest.java       |  5 +++--
 pom.xml                                       |  8 +++----
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/osgi/hapi-fhir-karaf-features/pom.xml b/osgi/hapi-fhir-karaf-features/pom.xml
index 79738f6f4a8..9aa3455e4d4 100644
--- a/osgi/hapi-fhir-karaf-features/pom.xml
+++ b/osgi/hapi-fhir-karaf-features/pom.xml
@@ -17,8 +17,12 @@
 
 	<properties>
 		<features.file>features.xml</features.file>
-		<pax-logging-version>1.8.6</pax-logging-version>
-		<felix-framework-version>3.2.2</felix-framework-version>
+		<pax_logging_version>1.10.1</pax_logging_version>
+		<felix_framework_version>3.2.2</felix_framework_version>
+		<osgi_version>6.0.0</osgi_version>
+		<configadmin_version>1.9.10</configadmin_version>
+		<aries_blueprint_api_version>1.0.1</aries_blueprint_api_version>
+		<aries_blueprint_core_version>1.10.1</aries_blueprint_core_version>
 	</properties>
 
 	<dependencies>
@@ -87,43 +91,43 @@
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.core</artifactId>
-			<version>4.3.1</version>
+			<version>${osgi_version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-api</artifactId>
-			<version>${pax-logging-version}</version>
+			<version>${pax_logging_version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-service</artifactId>
-			<version>${pax-logging-version}</version>
+			<version>${pax_logging_version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.framework</artifactId>
-			<version>${felix-framework-version}</version>
+			<version>${felix_framework_version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.configadmin</artifactId>
-			<version>1.8.8</version>
+			<version>${configadmin_version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.aries.blueprint</groupId>
 			<artifactId>org.apache.aries.blueprint.api</artifactId>
-			<version>1.0.1</version>
+			<version>${aries_blueprint_api_version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.aries.blueprint</groupId>
 			<artifactId>org.apache.aries.blueprint.core</artifactId>
-			<version>1.0.1</version>
+			<version>${aries_blueprint_core_version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/osgi/hapi-fhir-karaf-integration-tests/pom.xml b/osgi/hapi-fhir-karaf-integration-tests/pom.xml
index 3e63459153c..3a06288d1f8 100644
--- a/osgi/hapi-fhir-karaf-integration-tests/pom.xml
+++ b/osgi/hapi-fhir-karaf-integration-tests/pom.xml
@@ -33,7 +33,7 @@
    </description>
 
    <properties>
-		<pax.exam.version>4.12.0</pax.exam.version>
+		<pax.exam.version>4.13.1</pax.exam.version>
    </properties>
 
    <dependencies>
diff --git a/osgi/hapi-fhir-karaf-integration-tests/src/test/java/ca/uhn/fhir/tests/integration/karaf/dstu3/Dstu3XmlParserTest.java b/osgi/hapi-fhir-karaf-integration-tests/src/test/java/ca/uhn/fhir/tests/integration/karaf/dstu3/Dstu3XmlParserTest.java
index 0f1e15c2108..272f1eb8858 100644
--- a/osgi/hapi-fhir-karaf-integration-tests/src/test/java/ca/uhn/fhir/tests/integration/karaf/dstu3/Dstu3XmlParserTest.java
+++ b/osgi/hapi-fhir-karaf-integration-tests/src/test/java/ca/uhn/fhir/tests/integration/karaf/dstu3/Dstu3XmlParserTest.java
@@ -74,6 +74,7 @@ import org.hl7.fhir.dstu3.model.SimpleQuantity;
 import org.hl7.fhir.dstu3.model.StringType;
 import org.hl7.fhir.dstu3.model.UriType;
 import org.hl7.fhir.dstu3.model.ValueSet;
+import org.hl7.fhir.exceptions.FHIRFormatError;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.junit.Assert;
@@ -3196,8 +3197,8 @@ public class Dstu3XmlParserTest {
 		try {
 			ourCtx.newXmlParser().parseResource(Patient.class, input);
 			fail();
-		} catch (DataFormatException e) {
-			assertThat(e.toString(), containsString("Undeclared general entity"));
+		} catch (FHIRFormatError e) {
+			assertThat(e.toString(), containsString("unable to parse character reference "));
 		}
 
 	}
diff --git a/pom.xml b/pom.xml
index 6f1169a74f7..5feaac0036f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -503,13 +503,13 @@
 
 		<!-- Dependency Versions -->
 		<activation_api_version>1.2.0</activation_api_version>
-		<apache_karaf_version>4.1.6</apache_karaf_version>
-		<aries_spifly_version>1.0.10</aries_spifly_version>
+		<apache_karaf_version>4.2.2-SNAPSHOT</apache_karaf_version>
+		<aries_spifly_version>1.2</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_text_version>1.6</commons_text_version>
 		<commons_io_version>2.6</commons_io_version>
-		<commons_lang3_version>3.8</commons_lang3_version>
+		<commons_lang3_version>3.8.1</commons_lang3_version>
 		<derby_version>10.14.2.0</derby_version>
 		<error_prone_annotations_version>2.0.18</error_prone_annotations_version>
 		<guava_version>25.0-jre</guava_version>