From 195dcc08988ae6615ce263f7c3313eca28ffc7e7 Mon Sep 17 00:00:00 2001
From: dotasek <dotasek.dev@gmail.com>
Date: Mon, 19 Jun 2023 10:51:10 -0400
Subject: [PATCH 1/3] Fix unimplemented method in test (#1312)

---
 .../org/hl7/fhir/r5/context/BaseWorkerContextTests.java     | 6 ++++++
 1 file changed, 6 insertions(+)

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 e32537104..32ece4cc2 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
@@ -3,6 +3,7 @@ package org.hl7.fhir.r5.context;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.r5.model.PackageInformation;
 import org.hl7.fhir.r5.model.Parameters;
+import org.hl7.fhir.r5.model.Resource;
 import org.hl7.fhir.r5.model.ValueSet;
 import org.hl7.fhir.r5.utils.validation.IResourceValidator;
 import org.hl7.fhir.utilities.npm.BasePackageCacheManager;
@@ -31,6 +32,11 @@ public class BaseWorkerContextTests {
         return null;
       }
 
+      @Override
+      public <T extends Resource> T fetchResourceRaw(Class<T> class_, String uri) {
+        return null;
+      }
+
       @Override
       public void cachePackage(PackageInformation packageInfo) {
 

From 829882773aceef9864e0cc8582d2d573f9777320 Mon Sep 17 00:00:00 2001
From: dotasek <dotasek.dev@gmail.com>
Date: Mon, 19 Jun 2023 12:26:21 -0400
Subject: [PATCH 2/3] More use of dependencyManagement, bump guava (#1313)

---
 org.hl7.fhir.convertors/pom.xml     |  1 -
 org.hl7.fhir.r4b/pom.xml            |  2 --
 org.hl7.fhir.r5/pom.xml             |  2 --
 org.hl7.fhir.report/pom.xml         |  1 -
 org.hl7.fhir.utilities/pom.xml      |  2 --
 org.hl7.fhir.validation.cli/pom.xml |  3 ---
 org.hl7.fhir.validation/pom.xml     |  5 +----
 pom.xml                             | 25 ++++++++++++++++++++++++-
 8 files changed, 25 insertions(+), 16 deletions(-)

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 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok_version}</version>
             <scope>provided</scope>
         </dependency>
 
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 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>logging-interceptor</artifactId>
-			<version>${okhttp.version}</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>mockwebserver</artifactId>
-			<version>${okhttp.version}</version>
 			<optional>true</optional>
 			<scope>test</scope>
 		</dependency>
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 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>logging-interceptor</artifactId>
-			<version>${okhttp.version}</version>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>${lombok_version}</version>
 			<scope>provided</scope>
 		</dependency>
 
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 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco_version}</version>
                 <executions>
                     <execution>
                         <id>report-aggregate</id>
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 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok_version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -105,7 +104,6 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>${byte_buddy_version}</version>
             <scope>provided</scope>
         </dependency>
 
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 @@
         <dependency>
             <groupId>net.bytebuddy</groupId>
             <artifactId>byte-buddy</artifactId>
-            <version>${byte_buddy_version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -60,7 +59,6 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-            <version>${junit_platform_launcher_version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -232,7 +230,6 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>${okhttp.version}</version>
             <optional>false</optional>
             <scope>compile</scope>
         </dependency>
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 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>${lombok_version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -222,7 +221,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
         </dependency>
         <!-- JUnit Jupiter -->
         <dependency>
@@ -259,7 +257,6 @@
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-launcher</artifactId>
-            <version>${junit_platform_launcher_version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -282,7 +279,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven_surefire_version}</version>
+
                 <executions>
                 <execution>
                 <id>default-test</id>
diff --git a/pom.xml b/pom.xml
index 2e9dc5843..95e073fe1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,6 +18,7 @@
     <packaging>pom</packaging>
 
     <properties>
+        <guava_version>32.0.1-jre</guava_version>
         <hapi_fhir_version>6.4.1</hapi_fhir_version>
         <validator_test_case_version>1.3.10-SNAPSHOT</validator_test_case_version>
         <jackson_version>2.14.0</jackson_version>
@@ -93,7 +94,6 @@
         <dependency>
             <groupId>net.sf.saxon</groupId>
             <artifactId>Saxon-HE</artifactId>
-            <version>${saxon_he_version}</version>
         </dependency>
     </dependencies>
 
@@ -209,6 +209,29 @@
                 <artifactId>annotations</artifactId>
                 <version>16.0.1</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>logging-interceptor</artifactId>
+                <version>${okhttp.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>mockwebserver</artifactId>
+                <version>${okhttp.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava_version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok_version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

From 84bd1e5fec9838fa06ecf69ea3a7cbc95195c6d2 Mon Sep 17 00:00:00 2001
From: dotasek <dotasek.dev@gmail.com>
Date: Mon, 19 Jun 2023 14:26:37 -0400
Subject: [PATCH 3/3] Remove eclipse specific files (#1314)

---
 org.hl7.fhir.r4b/.classpath | 33 ---------------------------------
 org.hl7.fhir.r4b/.project   | 35 -----------------------------------
 2 files changed, 68 deletions(-)
 delete mode 100644 org.hl7.fhir.r4b/.classpath
 delete mode 100644 org.hl7.fhir.r4b/.project

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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="test" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.hl7.fhir.r4b</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1668080803768</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>