From 60cd37eca60e53f3f7e8614b55339dbe428a0b51 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.com>
Date: Thu, 10 Feb 2022 11:18:51 +1100
Subject: [PATCH] fix semver version for -tag tags

---
 .../main/java/org/hl7/fhir/utilities/VersionUtilities.java | 3 +++
 .../java/org/hl7/fhir/utilities/VersionUtilitiesTest.java  | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
index 80042df27..07bc9db92 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
@@ -231,6 +231,9 @@ public class VersionUtilities {
       return false;
     }
     String[] p = version.split("\\.");
+    if (p[2].contains("-")) {
+      p[2] = p[2].substring(0, p[2].indexOf("-"));
+    }
     return Utilities.isInteger(p[0]) && Utilities.isInteger(p[1]) && Utilities.isInteger(p[2]);
   }
 
diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/VersionUtilitiesTest.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/VersionUtilitiesTest.java
index 1e8b68694..2ed5cab5b 100644
--- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/VersionUtilitiesTest.java
+++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/VersionUtilitiesTest.java
@@ -6,6 +6,13 @@ import static org.junit.jupiter.api.Assertions.*;
 
 public class VersionUtilitiesTest {
 
+  @Test
+  public void isValidSemVer() {
+    assertTrue(VersionUtilities.isSemVer("0.1.1"));
+    assertTrue(VersionUtilities.isSemVer("0.1.1-ballot1"));
+    assertFalse(VersionUtilities.isSemVer("0.1.a"));
+  }
+
   @Test
   public void isThisOrLater_Simple() {
     assertTrue(VersionUtilities.isThisOrLater("0.1", "0.2"));