From cc983073cdc1dbdf032edfd43dc67f5830ecd6a7 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahamegrieve@Grahames-MacBook-Pro.local>
Date: Tue, 8 Mar 2022 13:19:19 +1100
Subject: [PATCH] more cross version extensions

---
 RELEASE_NOTES.md                                         | 9 ++++++++-
 .../java/org/hl7/fhir/r5/utils/XVerExtensionManager.java | 6 ------
 .../java/org/hl7/fhir/utilities/npm/CommonPackages.java  | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7b06c6ab5..c689c8032 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -4,4 +4,11 @@
 
 ## Other code changes
 
-* no changes
\ No newline at end of file
+* no changes
+
+more presenting extensions when rendering.
+4f652bc
+fix handling of xver extensions with choice sub-extensions
+
+ Get package id from 'package' field when 'npm-package' unavailable
+ 
\ No newline at end of file
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
index 7d27c4782..2b435782d 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
@@ -50,9 +50,6 @@ public class XVerExtensionManager {
       return XVerExtensionStatus.Invalid;
     }
     String v = url.substring(20, 23);
-    if ("5.0".equals(v)) {
-      v = "4.6"; // for now
-    }
     String e = url.substring(54);
     if (!lists.containsKey(v)) {
       if (context.getBinaries().containsKey("xver-paths-"+v+".json")) {
@@ -86,9 +83,6 @@ public class XVerExtensionManager {
 
   public StructureDefinition makeDefinition(String url) {
     String verSource = url.substring(20, 23);
-    if ("5.0".equals(verSource)) {
-      verSource = "4.6"; // for now
-    }
     String verTarget = VersionUtilities.getMajMin(context.getVersion());
     String e = url.substring(54);
     JsonObject root = lists.get(verSource);
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/CommonPackages.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/CommonPackages.java
index 284cabed8..6394384b3 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/CommonPackages.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/CommonPackages.java
@@ -3,7 +3,7 @@ package org.hl7.fhir.utilities.npm;
 public class CommonPackages {
 
   public static final String ID_XVER = "hl7.fhir.xver-extensions";
-  public static final String VER_XVER = "0.0.8";
+  public static final String VER_XVER = "0.0.9";
   
   public static final String ID_PUBPACK = "hl7.fhir.pubpack";
   public static final String VER_PUBPACK = "0.0.9";