From 97b6a9fbdb1eef80ca542c20a469d713d1220a14 Mon Sep 17 00:00:00 2001
From: Mark Iantorno <markiantorno@gmail.com>
Date: Fri, 5 Jun 2020 13:23:52 -0400
Subject: [PATCH] Snapshot builder fix (#223)

* Update module-snapshot-publishing.yml for Azure Pipelines

* Changing pipeline, because intermodule depenedecies are not being read in correctly.
---
 module-snapshot-publishing.yml  | 35 ++-------------------------------
 org.hl7.fhir.r4/pom.xml         |  2 +-
 org.hl7.fhir.r5/pom.xml         |  2 --
 org.hl7.fhir.validation/pom.xml |  1 -
 4 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/module-snapshot-publishing.yml b/module-snapshot-publishing.yml
index cb93faebd..28254026e 100644
--- a/module-snapshot-publishing.yml
+++ b/module-snapshot-publishing.yml
@@ -7,24 +7,6 @@ trigger:
 
 pr: none
 
-strategy:
-  matrix:
-    dstu2:
-      module: "org.hl7.fhir.dstu2"
-    dstu3:
-      module: "org.hl7.fhir.dstu3"
-    dstu2016may:
-      module: "org.hl7.fhir.dstu2016may"
-    r4:
-      module: "org.hl7.fhir.r4"
-    r5:
-      module: "org.hl7.fhir.r5"
-    validator:
-      module: "org.hl7.fhir.validation"
-    validator_cli:
-      module: "org.hl7.fhir.validation.cli"
-  maxParallel: 8
-
 pool:
   vmImage: "ubuntu-16.04"
 
@@ -32,10 +14,6 @@ variables:
   currentModule: $(module)
 
 steps:
-  # Debugging output to identify current module.
-  - bash: echo Publishing SNAPSHOT for $(module)
-    displayName: 'Print module name.'
-
   # Signing, for now, occurs for all builds, SNAPSHOT or release. So we need a valid
   # signing key. The next two steps download the public and private keys from the
   # secure library files. 
@@ -106,16 +84,7 @@ steps:
   - task: Maven@3
     displayName: 'Deploy $(module) to Sonatype staging'
     inputs:
-      mavenPomFile: '$(System.DefaultWorkingDirectory)/$(module)/pom.xml'
-      goals: clean deploy
+      mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml'
+      goals: deploy
       options: '--settings $(System.DefaultWorkingDirectory)/settings.xml'
       publishJUnitResults: false
-
-  # Clean any existing deployment artifacts
-  - task: Maven@3
-    displayName: 'Clean any existing deploy artifacts.'
-    inputs:
-      mavenPomFile: '$(System.DefaultWorkingDirectory)/$(module)/pom.xml'
-      goals: clean
-      options: '--settings $(System.DefaultWorkingDirectory)/settings.xml'
-      publishJUnitResults: false
\ No newline at end of file
diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml
index 29fb76072..9a2756416 100644
--- a/org.hl7.fhir.r4/pom.xml
+++ b/org.hl7.fhir.r4/pom.xml
@@ -19,6 +19,7 @@
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>org.hl7.fhir.utilities</artifactId>
 		</dependency>
+
 		<dependency>
          <groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-base</artifactId>
@@ -134,5 +135,4 @@
 			</resource>
 		</resources>
 	</build>
-
 </project>
diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml
index c594215d8..77d6cbe22 100644
--- a/org.hl7.fhir.r5/pom.xml
+++ b/org.hl7.fhir.r5/pom.xml
@@ -17,7 +17,6 @@
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>org.hl7.fhir.utilities</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
@@ -144,7 +143,6 @@
 			<artifactId>commonmark-ext-gfm-tables</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 	</dependencies>
 
 	<build>
diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml
index eb8add0b9..234ed6fc1 100644
--- a/org.hl7.fhir.validation/pom.xml
+++ b/org.hl7.fhir.validation/pom.xml
@@ -27,7 +27,6 @@
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>org.hl7.fhir.utilities</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <!-- FHIR Versions -->