From ad114097053b80c95779baf662029dbae03d70fc Mon Sep 17 00:00:00 2001
From: Eeva Turkka <ext-eeva.turkka@kela.fi>
Date: Fri, 2 Nov 2018 15:54:34 +0200
Subject: [PATCH] Unit tests up to date and maybe we need to use r4 path

---
 hapi-fhir-converter/pom.xml                   |  4 +--
 hapi-fhir-validation/pom.xml                  | 28 +++++++++----------
 .../fhir/r4/validation/InstanceValidator.java |  1 -
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml
index e0c5d0d491d..bd8155f2123 100644
--- a/hapi-fhir-converter/pom.xml
+++ b/hapi-fhir-converter/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>hapi-fhir-converter</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.5.1-PHRFIX-SNAPSHOT</version>
+	<version>3.6.1-PHRFIX-SNAPSHOT</version>
 
 	<dependencies>
 		<dependency>
@@ -85,7 +85,7 @@
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-client</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/hapi-fhir-validation/pom.xml b/hapi-fhir-validation/pom.xml
index 7cafb6169e0..14c494fa8f8 100644
--- a/hapi-fhir-validation/pom.xml
+++ b/hapi-fhir-validation/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>hapi-fhir-validation</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.5.1-PHRFIX-SNAPSHOT</version>
+	<version>3.6.1-PHRFIX-SNAPSHOT</version>
 
 	<name>HAPI FHIR - Validation</name>
 
@@ -19,17 +19,17 @@
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-base</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-utilities</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-converter</artifactId>
-			<version>3.5.1-PHRFIX-SNAPSHOT</version>
+			<version>3.6.1-PHRFIX-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -64,49 +64,49 @@
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu2</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu2.1</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-dstu3</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-r4</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-validation-resources-r4</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<optional>true</optional>
 		</dependency>
 		
@@ -119,13 +119,13 @@
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-server</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-client</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/InstanceValidator.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/InstanceValidator.java
index f6a60c1b5e0..269fac6d8f6 100644
--- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/InstanceValidator.java
+++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/InstanceValidator.java
@@ -203,7 +203,6 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
   
   private IEnableWhenEvaluator myEnableWhenEvaluator = new DefaultEnableWhenEvaluator();
 
-
   /*
    * Keeps track of whether a particular profile has been checked or not yet
    */