Merge pull request #960 from HL7/2024-09-gg-r6

Add support for building R6 IGs
HL7 · Sep 25, 2024 · b6f8aa3 · b6f8aa3
2 parents 45d1129 + d69b206
commit b6f8aa3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java b/org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/publisher/Publisher.java
@@ -2766,8 +2766,8 @@ private void initializeFromIg(IniFile ini) throws Exception {
     // ok, loaded. Now we start loading settings out of the IG
     tool = GenerationTool.Jekyll;
     version = processVersion(sourceIg.getFhirVersion().get(0).asStringValue()); // todo: support multiple versions
-    if (!Utilities.existsInList(version, "5.0.0", "4.3.0", "4.0.1", "3.0.2", "1.0.2", "1.4.0")) {
-      throw new Error("Unable to support version '"+version+"' - must be one of 5.0.0, 4.3.0, 4.0.1, 3.0.2, 1.0.2, or 1.4.0");
+    if (!Utilities.existsInList(version, "5.0.0", "4.3.0", "4.0.1", "3.0.2", "1.0.2", "1.4.0", "6.0.0-ballot2")) {
+      throw new Error("Unable to support version '"+version+"' - must be one of 5.0.0, 4.3.0, 4.0.1, 3.0.2, 1.0.2, 6.0.0-ballot2 or 1.4.0");
     }
 
     if (!VersionUtilities.isSupportedVersion(version)) {
@@ -3647,7 +3647,7 @@ private String getUTGPackageName() throws FHIRException, IOException {
     } else if (VersionUtilities.isR5Ver(version)) {
       vs = "hl7.terminology.r5";
     } else if (VersionUtilities.isR6Ver(version)) {
-      vs = "hl7.terminology.r6";
+      vs = "hl7.terminology.r5";
     }
     return vs;
   }

diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <core_version>6.3.27</core_version>
+        <core_version>6.3.28-SNAPSHOT</core_version>
         <maven_surefire_version>3.0.0-M5</maven_surefire_version>
         <apache_poi_version>5.2.1</apache_poi_version>
         <okhttp.version>4.11.0</okhttp.version>