From eac87fca9b1864bfcbd315bc5b25d1fdd1f24972 Mon Sep 17 00:00:00 2001
From: Michael Buckley <michael.buckley@smilecdr.com>
Date: Wed, 2 Feb 2022 10:35:41 -0500
Subject: [PATCH 1/2] bump Hapi PRE version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7731908..62cb823 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-		  <version>5.7.0-PRE8-SNAPSHOT</version>
+		  <version>5.7.0-PRE10-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>

From 56f43324fd816df95610c9ffb60b4cc2b52f1c0a Mon Sep 17 00:00:00 2001
From: Michael Buckley <michael.buckley@smilecdr.com>
Date: Thu, 3 Feb 2022 13:25:22 -0500
Subject: [PATCH 2/2] Bump to Hapi 6.0-SNAPSHOT and register the ValueSet
 provider.

---
 pom.xml                                                |  2 +-
 .../ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java  | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 62cb823..7a12c76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-		  <version>5.7.0-PRE10-SNAPSHOT</version>
+		  <version>6.0.0-PRE1-SNAPSHOT</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
index 36ef8ef..ca6a362 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
@@ -16,11 +16,7 @@ import ca.uhn.fhir.jpa.interceptor.CascadingDeleteInterceptor;
 import ca.uhn.fhir.jpa.packages.IPackageInstallerSvc;
 import ca.uhn.fhir.jpa.packages.PackageInstallationSpec;
 import ca.uhn.fhir.jpa.partition.PartitionManagementProvider;
-import ca.uhn.fhir.jpa.provider.IJpaSystemProvider;
-import ca.uhn.fhir.jpa.provider.JpaCapabilityStatementProvider;
-import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2;
-import ca.uhn.fhir.jpa.provider.SubscriptionTriggeringProvider;
-import ca.uhn.fhir.jpa.provider.TerminologyUploaderProvider;
+import ca.uhn.fhir.jpa.provider.*;
 import ca.uhn.fhir.jpa.provider.dstu3.JpaConformanceProviderDstu3;
 import ca.uhn.fhir.jpa.search.DatabaseBackedPagingProvider;
 import ca.uhn.fhir.jpa.subscription.util.SubscriptionDebugLogInterceptor;
@@ -78,6 +74,8 @@ public class BaseJpaRestfulServer extends RestfulServer {
   @Autowired
   IJpaSystemProvider jpaSystemProvider;
   @Autowired
+  ValueSetOperationProvider myValueSetOperationProvider;
+  @Autowired
   IInterceptorBroadcaster interceptorBroadcaster;
   @Autowired
   DatabaseBackedPagingProvider databaseBackedPagingProvider;
@@ -141,7 +139,7 @@ public class BaseJpaRestfulServer extends RestfulServer {
 
     registerProviders(resourceProviderFactory.createProviders());
     registerProvider(jpaSystemProvider);
-
+	 registerProvider(myValueSetOperationProvider);
     /*
      * The conformance provider exports the supported resources, search parameters, etc for
      * this server. The JPA version adds resourceProviders counts to the exported statement, so it