From 35a827eac38026d27c0cbe7600f283822de013e5 Mon Sep 17 00:00:00 2001
From: jamesagnew <jamesagnew@gmail.com>
Date: Wed, 30 May 2018 08:54:16 -0400
Subject: [PATCH] Support for JDK10 working now

---
 .travis.yml                             |  2 +-
 hapi-fhir-cli/hapi-fhir-cli-api/pom.xml | 22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9bc7cd8dc9..27529dc77a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ sudo: required
 
 language: java
 jdk:
-  - oraclejdk8
+  - oraclejdk9
 env:
   global:
     - MAVEN_OPTS="-Xmx1024m"
diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
index 659791daaaf..09bf0259062 100644
--- a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
+++ b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
@@ -166,13 +166,22 @@
 			<artifactId>thymeleaf-spring4</artifactId>
 		</dependency>
 
+		<!-- Dependencies for Schematron -->
 		<dependency>
 			<groupId>com.helger</groupId>
 			<artifactId>ph-schematron</artifactId>
 			<exclusions>
 				<exclusion>
-					<artifactId>Saxon-HE</artifactId>
-					<groupId>net.sf.saxon</groupId>
+					<groupId>org.glassfish.jaxb</groupId>
+					<artifactId>jaxb-runtime</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.glassfish.jaxb</groupId>
+					<artifactId>jaxb-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.istack</groupId>
+					<artifactId>istack-commons-runtime</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
@@ -180,11 +189,10 @@
 			<groupId>com.helger</groupId>
 			<artifactId>ph-commons</artifactId>
 		</dependency>
-
-		<!--
-		These have been added as explicit dependencies
-SearchDstu2Test		as JDK9 no longer includes them by default
-		-->
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>javax.activation-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>