Merge pull request #1 from FHIR/master

Merging upstream changes

README.md

@@ -1,9 +1,21 @@
-[![Build Status](https://dev.azure.com/markiantorno/FHIR/_apis/build/status/FHIR.fhir-test-cases?branchName=master)](https://dev.azure.com/markiantorno/FHIR/_build/latest?definitionId=12&branchName=master)
+# fhir-test-cases
 
-FHIR Test Cases
-===================================
+| CI Status | Current Release | Latest SNAPSHOT |
+| :---: | :---: | :---: |
+| [![Build Status][Badge-AzurePipeline]][Link-AzurePipeline] | [![Release Artifacts][Badge-SonatypeReleases]][Link-GithubZipRelease] | [![Snapshot Artifact][Badge-SonatypeSnapshots]][Link-SonatypeSnapshots] |
 
-# Building this Project
+## Contents
+
+This repository contains:
+
+* r5: r5 test cases (actively maintained)
+* r4: r4 test cases (not maintained)
+* cda: test case CDA for roundtripping/validation based on FHIR definition of CDA
+* ucum: source for ucum 
+* validator - test cases for the cross-version validation
+* target - maven administrative stuff
+
+## Building this Project
 
 This project uses [Apache Maven](http://maven.apache.org) to build. To build:
 
@@ -14,21 +26,43 @@ mvn install
 Note: there's no java code in here. The fact that maven is used is just to make it easy to book up
 other maven dependencies to the test cases 
 
-Releases are also posted to https://fhir.github.io/latest-ig-publisher/, where the release notes 
-can be found
+## Publishing Binaries
 
-== Contents ==
+Please see our [Wiki Page][Link-Publishing].
 
-This repository contains the following content:
+## Download
 
-* r5: r5 test cases (actively maintained)
-* r4: r4 test cases (not maintained)
-* cda: test case CDA for roundtripping/validation based on FHIR definition of CDA
-* ucum: source for ucum 
-* validator - test cases for the cross-version validation
-* target - maven administrative stuff
+#### Maven
+```xml
+<dependency>
+    <groupId>org.hl7.fhir.testcases</groupId>
+    <artifactId>fhir-test-cases</artifactId>
+    <version>(latest version)</version>
+</dependency>
+```
+
+#### Gradle
+```groovy
+compile group: 'org.hl7.fhir.testcases', name: 'fhir-test-cases', version: '(latest version)'
+```
+
+## Releases
+Releases and release notes are published to [GitHub][Link-GitHubReleases], and can also be downloaded from [Maven Central][Link-MavenCentralReleases].
+
+Additionally, releases and release notes will continue to be posted to https://fhir.github.io/latest-ig-publisher/.
+
+## Maintenance
+
+This project is maintained by the FHIR community to help implementations test their functionality.
 
-== Maintenance
+[Link-MavenCentralReleases]: https://mvnrepository.com/artifact/org.hl7.fhir.testcases/fhir-test-cases
+[Link-GitHubReleases]: https://github.com/FHIR/fhir-test-cases/releases
+[Link-Publishing]: https://github.com/FHIR/fhir-test-cases/wiki/Publishing-Binaries
+[Link-AzurePipeline]: https://dev.azure.com/fhir-pipelines/fhir-test-cases/_build/latest?definitionId=12&branchName=master
+[Link-GithubZipRelease]: https://github.com/FHIR/fhir-test-cases/releases/latest/download/testcases.zip "Sonatype Releases"
+[Link-SonatypeSnapshots]: https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.hl7.fhir.testcases&a=fhir-test-cases&v=LATEST "Sonatype Snapshots"
 
-This project is maintained by the FHIR community to help implementations test their functionality
 
+[Badge-AzurePipeline]: https://dev.azure.com/fhir-pipelines/fhir-test-cases/_apis/build/status/FHIR.fhir-test-cases?branchName=master
+[Badge-SonatypeReleases]: https://img.shields.io/nexus/r/https/oss.sonatype.org/org.hl7.fhir.testcases/fhir-test-cases.svg "Sonatype Releases"
+[Badge-SonatypeSnapshots]: https://img.shields.io/nexus/s/https/oss.sonatype.org/org.hl7.fhir.testcases/fhir-test-cases.svg "Sonatype Snapshots"

RELEASE_NOTES.md

@@ -0,0 +1,3 @@
+* Add test for enableWhen behavior in R3
+* Add test for CDA xsi:type behavior
+* Add tess for new FHIRPath functions for R3 string functions

azure-pipelines.yml

@@ -1,10 +1,14 @@
 trigger:
-  - master
-  - release
+  branches:
+    include:
+    - master
+    - releases
 
 pr:
-  - master
-  - release
+  branches:
+    include:
+    - master
+    - releases
 
 # Different users have different machine setups, we run the build three times, on ubuntu, osx, and windows
 strategy:
@@ -96,6 +100,9 @@ steps:
     displayName: 'Create .mvn/settings.xml'
     condition: and(eq(variables.currentImage, 'ubuntu-16.04'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
 
+  # 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. 
   - task: DownloadSecureFile@1
     displayName: 'Download public key.'
     inputs:
@@ -106,12 +113,13 @@ steps:
     inputs:
       secureFile: private.key
 
+  # Import both the private and public keys into gpg for signing.
   - bash: |
       gpg --import --no-tty --batch --yes $(Agent.TempDirectory)/public.key
       gpg --import --no-tty --batch --yes $(Agent.TempDirectory)/private.key
       gpg --list-keys --keyid-format LONG
       gpg --list-secret-keys --keyid-format LONG
-    displayName: 'Import signing key.'
+    displayName: 'Import signing keys.'
 
   # Deploy the SNAPSHOT artifact to sonatype nexus
   # This is done for the master branch merges only.

pom.xml

@@ -15,7 +15,7 @@
 	-->
 	<groupId>org.hl7.fhir.testcases</groupId>
 	<artifactId>fhir-test-cases</artifactId>
-	<version>1.1.15-SNAPSHOT</version>
+	<version>1.1.18-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>HL7 FHIR Test Cases</name>