diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 497f3fbf3..46a0e46a0 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -97,7 +97,6 @@ org.projectlombok lombok - ${lombok_version} provided diff --git a/org.hl7.fhir.r4b/.classpath b/org.hl7.fhir.r4b/.classpath deleted file mode 100644 index e1ba6ba73..000000000 --- a/org.hl7.fhir.r4b/.classpath +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.hl7.fhir.r4b/.project b/org.hl7.fhir.r4b/.project deleted file mode 100644 index 67817e718..000000000 --- a/org.hl7.fhir.r4b/.project +++ /dev/null @@ -1,35 +0,0 @@ - - - org.hl7.fhir.r4b - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - - - 1668080803768 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - - diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index bf58f6176..bf70f505f 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -70,13 +70,11 @@ com.squareup.okhttp3 logging-interceptor - ${okhttp.version} true com.squareup.okhttp3 mockwebserver - ${okhttp.version} true test diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 79b52670d..7e68f0ca0 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -112,14 +112,12 @@ com.squareup.okhttp3 logging-interceptor - ${okhttp.version} true org.projectlombok lombok - ${lombok_version} provided diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/BaseWorkerContextTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/BaseWorkerContextTests.java index f49ae01e1..7a375de93 100644 --- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/BaseWorkerContextTests.java +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/context/BaseWorkerContextTests.java @@ -32,6 +32,11 @@ public class BaseWorkerContextTests { return null; } + @Override + public T fetchResourceRaw(Class class_, String uri) { + return null; + } + @Override public void cachePackage(PackageInformation packageInfo) { diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 2eb490872..d83e25bc7 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -53,7 +53,6 @@ org.jacoco jacoco-maven-plugin - ${jacoco_version} report-aggregate diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 95a7f022b..5b78e99ec 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -55,7 +55,6 @@ org.projectlombok lombok - ${lombok_version} provided @@ -105,7 +104,6 @@ net.bytebuddy byte-buddy - ${byte_buddy_version} provided diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index a8e47b15b..d12caa026 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -33,7 +33,6 @@ net.bytebuddy byte-buddy - ${byte_buddy_version} compile @@ -60,7 +59,6 @@ org.junit.platform junit-platform-launcher - ${junit_platform_launcher_version} compile @@ -232,7 +230,6 @@ com.squareup.okhttp3 mockwebserver - ${okhttp.version} false compile diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index fad93d118..67912e041 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -177,7 +177,6 @@ org.projectlombok lombok - ${lombok_version} provided @@ -222,7 +221,6 @@ com.google.guava guava - 31.0.1-jre @@ -259,7 +257,6 @@ org.junit.platform junit-platform-launcher - ${junit_platform_launcher_version} provided @@ -282,7 +279,7 @@ maven-surefire-plugin - ${maven_surefire_version} + default-test diff --git a/pom.xml b/pom.xml index 2e9dc5843..95e073fe1 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ pom + 32.0.1-jre 6.4.1 1.3.10-SNAPSHOT 2.14.0 @@ -93,7 +94,6 @@ net.sf.saxon Saxon-HE - ${saxon_he_version} @@ -209,6 +209,29 @@ annotations 16.0.1 + + + com.squareup.okhttp3 + logging-interceptor + ${okhttp.version} + + + com.squareup.okhttp3 + mockwebserver + ${okhttp.version} + + + + com.google.guava + guava + ${guava_version} + + + + org.projectlombok + lombok + ${lombok_version} +