diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 962523f74..7b06c6ab5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,17 +1,7 @@ ## Validator Changes -* Fix for NPE rendering resources -* Consider CanonicalResource to be a CanonicalResource when validating profile references -* Work around error in R5 sdf-29 invariant - +* no changes ## Other code changes -* XHTML processing: Cater for "." in XML element and attribute names -* Handle R3 encoding of primitive values when validating profiles -* Improve error messaging when validating StructureDefinition -* Temporary Support for MedicationStatement in R5 -* Work around for Identifier.use = ? in THO R5 package (old error) -* Rework Package API to allow for authentication on package servers -* Structure mapping now finds source Structure Definition by URI and sets ParserBase logical property appropriately. -* DOn't convert ig-r4 when converting package versions +* no changes \ No newline at end of file diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 24fe34dd7..6a474ac59 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 6584731a6..b2a3ac212 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 9e961ec39..fb87ff79d 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index a94b4dda8..62f25f3ca 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 79b61a0bc..07ba09043 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 6b923c223..230645e98 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 018a2e705..0f0997b68 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index a1d5096f8..9da26eafd 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 8b5b268b7..1c4d789be 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 7934e8ae5..fed492a9a 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 7d678fe99..755c24e66 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 9d1c7afd7..c492ec34b 100644 --- a/pom.xml +++ b/pom.xml @@ -14,12 +14,12 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.93-SNAPSHOT + 5.6.96-SNAPSHOT pom 6.2.1 - 1.2.10 + 1.2.11 5.7.1 1.8.2 3.0.0-M5 diff --git a/release-branch-pipeline.yml b/release-branch-pipeline.yml index c03b29796..83c2c4d3b 100644 --- a/release-branch-pipeline.yml +++ b/release-branch-pipeline.yml @@ -9,71 +9,140 @@ pool: variables: VERSION: -steps: - # Checks if the release notes file is populated. Exits if it is not. - - bash: | - if [ -n "$(cmp RELEASE_NOTES.md RELEASE_NOTES.template.md)" ] - then - echo "RELEASE_NOTES.md has changed, proceeding to next step" - else - echo "Your RELEASE_NOTES.md file is unchanged. Please provide release notes before creating a release." - exit 1 - fi - - # This task pulls the value from the org.hl7.fhir.r5 project pom.xml file. All modules are released as - # the same version, at the same time, as defined in the root level pom.xml. - - task: PowerShell@2 - inputs: - targetType: 'inline' - script: | - [xml]$pomXml = Get-Content -Path .\pom.xml - # version - Write-Host $pomXml.project.version - $version=$pomXml.project.version - Write-Host "##vso[task.setvariable variable=version]$version" - - # Prints out the build version, for debugging purposes - - bash: echo Pulled version from pom.xml => $(version) - - # Azure pipelines cannot pass variables between pipelines, but it can pass files, so we - # pass the build id (ex: 1.1.13-SNAPSHOT) as a string in a file. - # This is used in the release pipeline, so we create it here. - - bash: | - echo $(version) - VERSION=$(version) - echo "$VERSION" > $(System.DefaultWorkingDirectory)/VERSION - - # Copies the VERSION file containing the build id (ex: 1.1.13-SNAPSHOT) to the staging directory - # This is done for release versions only. - - task: CopyFiles@2 - displayName: 'Copy Files to: $(build.artifactstagingdirectory)' - inputs: - SourceFolder: '$(System.Defaultworkingdirectory)' - Contents: "$(System.DefaultWorkingDirectory)/VERSION" - TargetFolder: '$(build.artifactstagingdirectory)' - - # Runs 'mvn clean package' - - task: Maven@3 - inputs: - mavenPomFile: 'pom.xml' - mavenOptions: '-Xmx3072m' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.11' - jdkArchitectureOption: 'x64' - publishJUnitResults: true - testResultsFiles: '**/surefire-reports/TEST-*.xml' - goals: 'package' - - # Publishes the built Validator jar to build artifacts. Primarily for testing and debugging builds. - - task: PublishPipelineArtifact@1 - displayName: 'Publish Validator jar' - inputs: - targetPath: "$(System.DefaultWorkingDirectory)/org.hl7.fhir.validation/target/org.hl7.fhir.validation-$(version).jar" - artifactName: Validator - - # Publishes the files we've moved into the staging directory, so they can be accessed by the - # release pipeline. - - task: PublishBuildArtifacts@1 - displayName: 'Publish Build Artifacts' - inputs: - PathtoPublish: '$(build.artifactstagingdirectory)' +jobs: + - job: check_release_notes + timeoutInMinutes: 5 + steps: + - task: Bash@3 + # Checks if the release notes file is populated. Exits if it is not. + inputs: + targetType: 'inline' + script: | + if [ -n "$(cmp RELEASE_NOTES.md RELEASE_NOTES.template.md)" ] + then + echo "RELEASE_NOTES.md has changed, proceeding to next step" + else + echo "Your RELEASE_NOTES.md file is unchanged. Please provide release notes before creating a release." + exit 1 + fi + displayName: Checks if the release notes file is populated. + - job: get_release_version + timeoutInMinutes: 5 + steps: + - task: PowerShell@2 + # This task pulls the value from the hapi-fhir project pom.xml file. All modules are released as + # the same version, at the same time, as defined in the root level pom.xml. + inputs: + targetType: 'inline' + script: | + [xml]$pomXml = Get-Content -Path .\pom.xml + # version + Write-Host $pomXml.project.version + $VERSION=$pomXml.project.version + Write-Host "##vso[task.setvariable variable=version_from_pom;isOutput=true;]$VERSION" + displayName: Save pom file version to local variable. + name: setOutput + - task: Bash@3 + # Prints out the build version, for debugging purposes + inputs: + targetType: 'inline' + script: | + echo Pulled version from pom.xml => $(setOutput.version_from_pom) + displayName: Debug print release version + - task: Bash@3 + # Azure pipelines cannot pass variables between pipelines, but it can pass files, so we + # pass the build id (ex: 1.1.13-SNAPSHOT) as a string in a file. + # This is used in the release pipeline, so we create it here. + inputs: + targetType: 'inline' + script: | + echo $(setOutput.version_from_pom) + VERSION=$(setOutput.version_from_pom) + echo "$VERSION" > $(System.DefaultWorkingDirectory)/VERSION + displayName: Save Release Version to File + - task: CopyFiles@2 + # Copies the VERSION file containing the build id (ex: 1.1.13-SNAPSHOT) to the staging directory + # This is done for release versions only. + inputs: + SourceFolder: '$(System.Defaultworkingdirectory)' + Contents: "$(System.DefaultWorkingDirectory)/VERSION" + TargetFolder: '$(build.artifactstagingdirectory)' + displayName: 'Copy Files to: $(build.artifactstagingdirectory)' + - task: PublishBuildArtifacts@1 + displayName: 'Publish Build Artifacts' + inputs: + PathtoPublish: '$(build.artifactstagingdirectory)' + - job: get_branch_id + timeoutInMinutes: 5 + steps: + - task: PowerShell@2 + # This task pulls the branch name from the azure build environment and sets as a job-level variable. + inputs: + targetType: 'inline' + script: | + $BRANCH = '$(Build.SourceBranchName)' + Write-Host "##vso[task.setvariable variable=branch_name]$BRANCH" + displayName: Save branch name to local variable. + - task: Bash@3 + # Prints out the branch name, for debugging purposes + inputs: + targetType: 'inline' + script: echo Current branch name => $(branch_name) + displayName: Print out the branch name. + - task: Bash@3 + # Azure pipelines cannot pass variables between pipelines, but it can pass files, so we + # pass the branch name (ex: rel_2022_05) as a string in a file. + # This is used in the release pipeline, so we create it here. + inputs: + targetType: 'inline' + script: | + echo $(branch_name) + BRANCH=$(branch_name) + echo "$BRANCH" > $(System.DefaultWorkingDirectory)/BRANCH + displayName: Save branch name to file. + - task: CopyFiles@2 + # Copies the BRANCH file containing the pom version to the staging directory + inputs: + SourceFolder: '$(System.Defaultworkingdirectory)' + Contents: "$(System.DefaultWorkingDirectory)/BRANCH" + TargetFolder: '$(build.artifactstagingdirectory)' + displayName: Copy the branch name file to the artifact staging directory. + # Publishes the files we've moved into the staging directory, so they can be accessed by the + # release pipeline. + - task: PublishBuildArtifacts@1 + displayName: 'Publish Build Artifacts' + inputs: + PathtoPublish: '$(build.artifactstagingdirectory)' + - job: build_and_publish_artifacts + # We're going to do a full build, including all unit and intergration tests. We do this here, before any + # actual release pipeline kicks off, and we don't do it again at any point in the release pipeline. The assumption here + # is that once we pull the code, it won't change again on this branch until the release is complete. We + # want to fail fast if there is an issue, and avoid running the tests more than once so it doesn't take all day. + timeoutInMinutes: 360 + dependsOn: ['get_release_version', 'get_branch_id', 'check_release_notes'] + variables: + version_from_pom: $[ dependencies.get_release_version.outputs['setOutput.version_from_pom'] ] + steps: + # Runs 'mvn clean package' + - task: Maven@3 + inputs: + mavenPomFile: 'pom.xml' + mavenOptions: '-Xmx3072m' + javaHomeOption: 'JDKVersion' + jdkVersionOption: '1.11' + jdkArchitectureOption: 'x64' + publishJUnitResults: true + testResultsFiles: '**/surefire-reports/TEST-*.xml' + goals: 'package' + # Publishes the built Validator jar to build artifacts. Primarily for testing and debugging builds. + - task: PublishPipelineArtifact@1 + displayName: 'Publish Validator jar' + inputs: + targetPath: "$(System.DefaultWorkingDirectory)/org.hl7.fhir.validation/target/org.hl7.fhir.validation-$(version_from_pom).jar" + artifactName: Validator + # Publishes the files we've moved into the staging directory, so they can be accessed by the + # release pipeline. + - task: PublishBuildArtifacts@1 + displayName: 'Publish Build Artifacts' + inputs: + PathtoPublish: '$(build.artifactstagingdirectory)'