Merge remote-tracking branch 'origin/master'

HL7 · Dec 10, 2024 · cb1a5f2 · cb1a5f2
2 parents aaf0150 + 8572e47
commit cb1a5f2
Show file tree

Hide file tree

Showing 8 changed files with 259 additions and 48 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,42 +0,0 @@
-* Loader: Fix problem not finding current version of extensions pack for non-R5 versions
-* Loader: New release of pubpack
-* Loader: extend CQLSubsystem to cover Measure, PlanDefinition, ActivityDefinition
-* Loader: fix missing union and intersection for CodeSystem and ValueSet comparisons
-* Loader: Work around flaw in R5 specmaps claiming to have paths for terminology URLs it does not
-* Loader:fix custom resources with profiles
-* Template Manager: Add the SDC template to the list of trusted templates
-* Terminology System: Fix missing username/password for tx server in IG publisher
-* Terminology System: Add support for valueset-version 
-* Snapshot Generator: Change rules around stripping extensions when generating snapshots
-* Snapshot Generator: Do not use metadata from data type profiles on elements when generating snapshots
-* Snapshot Generator: Fix version issues in snapshot generation tests
-* Validator: Add supplements for used systems as well as for value set systems when validating on server
-* Validator: Add versions to message about multiple matching profiles
-* Validator: fix issue missing idrefs validating IPS documents
-* Validator: fix missing port from server when doing tx-registry redirections
-* Validator: fix NPE in validator around Extension context
-* Validator: Fix obscure error on contentReference in profiles in FHIRPath engine
-* Validator: Fix questionnaire response status checking
-* Validator: Fix validation of displays when language is unknown
-* Validator: Fix version conversion issue for validating derived questionnaires
-* Validator: Handle secondary terminology server errors properly
-* Validator: Update FHIRPath validation to handle rootResource type properly
-* Version Comparison: Fix filter comparison logic when comparing valuesets
-* Version Comparison: Fix presentation issues and union and intersection links in previous version comparison
-* Test Subsystem: Add support for test-data-factory parameter
-* Renderer: Update logic for determining key elements to include elements where min, max, minValue, maxValue, bindings, etc. have changed from the base resource
-* Renderer: Add support for using Liquid on plain JSON directly and add support for markdownify filter
-* Renderer: fix bug using wrong reference on uri in liquid renderer
-* Renderer: Questionnaire rendering improvements
-* Renderer: Refactor Liquid engine and add support for forLoop and capture
-* Renderer: Add support for liquid based rendering of json files
-* Renderer: Defined new dependency table that shows all dependencies, while being less technical (and still making technical information available).
-* Renderer: Ensure details about the primary bindings appear after the primary binding, not after additional bindings
-* Renderer: Fix description of new content in difference analysis
-* Renderer: Improve OID error message 
-* Renderer: In key elements, don't just show MS types, show all of them
-* Log: hide API-Key from appearing on the tx log
-* Log: Ensure that if there's an issue with SQL or fragment expansion, at least something shows up in the log, even if debug is not on.
-* QA: fix presentation of tx server errors
-* QA: Improve qa output for sequence in publication checker
-* QA: Show code system fragments in QA summary for improved visiblity

diff --git a/org.hl7.fhir.publisher.cli/pom.xml b/org.hl7.fhir.publisher.cli/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>org.hl7.fhir.publisher</artifactId>
         <groupId>org.hl7.fhir.publisher</groupId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.8.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/org.hl7.fhir.publisher.core/pom.xml b/org.hl7.fhir.publisher.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.hl7.fhir.publisher</groupId>
         <artifactId>org.hl7.fhir.publisher</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>1.8.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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
@@ -13789,11 +13789,11 @@ public static void main(String[] args) throws Exception {
 
     org.hl7.fhir.utilities.FileFormat.checkCharsetAndWarnIfNotUTF8(System.out);
     NpmPackage.setLoadCustomResources(true);  
-    ManagedWebAccess.loadFromFHIRSettings();
-
     if (CliParams.hasNamedParam(args, FHIR_SETTINGS_PARAM)) {
       FhirSettings.setExplicitFilePath(CliParams.getNamedParam(args, FHIR_SETTINGS_PARAM));
     }
+    ManagedWebAccess.loadFromFHIRSettings();
+
 
     if (CliParams.hasNamedParam(args, "-gui")) {
       runGUI(args);

diff --git a/plot-ig-builder-auto.png b/plot-ig-builder-auto.png
diff --git a/pom.xml b/pom.xml
@@ -4,11 +4,11 @@
 
     <groupId>org.hl7.fhir.publisher</groupId>
     <artifactId>org.hl7.fhir.publisher</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <core_version>6.5.0-SNAPSHOT</core_version>
+        <core_version>6.5.0</core_version>
         <maven_surefire_version>3.0.0-M5</maven_surefire_version>
         <apache_poi_version>5.2.1</apache_poi_version>
         <lombok_version>1.18.32</lombok_version>

diff --git a/test-statistics.csv b/test-statistics.csv
@@ -37,3 +37,6 @@ Version,example.fhir.uv.myig,fhir.base.template.ig,hl7.base.template.ig,hl7.cda.
 1.7.0,67385,947,87,116042,276551,773,1291011,711790,615710,26255,93022,569245,570301,57877,215056
 1.7.2,85673,1922,93,118751,265472,1380,1681712,1072974,742736,33289,122122,753126,701645,79859,280102
 1.7.3,65779,879,80,114030,281590,594,1399770,767803,638217,24190,102435,634954,621179,60254,231856
+1.7.5,67001,980,88,119710,288530,792,1369704,789661,617755,23360,102908,24483026,616249,59304,231928
+1.7.6,,,,,,1335,,960706,,,140678,841458,,,
+1.8.0,96450,909,101,125337,924598,2516,1835676,1008860,664863,25501,122847,787419,744787,63131,263028
diff --git a/test-statistics.json b/test-statistics.json
@@ -4022,5 +4022,255 @@
       "time" : 638217,
       "memory" : 6997330912
     }
+  },
+  "1.7.5" : {
+    "sync-date" : "2024-06-30",
+    "date" : "2024-11-23",
+    "hl7.fhir.template.ig" : {
+      "errors" : 0,
+      "warnings" : 0,
+      "hints" : 0,
+      "time" : 792,
+      "memory" : 23205152
+    },
+    "hl7.cda.uv.core" : {
+      "errors" : 0,
+      "warnings" : 153,
+      "hints" : 1,
+      "time" : 119710,
+      "memory" : 3641686920
+    },
+    "hl7.fhir.us.ecr" : {
+      "errors" : 4608,
+      "warnings" : 373,
+      "hints" : 88,
+      "time" : 789661,
+      "memory" : 9665771192
+    },
+    "hl7.fhir.uv.ipa" : {
+      "errors" : 24,
+      "warnings" : 10,
+      "hints" : 39,
+      "time" : 102908,
+      "memory" : 1590809944
+    },
+    "hl7.fhir.uv.ips" : {
+      "errors" : 2,
+      "warnings" : 23,
+      "hints" : 45,
+      "time" : 24483026,
+      "memory" : 2453755416
+    },
+    "ihe.mhd.fhir" : {
+      "errors" : 0,
+      "warnings" : 2,
+      "hints" : 28,
+      "time" : 231928,
+      "memory" : 2954058640
+    },
+    "hl7.fhir.uv.sdc" : {
+      "errors" : 95,
+      "warnings" : 85,
+      "hints" : 412,
+      "time" : 616249,
+      "memory" : 1138581768
+    },
+    "hl7.fhir.uv.tools" : {
+      "errors" : 0,
+      "warnings" : 2,
+      "hints" : 0,
+      "time" : 59304,
+      "memory" : 2801522368
+    },
+    "hl7.base.template.ig" : {
+      "errors" : 0,
+      "warnings" : 0,
+      "hints" : 0,
+      "time" : 88,
+      "memory" : 8390656
+    },
+    "hl7.fhir.uv.howto" : {
+      "errors" : 2,
+      "warnings" : 2,
+      "hints" : 1,
+      "time" : 23360,
+      "memory" : 1216715776
+    },
+    "fhir.base.template.ig" : {
+      "errors" : 0,
+      "warnings" : 0,
+      "hints" : 0,
+      "time" : 980,
+      "memory" : 191066792
+    },
+    "hl7.fhir.au.base" : {
+      "errors" : 13,
+      "warnings" : 141,
+      "hints" : 77,
+      "time" : 288530,
+      "memory" : 5212751208
+    },
+    "example.fhir.uv.myig" : {
+      "errors" : 20,
+      "warnings" : 19,
+      "hints" : 7,
+      "time" : 67001,
+      "memory" : 2006536504
+    },
+    "hl7.fhir.us.core" : {
+      "errors" : 31,
+      "warnings" : 33,
+      "hints" : 58,
+      "time" : 1369704,
+      "memory" : 14431561568
+    },
+    "hl7.fhir.uv.extensions" : {
+      "errors" : 1079,
+      "warnings" : 706,
+      "hints" : 1612,
+      "time" : 617755,
+      "memory" : 8565397840
+    }
+  },
+  "1.7.6" : {
+    "sync-date" : "2024-06-30",
+    "date" : "2024-12-08",
+    "hl7.fhir.template.ig" : {
+      "errors" : 0,
+      "warnings" : 0,
+      "hints" : 0,
+      "time" : 1335,
+      "memory" : 20429808
+    },
+    "hl7.fhir.us.ecr" : {
+      "errors" : 4608,
+      "warnings" : 373,
+      "hints" : 88,
+      "time" : 960706,
+      "memory" : 12104267568
+    },
+    "hl7.fhir.uv.ipa" : {
+      "errors" : 24,
+      "warnings" : 9,
+      "hints" : 39,
+      "time" : 140678,
+      "memory" : 2302767472
+    },
+    "hl7.fhir.uv.ips" : {
+      "errors" : 1,
+      "warnings" : 21,
+      "hints" : 37,
+      "time" : 841458,
+      "memory" : 2235403304
+    }
+  },
+  "1.8.0" : {
+    "sync-date" : "2024-06-30",
+    "date" : "2024-12-10",
+    "ihe.mhd.fhir" : {
+      "errors" : 0,
+      "warnings" : 2,
+      "hints" : 28,
+      "time" : 263028,
+      "memory" : 2439734192
+    },
+    "hl7.fhir.uv.sdc" : {
+      "errors" : 47,
+      "warnings" : 85,
+      "hints" : 412,
+      "time" : 744787,
+      "memory" : 1514152080
+    },
+    "hl7.fhir.uv.tools" : {
+      "errors" : 0,
+      "warnings" : 2,
+      "hints" : 0,
+      "time" : 63131,
+      "memory" : 4377553984
+    },
+    "hl7.base.template.ig" : {
+      "errors" : 0,
+      "warnings" : 0,
+      "hints" : 0,
+      "time" : 101,
+      "memory" : 8390632
+    },
+    "hl7.fhir.uv.howto" : {
+      "errors" : 2,
+      "warnings" : 2,
+      "hints" : 1,
+      "time" : 25501,
+      "memory" : 1074068296
+    },
+    "fhir.base.template.ig" : {
+      "errors" : 0,
+      "warnings" : 0,
+      "hints" : 0,
+      "time" : 909,
+      "memory" : 188413136
+    },
+    "hl7.fhir.au.base" : {
+      "errors" : 13,
+      "warnings" : 141,
+      "hints" : 77,
+      "time" : 924598,
+      "memory" : 3282842912
+    },
+    "example.fhir.uv.myig" : {
+      "errors" : 20,
+      "warnings" : 19,
+      "hints" : 7,
+      "time" : 96450,
+      "memory" : 2004193160
+    },
+    "hl7.fhir.us.core" : {
+      "errors" : 31,
+      "warnings" : 33,
+      "hints" : 58,
+      "time" : 1835676,
+      "memory" : 14457039184
+    },
+    "hl7.fhir.uv.extensions" : {
+      "errors" : 1079,
+      "warnings" : 706,
+      "hints" : 1612,
+      "time" : 664863,
+      "memory" : 5461767000
+    },
+    "hl7.fhir.template.ig" : {
+      "errors" : 0,
+      "warnings" : 0,
+      "hints" : 0,
+      "time" : 2516,
+      "memory" : 21175936
+    },
+    "hl7.cda.uv.core" : {
+      "errors" : 0,
+      "warnings" : 148,
+      "hints" : 0,
+      "time" : 125337,
+      "memory" : 2953852320
+    },
+    "hl7.fhir.us.ecr" : {
+      "errors" : 4608,
+      "warnings" : 373,
+      "hints" : 88,
+      "time" : 1008860,
+      "memory" : 11705787864
+    },
+    "hl7.fhir.uv.ipa" : {
+      "errors" : 24,
+      "warnings" : 9,
+      "hints" : 39,
+      "time" : 122847,
+      "memory" : 1798314944
+    },
+    "hl7.fhir.uv.ips" : {
+      "errors" : 1,
+      "warnings" : 21,
+      "hints" : 37,
+      "time" : 787419,
+      "memory" : 1700742608
+    }
   }
 }