diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml
index 6d664dfbc..b97282d1e 100644
--- a/org.hl7.fhir.r4b/pom.xml
+++ b/org.hl7.fhir.r4b/pom.xml
@@ -149,12 +149,12 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.commonmark</groupId>
+			<groupId>com.atlassian.commonmark</groupId>
 			<artifactId>commonmark</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.commonmark</groupId>
+			<groupId>com.atlassian.commonmark</groupId>
 			<artifactId>commonmark-ext-gfm-tables</artifactId>
 			<scope>test</scope>
 		</dependency>
diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml
index a43c53765..9100f759a 100644
--- a/org.hl7.fhir.r5/pom.xml
+++ b/org.hl7.fhir.r5/pom.xml
@@ -145,12 +145,12 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.commonmark</groupId>
+			<groupId>com.atlassian.commonmark</groupId>
 			<artifactId>commonmark</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.commonmark</groupId>
+			<groupId>com.atlassian.commonmark</groupId>
 			<artifactId>commonmark-ext-gfm-tables</artifactId>
 			<scope>test</scope>
 		</dependency>
diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml
index 01e966110..8c83a8ca2 100644
--- a/org.hl7.fhir.utilities/pom.xml
+++ b/org.hl7.fhir.utilities/pom.xml
@@ -31,12 +31,12 @@
 
         <!-- Markdown Utilities -->
         <dependency>
-            <groupId>org.commonmark</groupId>
+            <groupId>com.atlassian.commonmark</groupId>
             <artifactId>commonmark</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.commonmark</groupId>
+            <groupId>com.atlassian.commonmark</groupId>
             <artifactId>commonmark-ext-gfm-tables</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml
index 1dd4ce376..698baada0 100644
--- a/org.hl7.fhir.validation.cli/pom.xml
+++ b/org.hl7.fhir.validation.cli/pom.xml
@@ -189,12 +189,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.commonmark</groupId>
+            <groupId>com.atlassian.commonmark</groupId>
             <artifactId>commonmark</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.commonmark</groupId>
+            <groupId>com.atlassian.commonmark</groupId>
             <artifactId>commonmark-ext-gfm-tables</artifactId>
             <scope>compile</scope>
         </dependency>
@@ -296,6 +296,10 @@
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
       </dependency>
+        <dependency>
+            <groupId>com.atlassian.commonmark</groupId>
+            <artifactId>commonmark</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -318,7 +322,7 @@
                             <outputDirectory>${project.build.directory}/classes</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
-                            <!--<excludeScope>test</excludeScope>-->
+                            <excludeScope>test</excludeScope>
                             <includeScope>compile</includeScope>
                         </configuration>
                     </execution>
diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml
index 3288f3211..66cf301d9 100644
--- a/org.hl7.fhir.validation/pom.xml
+++ b/org.hl7.fhir.validation/pom.xml
@@ -185,13 +185,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.commonmark</groupId>
+            <groupId>com.atlassian.commonmark</groupId>
             <artifactId>commonmark</artifactId>
             <optional>true</optional>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.commonmark</groupId>
+            <groupId>com.atlassian.commonmark</groupId>
             <artifactId>commonmark-ext-gfm-tables</artifactId>
             <optional>true</optional>
             <scope>test</scope>
diff --git a/pom.xml b/pom.xml
index f4175df59..29d2e9e6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,14 +126,14 @@
                 <version>${hapi_fhir_version}</version>
             </dependency>
             <dependency>
-                <groupId>org.commonmark</groupId>
+                <groupId>com.atlassian.commonmark</groupId>
                 <artifactId>commonmark</artifactId>
-                <version>0.21.0</version>
+                <version>0.17.0</version>
             </dependency>
             <dependency>
-                <groupId>org.commonmark</groupId>
+                <groupId>com.atlassian.commonmark</groupId>
                 <artifactId>commonmark-ext-gfm-tables</artifactId>
-                <version>0.21.0</version>
+                <version>0.17.0</version>
             </dependency>
             <dependency>
                 <groupId>com.github.rjeschke</groupId>
@@ -303,11 +303,6 @@
     <build>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.6.1</version>
-                </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>