From 17f66fd1a092bf951eaba2c661f402a0573750d7 Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Fri, 1 May 2020 14:15:42 -0400
Subject: [PATCH 01/25] Set up CI with Azure Pipelines

[skip ci]
---
 azure-pipelines.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 000000000..aa912913d
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,19 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- master
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+steps:
+- script: echo Hello, world!
+  displayName: 'Run a one-line script'
+
+- script: |
+    echo Add other tasks to build, test, and deploy your project.
+    echo See https://aka.ms/yaml
+  displayName: 'Run a multi-line script'

From 7a8f84fc6c3fe964757df2d4c47c71b1c8d19d88 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Sat, 2 May 2020 10:00:03 -0400
Subject: [PATCH 02/25] cleaning up port addresses for gui tests

---
 azure-pipelines.yml                           | 70 +++++++++++++++----
 .../fhir/utilities/tests/XhtmlNodeTest.java   | 21 +++---
 .../hl7/fhir/validation/cli/ValidatorGui.java |  6 +-
 .../fhir/validation/cli/ValidatorGuiTest.java |  2 +-
 .../cli/controller/HttpGetContextTest.java    |  3 +-
 5 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index aa912913d..1adc31cf0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,19 +1,65 @@
-# Starter pipeline
-# Start with a minimal pipeline that you can customize to build and deploy your code.
-# Add steps that build, run tests, deploy, and more:
-# https://aka.ms/yaml
+# Maven
 
 trigger:
-- master
+  branches:
+    include:
+      - '*'
+  # pr:
+  # - master
+  # - release
+
+strategy:
+  matrix:
+    linux:
+      imageName: "ubuntu-16.04"
+    mac:
+      imageName: "macos-10.14"
+    windows:
+      imageName: "vs2017-win2016"
+  maxParallel: 3
 
 pool:
-  vmImage: 'ubuntu-latest'
+  vmImage: $(imageName)
+
+variables:
+  currentImage: $(imageName)
 
 steps:
-- script: echo Hello, world!
-  displayName: 'Run a one-line script'
 
-- script: |
-    echo Add other tasks to build, test, and deploy your project.
-    echo See https://aka.ms/yaml
-  displayName: 'Run a multi-line script'
+  - task: PowerShell@2
+    inputs:
+      targetType: 'inline'
+      script: |
+        [xml]$pomXml = Get-Content .\pom.xml
+        # version
+        Write-Host $pomXml.project.version
+        $version=$pomXml.project.version
+        Write-Host "##vso[task.setvariable variable=version]$version"
+
+  - task: Maven@3
+    inputs:
+      mavenPomFile: 'pom.xml'
+      mavenOptions: '-Xmx3072m'
+      javaHomeOption: 'JDKVersion'
+      jdkVersionOption: '1.8'
+      jdkArchitectureOption: 'x64'
+      publishJUnitResults: true
+      testResultsFiles: '**/surefire-reports/TEST-*.xml'
+      goals: 'package cobertura:cobertura'
+
+  - bash: echo $(version)
+  - bash: echo $(variables.currentImage)
+
+  - task: PublishCodeCoverageResults@1
+    inputs:
+      codeCoverageTool: "Cobertura"
+      summaryFileLocation: "$(System.DefaultWorkingDirectory)/**/site/cobertura/coverage.xml"
+      failIfCoverageEmpty: true
+
+  - task: PublishPipelineArtifact@1
+    condition: eq(variables.currentImage, 'ubuntu-16.04')
+    inputs:
+      targetPath: "$(System.DefaultWorkingDirectory)/target/ProjectA-$(version).jar"
+      artifactName: ProjectAOutput
+
+
diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java
index 341189cf5..596379f54 100644
--- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java
+++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/tests/XhtmlNodeTest.java
@@ -1,6 +1,7 @@
 package org.hl7.fhir.utilities.tests;
 
 import org.hl7.fhir.utilities.xhtml.XhtmlNode;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,8 +10,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 
-import static org.junit.Assert.assertEquals;
-
 public class XhtmlNodeTest {
 
   private static final Logger ourLog = LoggerFactory.getLogger(XhtmlNodeTest.class);
@@ -24,12 +23,12 @@ public class XhtmlNodeTest {
     // Entity that appears in XHTML not not in XML
     XhtmlNode node = new XhtmlNode();
     node.setValueAsString("<div>&reg;</div>");
-    assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">®</div>", node.getValueAsString());
+    Assertions.assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">®</div>", node.getValueAsString());
 
     // Entity that appears in both
     node = new XhtmlNode();
     node.setValueAsString("<div>&lt;</div>");
-    assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">&lt;</div>", node.getValueAsString());
+    Assertions.assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">&lt;</div>", node.getValueAsString());
   }
 
   /**
@@ -39,24 +38,24 @@ public class XhtmlNodeTest {
   public void testLangAttributePreserved() {
     XhtmlNode dt = new XhtmlNode();
     dt.setValueAsString("<div xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en-US\">help i'm a bug</div>");
-    assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en-US\">help i'm a bug</div>", dt.getValueAsString());
-    assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en-US\">help i'm a bug</div>", new XhtmlNode().setValue(dt.getValue()).getValueAsString());
+    Assertions.assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en-US\">help i'm a bug</div>", dt.getValueAsString());
+    Assertions.assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en-US\">help i'm a bug</div>", new XhtmlNode().setValue(dt.getValue()).getValueAsString());
   }
 
   @Test
   public void testParseRsquo() {
     XhtmlNode dt = new XhtmlNode();
     dt.setValueAsString("It&rsquo;s January again");
-    assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">It’s January again</div>", dt.getValueAsString());
-    assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">It’s January again</div>", new XhtmlNode().setValue(dt.getValue()).getValueAsString());
+    Assertions.assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">It’s January again</div>", dt.getValueAsString());
+    Assertions.assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">It’s January again</div>", new XhtmlNode().setValue(dt.getValue()).getValueAsString());
   }
 
   @Test
   public void testProcessingInstructionNotPreserved() {
     XhtmlNode dt = new XhtmlNode();
     dt.setValueAsString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><div xmlns=\"http://www.w3.org/1999/xhtml\">help i'm a bug</div>");
-    assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">help i'm a bug</div>", dt.getValueAsString());
-    assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">help i'm a bug</div>", new XhtmlNode().setValue(dt.getValue()).getValueAsString());
+    Assertions.assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">help i'm a bug</div>", dt.getValueAsString());
+    Assertions.assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">help i'm a bug</div>", new XhtmlNode().setValue(dt.getValue()).getValueAsString());
   }
 
   @Test
@@ -71,7 +70,7 @@ public class XhtmlNodeTest {
     String output = node.getValueAsString();
     ourLog.info(output);
 
-    assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\"><img src=\"http://pbs.twimg.com/profile_images/544507893991485440/r_vo3uj2_bigger.png\" alt=\"Twitter Avatar\"/>@fhirabend</div>", output);
+    Assertions.assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\"><img src=\"http://pbs.twimg.com/profile_images/544507893991485440/r_vo3uj2_bigger.png\" alt=\"Twitter Avatar\"/>@fhirabend</div>", output);
   }
 
   @Test
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/ValidatorGui.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/ValidatorGui.java
index 3030d0e2e..d8c0f8492 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/ValidatorGui.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/cli/ValidatorGui.java
@@ -13,7 +13,7 @@ import java.net.URISyntaxException;
 
 public class ValidatorGui {
 
-  private static final int GUI_FRONTEND_PORT = 8080;
+  private static final int GUI_FRONTEND_PORT = 8081;
   private static final String PAGE_ADDRESS = "http://localhost:" + GUI_FRONTEND_PORT + "/home";
   private static final String WEB_APP_FILE_LOCATION = "/public";
   private static Javalin app;
@@ -32,6 +32,10 @@ public class ValidatorGui {
     start(new CliContext(), validationEngine, false);
   }
 
+  public static int getPort() {
+    return GUI_FRONTEND_PORT;
+  }
+
   public static void start(CliContext currentContext, ValidationEngine validationEngine, boolean bootBrowser) {
     app = Javalin.create();
     new RestEndpoints().initRestEndpoints(app, currentContext, validationEngine);
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/cli/ValidatorGuiTest.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/cli/ValidatorGuiTest.java
index b8e88e779..a58d17b78 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/cli/ValidatorGuiTest.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/cli/ValidatorGuiTest.java
@@ -24,7 +24,7 @@ class ValidatorGuiTest {
     options.addArguments("--headless");
     options.addArguments("--disable-gpu");
     WebDriver driver = new ChromeDriver(options);
-    driver.get("http://localhost:8080/home");
+    driver.get("http://localhost:" + ValidatorGui.getPort() + "/home");
 
     Assertions.assertTrue(driver.getPageSource().contains(HTML_TITLE_TAG));
     driver.quit();
diff --git a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/cli/controller/HttpGetContextTest.java b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/cli/controller/HttpGetContextTest.java
index ac10cd47a..c000d7016 100644
--- a/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/cli/controller/HttpGetContextTest.java
+++ b/org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/cli/controller/HttpGetContextTest.java
@@ -7,6 +7,7 @@ import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.hl7.fhir.validation.cli.BaseRestTest;
+import org.hl7.fhir.validation.cli.ValidatorGui;
 import org.hl7.fhir.validation.cli.model.CliContext;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
@@ -16,7 +17,7 @@ import java.io.IOException;
 
 class HttpGetContextTest extends BaseRestTest {
 
-  private final String GET_CONTEXT_URL = "http://localhost:8080/context";
+  private final String GET_CONTEXT_URL = "http://localhost:" + ValidatorGui.getPort() + "/context";
 
   @Test
   @DisplayName("Testing status code on get context endpoint.")

From 18b5b3b16654f9f583227bddce9ea209a64aa47f Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Mon, 4 May 2020 11:59:23 -0400
Subject: [PATCH 03/25] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 66 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index aa912913d..7a36bb860 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,19 +1,59 @@
-# Starter pipeline
-# Start with a minimal pipeline that you can customize to build and deploy your code.
-# Add steps that build, run tests, deploy, and more:
-# https://aka.ms/yaml
-
 trigger:
-- master
+  branches:
+    include:
+      - '*'
+
+strategy:
+  matrix:
+    linux:
+      imageName: "ubuntu-16.04"
+    mac:
+      imageName: "macos-10.14"
+    windows:
+      imageName: "vs2017-win2016"
+  maxParallel: 3
 
 pool:
-  vmImage: 'ubuntu-latest'
+  vmImage: $(imageName)
+
+variables:
+  currentImage: $(imageName)
 
 steps:
-- script: echo Hello, world!
-  displayName: 'Run a one-line script'
 
-- script: |
-    echo Add other tasks to build, test, and deploy your project.
-    echo See https://aka.ms/yaml
-  displayName: 'Run a multi-line script'
+  - task: PowerShell@2
+    inputs:
+      targetType: 'inline'
+      script: |
+        [xml]$pomXml = Get-Content .\pom.xml
+        # version
+        Write-Host $pomXml.project.version
+        $version=$pomXml.project.version
+        Write-Host "##vso[task.setvariable variable=version]$version"
+
+  - task: Maven@3
+    inputs:
+      mavenPomFile: 'pom.xml'
+      mavenOptions: '-Xmx3072m'
+      javaHomeOption: 'JDKVersion'
+      jdkVersionOption: '1.8'
+      jdkArchitectureOption: 'x64'
+      publishJUnitResults: true
+      testResultsFiles: '**/surefire-reports/TEST-*.xml'
+      goals: 'package cobertura:cobertura'
+
+  - bash: echo Current version => $(version)
+
+  - task: PublishCodeCoverageResults@1
+    inputs:
+      codeCoverageTool: "Cobertura"
+      summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/**/site/jacoco-aggregate/jacoco.xml"
+      failIfCoverageEmpty: true
+
+  # - task: PublishPipelineArtifact@1
+  #   condition: eq(variables.currentImage, 'ubuntu-16.04')
+  #   inputs:
+  #     targetPath: "$(System.DefaultWorkingDirectory)/target/ProjectA-$(version).jar"
+  #     artifactName: ProjectAOutput
+
+

From d7d61d0e367cad3efce9ffc3493f5b68cc33f133 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Mon, 4 May 2020 12:00:41 -0400
Subject: [PATCH 04/25] jacoco running and aggregating, attempting to integrate
 with reports

---
 pom.xml        | 42 +++++++++++++++++++++--
 report/pom.xml | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+), 3 deletions(-)
 create mode 100644 report/pom.xml

diff --git a/pom.xml b/pom.xml
index 877d3ecb3..731f3ac0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
         <validator_test_case_version>1.1.10-SNAPSHOT</validator_test_case_version>
         <junit_jupiter_version>5.6.2</junit_jupiter_version>
         <maven_surefire_version>3.0.0-M4</maven_surefire_version>
+        <jacoco_version>0.8.5</jacoco_version>
     </properties>
 
     <artifactId>org.hl7.fhir.core</artifactId>
@@ -129,10 +130,11 @@
         <module>org.hl7.fhir.dstu3</module>
         <module>org.hl7.fhir.r4</module>
         <module>org.hl7.fhir.r5</module>
-        <!--<module>org.hl7.fhir.rdf</module>-->
         <module>org.hl7.fhir.convertors</module>
         <module>org.hl7.fhir.validation</module>
         <module>org.hl7.fhir.validation.cli</module>
+        <!-- The report project exists only to aggregate the test results from the other projects into a central report. -->
+        <module>report</module>
     </modules>
 
     <build>
@@ -160,8 +162,13 @@
                 <configuration>
                     <trimStackTrace>false</trimStackTrace>
                     <testFailureIgnore>false</testFailureIgnore>
-                    <argLine>-Xmx4096m</argLine>
+                    <!-- We need to include the ${argLine} here so the Jacoco test arguments are included in the
+                     Surefire testing run. This may appear as an error in some IDEs, but it will run regardless. -->
+                    <argLine>${argLine} -Xmx4096m</argLine>
                     <redirectTestOutputToFile>false</redirectTestOutputToFile>
+                    <excludes>
+                        <exclude>org/hl7/fhir/validation/cli/**</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -272,7 +279,36 @@
                     <skipUpdateLicense>true</skipUpdateLicense>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco_version}</version>
+                <configuration>
+                    <excludes>
+                        <!-- These files blow away the JVM limit on file size. Until we refactor, we need to ignore or
+                             Jacoco complains and won't run the validator tests. -->
+                        <exclude>org/hl7/fhir/r5/formats/JsonParser</exclude>
+                        <exclude>org/hl7/fhir/r5/formats/XmlParser</exclude>
+                        <exclude>org/hl7/fhir/r4/formats/JsonParser</exclude>
+                        <exclude>org/hl7/fhir/r4/formats/XmlParser</exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>jacoco-initialize</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>report</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/report/pom.xml b/report/pom.xml
new file mode 100644
index 000000000..044fb61ed
--- /dev/null
+++ b/report/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>ca.uhn.hapi.fhir</groupId>
+        <artifactId>org.hl7.fhir.core</artifactId>
+        <version>4.2.23-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>report</artifactId>
+
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.convertors</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.dstu2</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.dstu3</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.dstu2016may</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.r4</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.r5</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.utilities</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.validation</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco_version}</version>
+                <executions>
+                    <execution>
+                        <id>report-aggregate</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>report-aggregate</goal>
+                        </goals>
+                        <configuration>
+                            <title>JaCoCo</title>
+                            <footer>Code Coverage Report for FHIR core libs ${project.version}</footer>
+                            <includes>
+                                <!-- Analyze class files only to exclude shaded agent JAR from report -->
+                                <include>**/*.class</include>
+                            </includes>
+                            <excludes>
+<!--                                <exclude>**/HelpMojo.class</exclude>-->
+                            </excludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file

From 27ed39e553f88097f13957ac1b29404fc42a7f76 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Mon, 4 May 2020 12:03:45 -0400
Subject: [PATCH 05/25] wip

---
 azure-pipelines.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b634d024b..236ae4e27 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,18 +1,7 @@
-<<<<<<< HEAD
-# Maven
-
-=======
->>>>>>> 18b5b3b16654f9f583227bddce9ea209a64aa47f
 trigger:
   branches:
     include:
       - '*'
-<<<<<<< HEAD
-  # pr:
-  # - master
-  # - release
-=======
->>>>>>> 18b5b3b16654f9f583227bddce9ea209a64aa47f
 
 strategy:
   matrix:

From ca65e62387f0bbe2549cc3a6c04ea414656bd20c Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Mon, 4 May 2020 12:44:46 -0400
Subject: [PATCH 06/25] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 236ae4e27..b7ec27d15 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -40,7 +40,7 @@ steps:
       jdkArchitectureOption: 'x64'
       publishJUnitResults: true
       testResultsFiles: '**/surefire-reports/TEST-*.xml'
-      goals: 'package cobertura:cobertura'
+      goals: 'clean package'
 
   - bash: echo Current version => $(version)
 

From 30a52f4ece777a60f1803fc1d69eb11e4ad2146f Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Mon, 4 May 2020 13:17:02 -0400
Subject: [PATCH 07/25] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b7ec27d15..02d8fce7f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -46,7 +46,7 @@ steps:
 
   - task: PublishCodeCoverageResults@1
     inputs:
-      codeCoverageTool: "Cobertura"
+      codeCoverageTool: "Jacoco"
       summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/**/site/jacoco-aggregate/jacoco.xml"
       failIfCoverageEmpty: true
 

From 376a18f68ca6d6269664916b4920bc10220b3a18 Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Mon, 4 May 2020 14:30:53 -0400
Subject: [PATCH 08/25] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 02d8fce7f..bc474a803 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,10 +7,10 @@ strategy:
   matrix:
     linux:
       imageName: "ubuntu-16.04"
-    mac:
-      imageName: "macos-10.14"
-    windows:
-      imageName: "vs2017-win2016"
+    # mac:
+    #   imageName: "macos-10.14"
+    # windows:
+    #   imageName: "vs2017-win2016"
   maxParallel: 3
 
 pool:
@@ -47,7 +47,7 @@ steps:
   - task: PublishCodeCoverageResults@1
     inputs:
       codeCoverageTool: "Jacoco"
-      summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/**/site/jacoco-aggregate/jacoco.xml"
+      summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml"
       failIfCoverageEmpty: true
 
   # - task: PublishPipelineArtifact@1

From 1862cdbf47fcb44a25cabbc48bcf939acc7b5d29 Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Mon, 4 May 2020 20:24:06 -0400
Subject: [PATCH 09/25] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bc474a803..2fafa4e99 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -43,12 +43,16 @@ steps:
       goals: 'clean package'
 
   - bash: echo Current version => $(version)
+    displayName: 'version'
 
-  - task: PublishCodeCoverageResults@1
-    inputs:
-      codeCoverageTool: "Jacoco"
-      summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml"
-      failIfCoverageEmpty: true
+  - bash: <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN)
+    displayName: 'codecov'
+
+  # - task: PublishCodeCoverageResults@1
+  #   inputs:
+  #     codeCoverageTool: "Jacoco"
+  #     summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml"
+  #     failIfCoverageEmpty: true
 
   # - task: PublishPipelineArtifact@1
   #   condition: eq(variables.currentImage, 'ubuntu-16.04')

From b561ef91782f49003bb1e1368e44d99bed5ae977 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Mon, 4 May 2020 20:30:59 -0400
Subject: [PATCH 10/25] wip

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 731f3ac0d..d2b360e81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,6 @@
                 <version>0.13</version>
             </dependency>
         </dependencies>
-
     </dependencyManagement>
 
     <modules>

From 2808d7ef145345ff7d2a23d7b216215df5a14555 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 09:35:36 -0400
Subject: [PATCH 11/25] wip

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2fafa4e99..ca39118c1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -48,6 +48,7 @@ steps:
   - bash: <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN)
     displayName: 'codecov'
 
+
   # - task: PublishCodeCoverageResults@1
   #   inputs:
   #     codeCoverageTool: "Jacoco"

From 93c0c9de2b89ee5cf4b6dfeafb753e110e3073b4 Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 10:22:33 -0400
Subject: [PATCH 12/25] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ca39118c1..1eec32b95 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -45,7 +45,7 @@ steps:
   - bash: echo Current version => $(version)
     displayName: 'version'
 
-  - bash: <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN)
+  - bash: <(curl https://codecov.io/bash) -t $CODECOV_TOKEN
     displayName: 'codecov'
 
 

From 3717b9e76bb33b05d9e8e2701d3f9c60bead3b60 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 11:36:14 -0400
Subject: [PATCH 13/25] wip

---
 azure-pipelines.yml | 18 +++++++++---------
 pom.xml             |  4 ++++
 report/pom.xml      | 40 ++++++++++++++++++++--------------------
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ca39118c1..40a5b0a66 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -45,21 +45,21 @@ steps:
   - bash: echo Current version => $(version)
     displayName: 'version'
 
-  - bash: <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN)
-    displayName: 'codecov'
+#  - script: bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN)
+#    displayName: 'codecov'
 
-
-  # - task: PublishCodeCoverageResults@1
-  #   inputs:
-  #     codeCoverageTool: "Jacoco"
-  #     summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml"
-  #     failIfCoverageEmpty: true
+   - task: PublishCodeCoverageResults@1
+     inputs:
+       codeCoverageTool: "Jacoco"
+       summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml"
+       failIfCoverageEmpty: true
 
   # - task: PublishPipelineArtifact@1
   #   condition: eq(variables.currentImage, 'ubuntu-16.04')
   #   inputs:
   #     targetPath: "$(System.DefaultWorkingDirectory)/target/ProjectA-$(version).jar"
   #     artifactName: ProjectAOutput
-
+https://codecov:
+  io/bash:
 
 
diff --git a/pom.xml b/pom.xml
index d2b360e81..63d9fec72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -290,6 +290,10 @@
                         <exclude>org/hl7/fhir/r5/formats/XmlParser</exclude>
                         <exclude>org/hl7/fhir/r4/formats/JsonParser</exclude>
                         <exclude>org/hl7/fhir/r4/formats/XmlParser</exclude>
+                        <exclude>org/hl7/fhir/r4/**/*</exclude>
+                        <exclude>org/hl7/fhir/dstu3/**/*</exclude>
+                        <exclude>org/hl7/fhir/dstu2/**/*</exclude>
+                        <exclude>org/hl7/fhir/dstu2016may/**/*</exclude>
                     </excludes>
                 </configuration>
                 <executions>
diff --git a/report/pom.xml b/report/pom.xml
index 044fb61ed..243b4f68d 100644
--- a/report/pom.xml
+++ b/report/pom.xml
@@ -23,26 +23,26 @@
             <artifactId>org.hl7.fhir.convertors</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.dstu2</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.dstu3</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.dstu2016may</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.r4</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.dstu2</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.dstu3</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.dstu2016may</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.r4</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>org.hl7.fhir.r5</artifactId>

From 751d06a9c939c8615ba1004e48da5d90624e93dc Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 11:44:57 -0400
Subject: [PATCH 14/25] wip

---
 azure-pipelines.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 40a5b0a66..7613345bc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -48,11 +48,11 @@ steps:
 #  - script: bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN)
 #    displayName: 'codecov'
 
-   - task: PublishCodeCoverageResults@1
-     inputs:
-       codeCoverageTool: "Jacoco"
-       summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml"
-       failIfCoverageEmpty: true
+  - task: PublishCodeCoverageResults@1
+    inputs:
+      codeCoverageTool: "Jacoco"
+      summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml"
+      failIfCoverageEmpty: true
 
   # - task: PublishPipelineArtifact@1
   #   condition: eq(variables.currentImage, 'ubuntu-16.04')

From 70a20379b70d97b9093feb7993ae172830e03871 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 11:46:19 -0400
Subject: [PATCH 15/25] wip

---
 azure-pipelines.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7613345bc..16ff8074f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,7 +59,5 @@ steps:
   #   inputs:
   #     targetPath: "$(System.DefaultWorkingDirectory)/target/ProjectA-$(version).jar"
   #     artifactName: ProjectAOutput
-https://codecov:
-  io/bash:
 
 

From e17e6308e2c21f5095de48c0877c7131833ab2e7 Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 12:47:00 -0400
Subject: [PATCH 16/25] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 16ff8074f..0b5169f3c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -50,9 +50,9 @@ steps:
 
   - task: PublishCodeCoverageResults@1
     inputs:
-      codeCoverageTool: "Jacoco"
-      summaryFileLocation: "$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml"
-      failIfCoverageEmpty: true
+      codeCoverageTool: 'JaCoCo'
+      summaryFileLocation: '$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml'
+      reportDirectory: '$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/'
 
   # - task: PublishPipelineArtifact@1
   #   condition: eq(variables.currentImage, 'ubuntu-16.04')

From c41349a837fcc3c6c0a85be45ef2f45715f7e6bc Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 13:22:03 -0400
Subject: [PATCH 17/25] Update azure-pipelines.yml for Azure Pipelines

---
 azure-pipelines.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0b5169f3c..4576b2e1b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,9 +18,9 @@ pool:
 
 variables:
   currentImage: $(imageName)
+  codecov: $(CODECOV_TOKEN)
 
 steps:
-
   - task: PowerShell@2
     inputs:
       targetType: 'inline'
@@ -30,7 +30,6 @@ steps:
         Write-Host $pomXml.project.version
         $version=$pomXml.project.version
         Write-Host "##vso[task.setvariable variable=version]$version"
-
   - task: Maven@3
     inputs:
       mavenPomFile: 'pom.xml'
@@ -41,13 +40,15 @@ steps:
       publishJUnitResults: true
       testResultsFiles: '**/surefire-reports/TEST-*.xml'
       goals: 'clean package'
-
+      
   - bash: echo Current version => $(version)
     displayName: 'version'
 
-#  - script: bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN)
-#    displayName: 'codecov'
+  - bash: echo codecov => $(codecov)
+    displayName: 'codecov'
 
+  - script: bash <(curl https://codecov.io/bash) -t $(codecov)
+    displayName: 'codecov'
   - task: PublishCodeCoverageResults@1
     inputs:
       codeCoverageTool: 'JaCoCo'

From 04e247cd8cfe7dcd6b03d926954eb3693c06a971 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 13:54:14 -0400
Subject: [PATCH 18/25] wip

---
 azure-pipelines.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4576b2e1b..5527840e4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,10 +7,10 @@ strategy:
   matrix:
     linux:
       imageName: "ubuntu-16.04"
-    # mac:
-    #   imageName: "macos-10.14"
-    # windows:
-    #   imageName: "vs2017-win2016"
+#     mac:
+#       imageName: "macos-10.14"
+#     windows:
+#       imageName: "vs2017-win2016"
   maxParallel: 3
 
 pool:
@@ -30,6 +30,7 @@ steps:
         Write-Host $pomXml.project.version
         $version=$pomXml.project.version
         Write-Host "##vso[task.setvariable variable=version]$version"
+
   - task: Maven@3
     inputs:
       mavenPomFile: 'pom.xml'
@@ -55,10 +56,10 @@ steps:
       summaryFileLocation: '$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml'
       reportDirectory: '$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/'
 
-  # - task: PublishPipelineArtifact@1
-  #   condition: eq(variables.currentImage, 'ubuntu-16.04')
-  #   inputs:
-  #     targetPath: "$(System.DefaultWorkingDirectory)/target/ProjectA-$(version).jar"
-  #     artifactName: ProjectAOutput
+   - task: PublishPipelineArtifact@1
+     condition: eq(variables.currentImage, 'ubuntu-16.04')
+     inputs:
+       targetPath: "$(System.DefaultWorkingDirectory)/org/hl7/fhir/validation/target/org.hl7.fhir.validation-$(version).jar"
+       artifactName: ProjectAOutput
 
 

From fdb57fed168814b52001559351c0cee8403d71e3 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 13:54:51 -0400
Subject: [PATCH 19/25] wip

---
 azure-pipelines.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5527840e4..039e83f6d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -56,10 +56,10 @@ steps:
       summaryFileLocation: '$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml'
       reportDirectory: '$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/'
 
-   - task: PublishPipelineArtifact@1
-     condition: eq(variables.currentImage, 'ubuntu-16.04')
-     inputs:
-       targetPath: "$(System.DefaultWorkingDirectory)/org/hl7/fhir/validation/target/org.hl7.fhir.validation-$(version).jar"
-       artifactName: ProjectAOutput
+  - task: PublishPipelineArtifact@1
+    condition: eq(variables.currentImage, 'ubuntu-16.04')
+    inputs:
+      targetPath: "$(System.DefaultWorkingDirectory)/org/hl7/fhir/validation/target/org.hl7.fhir.validation-$(version).jar"
+      artifactName: ProjectAOutput
 
 

From bc266af2ae42bd0ddbc936ff4e05ce55942870cb Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 14:14:16 -0400
Subject: [PATCH 20/25] wip

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 039e83f6d..6b7de8f9b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -59,7 +59,7 @@ steps:
   - task: PublishPipelineArtifact@1
     condition: eq(variables.currentImage, 'ubuntu-16.04')
     inputs:
-      targetPath: "$(System.DefaultWorkingDirectory)/org/hl7/fhir/validation/target/org.hl7.fhir.validation-$(version).jar"
+      targetPath: "$(System.DefaultWorkingDirectory)/org.hl7.fhir.validation/target/org.hl7.fhir.validation-$(version).jar"
       artifactName: ProjectAOutput
 
 

From 8f3868ba0740a1ccb80abdabfce97a568afa1b0d Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Tue, 5 May 2020 14:29:12 -0400
Subject: [PATCH 21/25] wip

---
 azure-pipelines.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6b7de8f9b..b0c45b9e6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -45,9 +45,6 @@ steps:
   - bash: echo Current version => $(version)
     displayName: 'version'
 
-  - bash: echo codecov => $(codecov)
-    displayName: 'codecov'
-
   - script: bash <(curl https://codecov.io/bash) -t $(codecov)
     displayName: 'codecov'
   - task: PublishCodeCoverageResults@1

From 29b3f0efd5704dddf4e83a4315e29b908a145049 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Wed, 6 May 2020 10:52:07 -0400
Subject: [PATCH 22/25] fixing jacoco version issue

---
 report/pom.xml | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/report/pom.xml b/report/pom.xml
index 243b4f68d..5b96f9c39 100644
--- a/report/pom.xml
+++ b/report/pom.xml
@@ -15,6 +15,7 @@
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
+        <jacoco_version>0.8.5</jacoco_version>
     </properties>
 
     <dependencies>
@@ -23,26 +24,6 @@
             <artifactId>org.hl7.fhir.convertors</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
-<!--            <artifactId>org.hl7.fhir.dstu2</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
-<!--            <artifactId>org.hl7.fhir.dstu3</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
-<!--            <artifactId>org.hl7.fhir.dstu2016may</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
-<!--            <artifactId>org.hl7.fhir.r4</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>org.hl7.fhir.r5</artifactId>

From 74a63f2bceac25af6878e4d0c2966e8fc925ddc2 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Wed, 6 May 2020 11:00:57 -0400
Subject: [PATCH 23/25] pathing issues

---
 azure-pipelines.yml                     | 6 +++---
 {report => org.hl7.fhir.report}/pom.xml | 4 +++-
 pom.xml                                 | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename {report => org.hl7.fhir.report}/pom.xml (97%)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b0c45b9e6..00cf045b0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -50,13 +50,13 @@ steps:
   - task: PublishCodeCoverageResults@1
     inputs:
       codeCoverageTool: 'JaCoCo'
-      summaryFileLocation: '$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/jacoco.xml'
-      reportDirectory: '$(System.DefaultWorkingDirectory)/report/target/site/jacoco-aggregate/'
+      summaryFileLocation: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/jacoco.xml'
+      reportDirectory: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/'
 
   - task: PublishPipelineArtifact@1
     condition: eq(variables.currentImage, 'ubuntu-16.04')
     inputs:
       targetPath: "$(System.DefaultWorkingDirectory)/org.hl7.fhir.validation/target/org.hl7.fhir.validation-$(version).jar"
-      artifactName: ProjectAOutput
+      artifactName: Validator
 
 
diff --git a/report/pom.xml b/org.hl7.fhir.report/pom.xml
similarity index 97%
rename from report/pom.xml
rename to org.hl7.fhir.report/pom.xml
index 5b96f9c39..3f5b8f002 100644
--- a/report/pom.xml
+++ b/org.hl7.fhir.report/pom.xml
@@ -11,7 +11,9 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>report</artifactId>
+    <artifactId>org.hl7.fhir.report</artifactId>
+
+    <packaging>bundle</packaging>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
diff --git a/pom.xml b/pom.xml
index 63d9fec72..552478f3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
         <module>org.hl7.fhir.validation</module>
         <module>org.hl7.fhir.validation.cli</module>
         <!-- The report project exists only to aggregate the test results from the other projects into a central report. -->
-        <module>report</module>
+        <module>org.hl7.fhir.report</module>
     </modules>
 
     <build>

From f8fc0874afe1318a3d835908a2500657a97e96d0 Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Wed, 6 May 2020 11:32:41 -0400
Subject: [PATCH 24/25] wip

---
 org.hl7.fhir.report/pom.xml | 44 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml
index 3f5b8f002..0fa7d7890 100644
--- a/org.hl7.fhir.report/pom.xml
+++ b/org.hl7.fhir.report/pom.xml
@@ -20,28 +20,28 @@
         <jacoco_version>0.8.5</jacoco_version>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.convertors</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.r5</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.utilities</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.validation</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
+<!--    <dependencies>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.convertors</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.r5</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.utilities</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
+<!--            <artifactId>org.hl7.fhir.validation</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--        </dependency>-->
+<!--    </dependencies>-->
 
     <build>
         <plugins>

From ebf87e5276d11e7d32db258d8da5f8f509740d9d Mon Sep 17 00:00:00 2001
From: markiantorno <markiantorno@gmail.com>
Date: Wed, 6 May 2020 16:29:35 -0400
Subject: [PATCH 25/25] disabled duplicate check on report module

---
 org.hl7.fhir.report/pom.xml | 66 ++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 26 deletions(-)

diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml
index 0fa7d7890..c3360fae7 100644
--- a/org.hl7.fhir.report/pom.xml
+++ b/org.hl7.fhir.report/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>org.hl7.fhir.core</artifactId>
-        <version>4.2.23-SNAPSHOT</version>
+        <version>4.2.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,28 +20,34 @@
         <jacoco_version>0.8.5</jacoco_version>
     </properties>
 
-<!--    <dependencies>-->
-<!--        <dependency>-->
-<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
-<!--            <artifactId>org.hl7.fhir.convertors</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
-<!--            <artifactId>org.hl7.fhir.r5</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
-<!--            <artifactId>org.hl7.fhir.utilities</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>ca.uhn.hapi.fhir</groupId>-->
-<!--            <artifactId>org.hl7.fhir.validation</artifactId>-->
-<!--            <version>${project.version}</version>-->
-<!--        </dependency>-->
-<!--    </dependencies>-->
+    <dependencies>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.convertors</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.r5</artifactId>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.antlr</groupId>
+                    <artifactId>ST4</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.utilities</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ca.uhn.hapi.fhir</groupId>
+            <artifactId>org.hl7.fhir.validation</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
@@ -63,13 +69,21 @@
                                 <!-- Analyze class files only to exclude shaded agent JAR from report -->
                                 <include>**/*.class</include>
                             </includes>
-                            <excludes>
-<!--                                <exclude>**/HelpMojo.class</exclude>-->
-                            </excludes>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.basepom.maven</groupId>
+                <artifactId>duplicate-finder-maven-plugin</artifactId>
+                <version>1.4.0</version>
+                <configuration>
+                    <!-- The report project pulls in resources from all the other packages, which results in some duplicate
+                     classes being pulled in. This will need to be fixed eventually, but for now, we can just disable the
+                     check on this package. It's only purpose is to aggregate the reports.-->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>