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] 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>