update dependency

HL7 · Aug 8, 2023 · 1de2764 · 1de2764
1 parent bb93907
commit 1de2764
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 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
@@ -2906,7 +2906,7 @@ else if (vsCache == null) {
  }
 
  if (!VersionUtilities.isR5Plus(context.getVersion())) {
- System.out.print("Load R5 Specials");
+ System.out.println("Load R5 Specials");
  R5ExtensionsLoader r5e = new R5ExtensionsLoader(pcm, context);
  r5e.load();
  r5e.loadR5SpecialTypes(SpecialTypeHandler.specialTypes(context.getVersion()));
@@ -3993,7 +3993,6 @@ private void loadIGPackage(String name, String canonical, String packageId, Stri
  loadFromPackage(name, canonical, pi, webref, igm, loadDeps);
  }
 
-
  private boolean isValidIGToken(String tail) {
  if (tail == null || tail.length() == 0)
  return false;
@@ -4002,7 +4001,6 @@ private boolean isValidIGToken(String tail) {
  result = result && (Utilities.isAlphabetic(tail.charAt(i)) || Utilities.isDigit(tail.charAt(i)) || (tail.charAt(i) == '_'));
  }
  return result;
-
  }
 
  private String idForDep(ImplementationGuideDependsOnComponent dep) {
@@ -7428,6 +7426,17 @@ private Element convertToElement(FetchedResource r, Resource res) throws Excepti
  parseVersion = str(r.getConfig(), "version", version);
  }
  }
+ XhtmlNode xhtml = null;
+ if (res instanceof DomainResource) {
+ xhtml = ((DomainResource) res).getText().getDiv();
+ if (xhtml != null) {
+ if (xhtml.isEmpty()) {
+ xhtml = null;
+ } else {
+ ((DomainResource) res).getText().setDiv(new XhtmlParser().parseFragment("<div xmlns=\"http://www.w3.org/1999/xhtml\">Placeholder</div>"));
+ }
+ }
+ }
  ByteArrayOutputStream bs = new ByteArrayOutputStream();
  if (VersionUtilities.isR3Ver(parseVersion)) {
  org.hl7.fhir.dstu3.formats.JsonParser jp = new org.hl7.fhir.dstu3.formats.JsonParser();
@@ -7449,7 +7458,11 @@ private Element convertToElement(FetchedResource r, Resource res) throws Excepti
  jp.compose(bs, res);
  }
  ByteArrayInputStream bi = new ByteArrayInputStream(bs.toByteArray());
- return new org.hl7.fhir.r5.elementmodel.JsonParser(context).parseSingle(bi);
+ Element e = new org.hl7.fhir.r5.elementmodel.JsonParser(context).parseSingle(bi);
+ if (xhtml != null) {
+ e.getNamedChild("text").getNamedChild("div").setXhtml(xhtml);
+ }
+ return e;
  }
 
  private Resource convertFromElement(Element res) throws IOException, org.hl7.fhir.exceptions.FHIRException, FHIRFormatError, DefinitionException {

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
  <version>1.3.29-SNAPSHOT</version> <!-- See the note above -->
 
  <properties>
- <core_version>6.0.25-SNAPSHOT</core_version>
+ <core_version>6.0.26-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.10.0</okhttp.version>