From 0b65fdc1d97f2b7f70d0d2e4cf333e566654fbee Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.ccom>
Date: Tue, 24 Sep 2024 20:47:39 -0400
Subject: [PATCH] No use cache-id on the tx server

---
 gradle.properties                                             | 2 +-
 src/main/java/org/hl7/fhir/tools/publisher/PageProcessor.java | 2 ++
 src/main/java/org/hl7/fhir/tools/publisher/Publisher.java     | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 917cbb3..9e547fc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-fhirCoreVersion = 6.3.27
+fhirCoreVersion = 6.3.28-SNAPSHOT
 apachePoiVersion = 5.2.1
 jacksonVersion = 2.16.0
 apacheHttpcomponentsVersion = 4.5.13
diff --git a/src/main/java/org/hl7/fhir/tools/publisher/PageProcessor.java b/src/main/java/org/hl7/fhir/tools/publisher/PageProcessor.java
index 2e11508..ce66b8b 100644
--- a/src/main/java/org/hl7/fhir/tools/publisher/PageProcessor.java
+++ b/src/main/java/org/hl7/fhir/tools/publisher/PageProcessor.java
@@ -136,6 +136,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 import org.hl7.fhir.r5.conformance.profile.ProfileUtilities;
 import org.hl7.fhir.r5.context.CanonicalResourceManager;
 import org.hl7.fhir.r5.context.ILoggingService;
+import org.hl7.fhir.r5.context.TextClientLogger;
 import org.hl7.fhir.r5.elementmodel.Element;
 import org.hl7.fhir.r5.elementmodel.Manager;
 import org.hl7.fhir.r5.elementmodel.Manager.FhirFormat;
@@ -10434,6 +10435,7 @@ public void setDefinitions(Definitions definitions) throws Exception {
     ITerminologyClient client;
     try {
       client = new TerminologyClientR5("tx.fhir.org", tsServer, "fhir/main-build");
+//      client.setLogger(new TextClientLogger(Utilities.path("[tmp]", "tx-main-build.log")));
       client.setTimeoutFactor(2);
     } catch(Exception e) {
       System.out.println("Warning @ PageProcessor client initialize: " + e.getLocalizedMessage());
diff --git a/src/main/java/org/hl7/fhir/tools/publisher/Publisher.java b/src/main/java/org/hl7/fhir/tools/publisher/Publisher.java
index 0076743..a488b93 100644
--- a/src/main/java/org/hl7/fhir/tools/publisher/Publisher.java
+++ b/src/main/java/org/hl7/fhir/tools/publisher/Publisher.java
@@ -240,6 +240,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 import org.hl7.fhir.r5.renderers.utils.ResourceWrapper;
 import org.hl7.fhir.r5.terminologies.CodeSystemUtilities;
 import org.hl7.fhir.r5.terminologies.ValueSetUtilities;
+import org.hl7.fhir.r5.terminologies.client.TerminologyClientContext;
 import org.hl7.fhir.r5.terminologies.expansion.ValueSetExpansionOutcome;
 import org.hl7.fhir.r5.utils.BuildExtensions;
 import org.hl7.fhir.r5.utils.CanonicalResourceUtilities;
@@ -675,6 +676,7 @@ private static String nowAsDate(Calendar cal) {
    * @throws IOException 
    */
   public void execute(String folder, String[] args) throws IOException {
+    TerminologyClientContext.setCanUseCacheId(false);
     tester = new PublisherTestSuites();
     sdm = new SDUsageMapper();