Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core into gg-work

module-snapshot-publishing.yml

@@ -21,7 +21,9 @@ strategy:
       module: "org.hl7.fhir.r5"
     validator:
       module: "org.hl7.fhir.validation"
-  maxParallel: 3
+    validator_cli:
+      module: "org.hl7.fhir.validation.cli"
+  maxParallel: 8
 
 pool:
   vmImage: "ubuntu-16.04"
@@ -105,6 +107,15 @@ steps:
     displayName: 'Deploy $(module) to Sonatype staging'
     inputs:
       mavenPomFile: '$(System.DefaultWorkingDirectory)/$(module)/pom.xml'
-      goals: deploy
+      goals: clean deploy
-      options: '--settings $(System.DefaultWorkingDirectory)/settings.xml '
+      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

org.hl7.fhir.r5/pom.xml

@@ -13,12 +13,13 @@
 	<packaging>bundle</packaging>
 
 	<dependencies>
-
 		<!-- HAPI Dependencies -->
 		<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>hapi-fhir-base</artifactId>

org.hl7.fhir.report/pom.xml

@@ -12,7 +12,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.hl7.fhir.report</artifactId>
-
     <packaging>bundle</packaging>
 
     <properties>

org.hl7.fhir.utilities/pom.xml

@@ -13,7 +13,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-base</artifactId>

org.hl7.fhir.validation/pom.xml

@@ -23,9 +23,11 @@
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-base</artifactId>
         </dependency>
+
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>org.hl7.fhir.utilities</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- FHIR Versions -->

pom.xml

@@ -17,7 +17,7 @@
 
     <properties>
         <hapi_fhir_version>5.0.0</hapi_fhir_version>
-        <validator_test_case_version>1.1.18-SNAPSHOT</validator_test_case_version>
+        <validator_test_case_version>1.1.18</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>
@@ -33,6 +33,20 @@
         <url>http://hl7.org</url>
     </organization>
 
+    <modules>
+        <module>org.hl7.fhir.utilities</module>
+        <module>org.hl7.fhir.dstu2</module>
+        <module>org.hl7.fhir.dstu2016may</module>
+        <module>org.hl7.fhir.dstu3</module>
+        <module>org.hl7.fhir.r4</module>
+        <module>org.hl7.fhir.r5</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>org.hl7.fhir.report</module>
+    </modules>
+
     <repositories>
         <repository>
             <snapshots>
@@ -122,21 +136,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <modules>
-        <module>org.hl7.fhir.utilities</module>
-        <module>org.hl7.fhir.dstu2</module>
-        <module>org.hl7.fhir.dstu2016may</module>
-        <module>org.hl7.fhir.dstu3</module>
-        <module>org.hl7.fhir.r4</module>
-        <module>org.hl7.fhir.r5</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>org.hl7.fhir.report</module>
-    </modules>
-
-
     <build>
         <plugins>
             <plugin>
@@ -148,7 +147,7 @@
                     <target>1.8</target>
                     <forceJavacCompilerUse>false</forceJavacCompilerUse>
                     <encoding>UTF-8</encoding>
-                    <fork>true</fork>
+                    <fork>false</fork>
                     <meminitial>512m</meminitial>
                     <maxmem>4000m</maxmem>
                     <debug>true</debug>