Merge remote-tracking branch 'origin/master'
This commit is contained in:
Grahame Grieve
commit
56205ec963
|
|
@ -1,17 +1,7 @@
|
||||||
## Validator Changes
|
## Validator Changes
|
||||||
|
|
||||||
* Fix for NPE rendering resources
|
* no changes
|
||||||
* Consider CanonicalResource to be a CanonicalResource when validating profile references
|
|
||||||
* Work around error in R5 sdf-29 invariant
|
|
||||||
|
|
||||||
|
|
||||||
## Other code changes
|
## Other code changes
|
||||||
|
|
||||||
* XHTML processing: Cater for "." in XML element and attribute names
|
* no changes
|
||||||
* 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
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
||||||
4
pom.xml
4
pom.xml
|
|
@ -14,12 +14,12 @@
|
||||||
HAPI FHIR
|
HAPI FHIR
|
||||||
-->
|
-->
|
||||||
<artifactId>org.hl7.fhir.core</artifactId>
|
<artifactId>org.hl7.fhir.core</artifactId>
|
||||||
<version>5.6.93-SNAPSHOT</version>
|
<version>5.6.96-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<hapi_fhir_version>6.2.1</hapi_fhir_version>
|
<hapi_fhir_version>6.2.1</hapi_fhir_version>
|
||||||
<validator_test_case_version>1.2.10</validator_test_case_version>
|
<validator_test_case_version>1.2.11</validator_test_case_version>
|
||||||
<junit_jupiter_version>5.7.1</junit_jupiter_version>
|
<junit_jupiter_version>5.7.1</junit_jupiter_version>
|
||||||
<junit_platform_launcher_version>1.8.2</junit_platform_launcher_version>
|
<junit_platform_launcher_version>1.8.2</junit_platform_launcher_version>
|
||||||
<maven_surefire_version>3.0.0-M5</maven_surefire_version>
|
<maven_surefire_version>3.0.0-M5</maven_surefire_version>
|
||||||
|
|
|
||||||
|
|
@ -9,71 +9,140 @@ pool:
|
||||||
variables:
|
variables:
|
||||||
VERSION:
|
VERSION:
|
||||||
|
|
||||||
steps:
|
jobs:
|
||||||
# Checks if the release notes file is populated. Exits if it is not.
|
- job: check_release_notes
|
||||||
- bash: |
|
timeoutInMinutes: 5
|
||||||
if [ -n "$(cmp RELEASE_NOTES.md RELEASE_NOTES.template.md)" ]
|
steps:
|
||||||
then
|
- task: Bash@3
|
||||||
echo "RELEASE_NOTES.md has changed, proceeding to next step"
|
# Checks if the release notes file is populated. Exits if it is not.
|
||||||
else
|
inputs:
|
||||||
echo "Your RELEASE_NOTES.md file is unchanged. Please provide release notes before creating a release."
|
targetType: 'inline'
|
||||||
exit 1
|
script: |
|
||||||
fi
|
if [ -n "$(cmp RELEASE_NOTES.md RELEASE_NOTES.template.md)" ]
|
||||||
|
then
|
||||||
# This task pulls the <version> value from the org.hl7.fhir.r5 project pom.xml file. All modules are released as
|
echo "RELEASE_NOTES.md has changed, proceeding to next step"
|
||||||
# the same version, at the same time, as defined in the root level pom.xml.
|
else
|
||||||
- task: PowerShell@2
|
echo "Your RELEASE_NOTES.md file is unchanged. Please provide release notes before creating a release."
|
||||||
inputs:
|
exit 1
|
||||||
targetType: 'inline'
|
fi
|
||||||
script: |
|
displayName: Checks if the release notes file is populated.
|
||||||
[xml]$pomXml = Get-Content -Path .\pom.xml
|
- job: get_release_version
|
||||||
# version
|
timeoutInMinutes: 5
|
||||||
Write-Host $pomXml.project.version
|
steps:
|
||||||
$version=$pomXml.project.version
|
- task: PowerShell@2
|
||||||
Write-Host "##vso[task.setvariable variable=version]$version"
|
# This task pulls the <version> 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.
|
||||||
# Prints out the build version, for debugging purposes
|
inputs:
|
||||||
- bash: echo Pulled version from pom.xml => $(version)
|
targetType: 'inline'
|
||||||
|
script: |
|
||||||
# Azure pipelines cannot pass variables between pipelines, but it can pass files, so we
|
[xml]$pomXml = Get-Content -Path .\pom.xml
|
||||||
# pass the build id (ex: 1.1.13-SNAPSHOT) as a string in a file.
|
# version
|
||||||
# This is used in the release pipeline, so we create it here.
|
Write-Host $pomXml.project.version
|
||||||
- bash: |
|
$VERSION=$pomXml.project.version
|
||||||
echo $(version)
|
Write-Host "##vso[task.setvariable variable=version_from_pom;isOutput=true;]$VERSION"
|
||||||
VERSION=$(version)
|
displayName: Save pom file version to local variable.
|
||||||
echo "$VERSION" > $(System.DefaultWorkingDirectory)/VERSION
|
name: setOutput
|
||||||
|
- task: Bash@3
|
||||||
# Copies the VERSION file containing the build id (ex: 1.1.13-SNAPSHOT) to the staging directory
|
# Prints out the build version, for debugging purposes
|
||||||
# This is done for release versions only.
|
inputs:
|
||||||
- task: CopyFiles@2
|
targetType: 'inline'
|
||||||
displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
|
script: |
|
||||||
inputs:
|
echo Pulled version from pom.xml => $(setOutput.version_from_pom)
|
||||||
SourceFolder: '$(System.Defaultworkingdirectory)'
|
displayName: Debug print release version
|
||||||
Contents: "$(System.DefaultWorkingDirectory)/VERSION"
|
- task: Bash@3
|
||||||
TargetFolder: '$(build.artifactstagingdirectory)'
|
# 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.
|
||||||
# Runs 'mvn clean package'
|
# This is used in the release pipeline, so we create it here.
|
||||||
- task: Maven@3
|
inputs:
|
||||||
inputs:
|
targetType: 'inline'
|
||||||
mavenPomFile: 'pom.xml'
|
script: |
|
||||||
mavenOptions: '-Xmx3072m'
|
echo $(setOutput.version_from_pom)
|
||||||
javaHomeOption: 'JDKVersion'
|
VERSION=$(setOutput.version_from_pom)
|
||||||
jdkVersionOption: '1.11'
|
echo "$VERSION" > $(System.DefaultWorkingDirectory)/VERSION
|
||||||
jdkArchitectureOption: 'x64'
|
displayName: Save Release Version to File
|
||||||
publishJUnitResults: true
|
- task: CopyFiles@2
|
||||||
testResultsFiles: '**/surefire-reports/TEST-*.xml'
|
# Copies the VERSION file containing the build id (ex: 1.1.13-SNAPSHOT) to the staging directory
|
||||||
goals: 'package'
|
# This is done for release versions only.
|
||||||
|
inputs:
|
||||||
# Publishes the built Validator jar to build artifacts. Primarily for testing and debugging builds.
|
SourceFolder: '$(System.Defaultworkingdirectory)'
|
||||||
- task: PublishPipelineArtifact@1
|
Contents: "$(System.DefaultWorkingDirectory)/VERSION"
|
||||||
displayName: 'Publish Validator jar'
|
TargetFolder: '$(build.artifactstagingdirectory)'
|
||||||
inputs:
|
displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
|
||||||
targetPath: "$(System.DefaultWorkingDirectory)/org.hl7.fhir.validation/target/org.hl7.fhir.validation-$(version).jar"
|
- task: PublishBuildArtifacts@1
|
||||||
artifactName: Validator
|
displayName: 'Publish Build Artifacts'
|
||||||
|
inputs:
|
||||||
# Publishes the files we've moved into the staging directory, so they can be accessed by the
|
PathtoPublish: '$(build.artifactstagingdirectory)'
|
||||||
# release pipeline.
|
- job: get_branch_id
|
||||||
- task: PublishBuildArtifacts@1
|
timeoutInMinutes: 5
|
||||||
displayName: 'Publish Build Artifacts'
|
steps:
|
||||||
inputs:
|
- task: PowerShell@2
|
||||||
PathtoPublish: '$(build.artifactstagingdirectory)'
|
# 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)'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue