Update Validator Dependency (#41)

* update validation dependency * test CI with 5.3.14 validator dep * reorder tests * reorder and update * require Java 11 * update fhir validation dependency to latest version * Change JAVA_HOME to openjdk-11 * comment out line Co-authored-by: Jack Fraser <[email protected]> Co-authored-by: Yunwei Wang <[email protected]>
inferno-framework · Jan 7, 2022 · 915c7fb · 915c7fb
1 parent 4afb7a9
commit 915c7fb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8.x, 11.x, 16.x]
+        java: [16.x, 11.x]
 
     name: Java ${{ matrix.java }} Build
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-FROM openjdk:8 AS build
+FROM openjdk:11 AS build
 
-# RUN curl -ksSL https://gitlab.mitre.org/mitre-scripts/mitre-pki/raw/master/os_scripts/install_certs.sh | JAVA_HOME=/usr/local/openjdk-8 MODE=java sh
+# RUN curl -ksSL https://gitlab.mitre.org/mitre-scripts/mitre-pki/raw/master/os_scripts/install_certs.sh | JAVA_HOME=/usr/local/openjdk-11 MODE=java sh
 # If using under Zscalar, comment out the above and run using: 'docker build --no-cache -t hl7_validator .'
 
 WORKDIR /home
@@ -19,7 +19,7 @@ COPY src src
 RUN ./gradlew build
 RUN tar -xvf build/distributions/InfernoValidationService-*.tar
 
-FROM openjdk:8
+FROM openjdk:11
 WORKDIR /home
 ENV JAVA_OPTS="-XX:MaxRAMPercentage=75.0"
 

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ to other applications that integrate it.
 
 ## Installation
 
-**System Requirements:** The Validation Service requires Java 1.8 or above.
+**System Requirements:** The Validation Service requires Java 11 or above.
 
 ## Running Locally with Java
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
     // https://chat.fhir.org/#narrow/stream/179166-implementers/topic/New.20validator.20JAR.20location
     // the ig-publisher uses this one too
     // https://github.com/HL7/fhir-ig-publisher/blob/master/pom.xml#L68
-    implementation("ca.uhn.hapi.fhir", "org.hl7.fhir.validation", "5.3.14")
+    implementation("ca.uhn.hapi.fhir", "org.hl7.fhir.validation", "5.5.10")
 
     // validator dependencies (should be able to get these automatically?)
     implementation("org.apache.commons","commons-compress", "1.19")
@@ -38,8 +38,9 @@ dependencies {
     testImplementation("org.junit.jupiter", "junit-jupiter", "5.5.2")
 }
 
-configure<JavaPluginConvention> {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+java {
+    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_11
 }
 
 application {