From 5ca9c7bcc59036d148cafae19edc10f683e0ccbc Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 21 May 2021 11:56:15 -0400 Subject: [PATCH 1/9] Rolling back HAPI dependency so we can build and publish validation jar --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f62121692..986fe3c57 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 5.4.0 + 5.1.0 org.hl7.fhir.core - 5.4.2-SNAPSHOT + 5.4.2 pom From d91a4bbb03ab721867db7aa79cee16aeaeeef18d Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 21 May 2021 18:14:31 +0000 Subject: [PATCH 4/9] Updating version to: 5.4.3-SNAPSHOT and incrementing test cases dependency. --- RELEASE_NOTES.md | 1 - org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 11 insertions(+), 12 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a3efde8b6..e69de29bb 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1 +0,0 @@ -* Rolling back HAPI dependency so we can build and publish \ No newline at end of file diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 1974651ac..d1967dd69 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.4.2 + 5.4.3-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 959685736..092f5bcfc 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.4.2 + 5.4.3-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 3c803582d..54a2cca57 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.4.2 + 5.4.3-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 6bc7f84f7..8e3d4a431 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.4.2 + 5.4.3-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index b02aac583..1c2582df9 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.4.2 + 5.4.3-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index d259d5926..49e3a22d6 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.4.2 + 5.4.3-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index bf15f41d3..367de3094 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.4.2 + 5.4.3-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 552265f4a..ce31d35de 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.4.2 + 5.4.3-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 4c981c2a7..6cbd045a9 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.4.2 + 5.4.3-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 39df03e39..32541a7ca 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.4.2 + 5.4.3-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 492e73f2b..2b63895de 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.4.2 + 5.4.3-SNAPSHOT pom From 124bef0e8bc302ed3f325c35babfe7079e93068b Mon Sep 17 00:00:00 2001 From: Mark Iantorno Date: Fri, 21 May 2021 15:40:05 -0400 Subject: [PATCH 5/9] adding maven exec command to let me run tests on validator jar so people stop breaking it (#510) --- org.hl7.fhir.validation.cli/pom.xml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 6cbd045a9..f94020519 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -114,7 +114,28 @@ true - + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + default-cli + + exec + + + java + + /tmp + + -jar + ${basedir}/target/org.hl7.fhir.validation.cli-${project.version}.jar + + + + + From 7ddf41f5712b913f289f6cb68bf60be23d4aecf6 Mon Sep 17 00:00:00 2001 From: Mark Iantorno Date: Fri, 21 May 2021 15:42:41 -0400 Subject: [PATCH 6/9] Update pull-request-pipeline.yml for Azure Pipelines Adding validation cli jar test run --- pull-request-pipeline.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pull-request-pipeline.yml b/pull-request-pipeline.yml index ebbbc8d8b..7b2297008 100644 --- a/pull-request-pipeline.yml +++ b/pull-request-pipeline.yml @@ -36,6 +36,19 @@ steps: testResultsFiles: '**/surefire-reports/TEST-*.xml' goals: 'package' +- task: Maven@3 + inputs: + mavenPomFile: 'pom.xml' + goals: 'exec:exec' + options: '-pl org.hl7.fhir.validation.cli' + publishJUnitResults: false + testResultsFiles: '**/surefire-reports/TEST-*.xml' + javaHomeOption: 'JDKVersion' + mavenVersionOption: 'Default' + mavenAuthenticateFeed: false + effectivePomSkip: false + sonarQubeRunAnalysis: false + # Upload test results to codecov - script: bash <(curl https://codecov.io/bash) -t $(codecov) displayName: 'codecov Bash Uploader' From a0d64cc224722919f8d4345ada60500e380b00d2 Mon Sep 17 00:00:00 2001 From: Mark Iantorno Date: Fri, 21 May 2021 15:51:37 -0400 Subject: [PATCH 7/9] Update pull-request-pipeline.yml for Azure Pipelines yaml is the best language to do things in --- pull-request-pipeline.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pull-request-pipeline.yml b/pull-request-pipeline.yml index 7b2297008..a62ee3447 100644 --- a/pull-request-pipeline.yml +++ b/pull-request-pipeline.yml @@ -36,18 +36,18 @@ steps: testResultsFiles: '**/surefire-reports/TEST-*.xml' goals: 'package' -- task: Maven@3 - inputs: - mavenPomFile: 'pom.xml' - goals: 'exec:exec' - options: '-pl org.hl7.fhir.validation.cli' - publishJUnitResults: false - testResultsFiles: '**/surefire-reports/TEST-*.xml' - javaHomeOption: 'JDKVersion' - mavenVersionOption: 'Default' - mavenAuthenticateFeed: false - effectivePomSkip: false - sonarQubeRunAnalysis: false + - task: Maven@3 + inputs: + mavenPomFile: 'pom.xml' + goals: 'exec:exec' + options: '-pl org.hl7.fhir.validation.cli' + publishJUnitResults: false + testResultsFiles: '**/surefire-reports/TEST-*.xml' + javaHomeOption: 'JDKVersion' + mavenVersionOption: 'Default' + mavenAuthenticateFeed: false + effectivePomSkip: false + sonarQubeRunAnalysis: false # Upload test results to codecov - script: bash <(curl https://codecov.io/bash) -t $(codecov) From 30bdbf451868cce0d2b795c7b8caf820e54a218e Mon Sep 17 00:00:00 2001 From: Mark Iantorno Date: Fri, 21 May 2021 15:53:54 -0400 Subject: [PATCH 8/9] Update pull-request-pipeline.yml for Azure Pipelines --- pull-request-pipeline.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pull-request-pipeline.yml b/pull-request-pipeline.yml index a62ee3447..d3bf9cc03 100644 --- a/pull-request-pipeline.yml +++ b/pull-request-pipeline.yml @@ -39,15 +39,14 @@ steps: - task: Maven@3 inputs: mavenPomFile: 'pom.xml' - goals: 'exec:exec' + mavenOptions: '-Xmx3072m' + javaHomeOption: 'JDKVersion' + jdkVersionOption: '1.8' + jdkArchitectureOption: 'x64' options: '-pl org.hl7.fhir.validation.cli' publishJUnitResults: false testResultsFiles: '**/surefire-reports/TEST-*.xml' - javaHomeOption: 'JDKVersion' - mavenVersionOption: 'Default' - mavenAuthenticateFeed: false - effectivePomSkip: false - sonarQubeRunAnalysis: false + goals: 'exec:exec' # Upload test results to codecov - script: bash <(curl https://codecov.io/bash) -t $(codecov) From 5db9b65c217aa3014aff62313397b51762314200 Mon Sep 17 00:00:00 2001 From: Mark Iantorno Date: Fri, 21 May 2021 18:47:22 -0400 Subject: [PATCH 9/9] Test pr (#511) * adding maven exec command to let me run tests on validator jar so people stop breaking it * adding release notest to test PR pipeline --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e69de29bb..9c602647e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -0,0 +1 @@ +* Adding Maven exec to test validation cli jar \ No newline at end of file