diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 4f75e9488..d40fc98c3 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -5,9 +5,4 @@ ## Other code changes -* Inclusion of SAXON dependency for processing XSLT -* Error message spacing correction -* Basic FTPClient implementation -* test NPE in markdown processing -* go-publish support -* Start implementing loading structure maps with validation +* no changes \ No newline at end of file diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 7c6f11b97..59f30ac1c 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index e5a82314d..93397533f 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 844c8e5bd..7230e510b 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index cfcce5413..63b57a441 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 7dbe943e5..3251064b2 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml @@ -70,7 +70,12 @@ 4.9.0 true - + + org.hl7.fhir.testcases + fhir-test-cases + ${validator_test_case_version} + test + org.apache.poi diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index de154fd07..d6de72b2f 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 0ab0c74a6..6b9498019 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 951c4ad93..7ad5ad974 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 31511e513..937dca2c9 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml @@ -89,7 +89,7 @@ commons-net commons-net - 3.6 + 3.9.0 diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/FTPClientTest.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/FTPClientTest.java index a8bba306b..37d985343 100644 --- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/FTPClientTest.java +++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/FTPClientTest.java @@ -4,10 +4,7 @@ package org.hl7.fhir.utilities; import org.apache.commons.io.IOUtils; import org.hl7.fhir.utilities.tests.ResourceLoaderTests; import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; +import org.junit.jupiter.api.*; import org.mockftpserver.fake.FakeFtpServer; import org.mockftpserver.fake.UserAccount; import org.mockftpserver.fake.filesystem.*; @@ -53,7 +50,7 @@ public class FTPClientTest implements ResourceLoaderTests { String dummyFileContent; - @BeforeAll + @BeforeEach public void setup() throws IOException { setupDummyFileToUpload(); setupFakeFtpDirectory(); @@ -106,7 +103,7 @@ public class FTPClientTest implements ResourceLoaderTests { dummyUploadedFilePath = relativePath2.resolve(DUMMY_FILE_TO_UPLOAD); } - @AfterAll + @AfterEach public void tearDownFakeFtpServer() { fakeFtpServer.stop(); } @@ -140,6 +137,7 @@ public class FTPClientTest implements ResourceLoaderTests { client.delete( RELATIVE_PATH_2 + "/" + DUMMY_FILE_TO_DELETE); assertFalse(fakeFtpServer.getFileSystem().exists(deleteFilePath)); + client.disconnect(); } @NotNull diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 16786422b..526679a02 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index f5b0312e2..e7d622f9c 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 79ccf4707..b0a93aba0 100644 --- a/pom.xml +++ b/pom.xml @@ -14,12 +14,12 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.90-SNAPSHOT + 5.6.91-SNAPSHOT pom 6.2.1 - 1.2.7-SNAPSHOT + 1.2.7 5.7.1 1.8.2 3.0.0-M5