From cc851afc68edc959fcfd1d2ec3b27975f6c649c4 Mon Sep 17 00:00:00 2001 From: Mark Iantorno Date: Wed, 3 Jun 2020 09:37:35 -0400 Subject: [PATCH 01/11] Adding validator cli SNAPSHOT publishing and debug variable to maven execution. --- module-snapshot-publishing.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module-snapshot-publishing.yml b/module-snapshot-publishing.yml index 35e63c158..c3af94f6c 100644 --- a/module-snapshot-publishing.yml +++ b/module-snapshot-publishing.yml @@ -21,6 +21,8 @@ strategy: module: "org.hl7.fhir.r5" validator: module: "org.hl7.fhir.validation" + validator_cli: + module: "org.hl7.fhir.validation.cli" maxParallel: 3 pool: @@ -106,5 +108,5 @@ steps: inputs: mavenPomFile: '$(System.DefaultWorkingDirectory)/$(module)/pom.xml' goals: deploy - options: '--settings $(System.DefaultWorkingDirectory)/settings.xml ' + options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -X' publishJUnitResults: false \ No newline at end of file From 2b102d8cb55856e26553793f8440733d92733ad5 Mon Sep 17 00:00:00 2001 From: Mark Iantorno Date: Wed, 3 Jun 2020 10:19:43 -0400 Subject: [PATCH 02/11] Update module-snapshot-publishing.yml for Azure Pipelines --- module-snapshot-publishing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-snapshot-publishing.yml b/module-snapshot-publishing.yml index c3af94f6c..836425dbc 100644 --- a/module-snapshot-publishing.yml +++ b/module-snapshot-publishing.yml @@ -107,6 +107,6 @@ 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 -X' publishJUnitResults: false \ No newline at end of file From a74b604ca3747cd19f79e4cfa9f71609a6bf698b Mon Sep 17 00:00:00 2001 From: markiantorno Date: Wed, 3 Jun 2020 10:21:06 -0400 Subject: [PATCH 03/11] wip --- org.hl7.fhir.r5/pom.xml | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 51db1595c..0698fbb03 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -19,16 +19,16 @@ ca.uhn.hapi.fhir org.hl7.fhir.utilities - - ca.uhn.hapi.fhir - hapi-fhir-base - - - ca.uhn.hapi.fhir - hapi-fhir-utilities - - - + + + + + + + + + + @@ -133,16 +133,16 @@ ${junit_jupiter_version} test - - com.atlassian.commonmark - commonmark - test - - - com.atlassian.commonmark - commonmark-ext-gfm-tables - test - + + com.atlassian.commonmark + commonmark + test + + + com.atlassian.commonmark + commonmark-ext-gfm-tables + test + From 38e2afbf2546c7f40f0290ec04579ef7bee079e9 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Wed, 3 Jun 2020 11:19:57 -0400 Subject: [PATCH 04/11] Packaging all SNAPSHOTS at once, instead of iterating through individual pom files --- module-snapshot-publishing.yml | 25 ++----------------------- org.hl7.fhir.r5/pom.xml | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/module-snapshot-publishing.yml b/module-snapshot-publishing.yml index 836425dbc..e4c80c896 100644 --- a/module-snapshot-publishing.yml +++ b/module-snapshot-publishing.yml @@ -7,24 +7,6 @@ trigger: pr: none -strategy: - matrix: - dstu2: - module: "org.hl7.fhir.dstu2" - dstu3: - module: "org.hl7.fhir.dstu3" - dstu2016may: - module: "org.hl7.fhir.dstu2016may" - r4: - module: "org.hl7.fhir.r4" - r5: - module: "org.hl7.fhir.r5" - validator: - module: "org.hl7.fhir.validation" - validator_cli: - module: "org.hl7.fhir.validation.cli" - maxParallel: 3 - pool: vmImage: "ubuntu-16.04" @@ -32,9 +14,6 @@ variables: currentModule: $(module) steps: - # Debugging output to identify current module. - - bash: echo Publishing SNAPSHOT for $(module) - displayName: 'Print module name.' # 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 @@ -104,9 +83,9 @@ steps: # Deploy the SNAPSHOT artifact to sonatype nexus. # This is done for the master branch merges only. - task: Maven@3 - displayName: 'Deploy $(module) to Sonatype staging' + displayName: 'Deploying SNAPSHOTS to Sonatype staging' inputs: - mavenPomFile: '$(System.DefaultWorkingDirectory)/$(module)/pom.xml' + mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml' goals: clean deploy options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -X' publishJUnitResults: false \ No newline at end of file diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 0698fbb03..c283438cf 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -19,16 +19,16 @@ ca.uhn.hapi.fhir org.hl7.fhir.utilities - - - - - - - - - - + + ca.uhn.hapi.fhir + hapi-fhir-base + + + ca.uhn.hapi.fhir + hapi-fhir-utilities + + + From 7a63c0b353fb709976a02d000125842e0e168824 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Wed, 3 Jun 2020 13:33:12 -0400 Subject: [PATCH 05/11] wip --- module-snapshot-publishing.yml | 25 +++++++++++++++++++++++-- org.hl7.fhir.r5/pom.xml | 3 ++- org.hl7.fhir.report/pom.xml | 1 - org.hl7.fhir.utilities/pom.xml | 1 - org.hl7.fhir.validation/pom.xml | 1 + pom.xml | 29 ++++++++++++++--------------- 6 files changed, 40 insertions(+), 20 deletions(-) diff --git a/module-snapshot-publishing.yml b/module-snapshot-publishing.yml index e4c80c896..2c6d5454b 100644 --- a/module-snapshot-publishing.yml +++ b/module-snapshot-publishing.yml @@ -7,6 +7,24 @@ trigger: pr: none +strategy: + matrix: +# dstu2: +# module: "org.hl7.fhir.dstu2" +# dstu3: +# module: "org.hl7.fhir.dstu3" +# dstu2016may: +# module: "org.hl7.fhir.dstu2016may" +# r4: +# module: "org.hl7.fhir.r4" + r5: + module: "org.hl7.fhir.r5" +# validator: +# module: "org.hl7.fhir.validation" +# validator_cli: +# module: "org.hl7.fhir.validation.cli" + maxParallel: 3 + pool: vmImage: "ubuntu-16.04" @@ -14,6 +32,9 @@ variables: currentModule: $(module) steps: + # Debugging output to identify current module. + - bash: echo Publishing SNAPSHOT for $(module) + displayName: 'Print module name.' # 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 @@ -83,9 +104,9 @@ steps: # Deploy the SNAPSHOT artifact to sonatype nexus. # This is done for the master branch merges only. - task: Maven@3 - displayName: 'Deploying SNAPSHOTS to Sonatype staging' + displayName: 'Deploy $(module) to Sonatype staging' inputs: - mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml' + mavenPomFile: '$(System.DefaultWorkingDirectory)/$(module)/pom.xml' goals: clean deploy options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -X' publishJUnitResults: false \ No newline at end of file diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index c283438cf..c594215d8 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -13,12 +13,13 @@ bundle - ca.uhn.hapi.fhir org.hl7.fhir.utilities + ${project.version} + ca.uhn.hapi.fhir hapi-fhir-base diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 7b4849c3a..f22730c90 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -12,7 +12,6 @@ 4.0.0 org.hl7.fhir.report - bundle diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index c2f9701ce..802120eb6 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -13,7 +13,6 @@ bundle - ca.uhn.hapi.fhir hapi-fhir-base diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 1fd0d94b9..234ed6fc1 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -23,6 +23,7 @@ ca.uhn.hapi.fhir hapi-fhir-base + ca.uhn.hapi.fhir org.hl7.fhir.utilities diff --git a/pom.xml b/pom.xml index 924cdf3b2..7c17cfcd0 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,20 @@ http://hl7.org + + org.hl7.fhir.utilities + org.hl7.fhir.dstu2 + org.hl7.fhir.dstu2016may + org.hl7.fhir.dstu3 + org.hl7.fhir.r4 + org.hl7.fhir.r5 + org.hl7.fhir.convertors + org.hl7.fhir.validation + org.hl7.fhir.validation.cli + + org.hl7.fhir.report + + @@ -122,21 +136,6 @@ - - org.hl7.fhir.utilities - org.hl7.fhir.dstu2 - org.hl7.fhir.dstu2016may - org.hl7.fhir.dstu3 - org.hl7.fhir.r4 - org.hl7.fhir.r5 - org.hl7.fhir.convertors - org.hl7.fhir.validation - org.hl7.fhir.validation.cli - - org.hl7.fhir.report - - - From 33b47ac61c64f50c98c84060f42ad3c9c3451734 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Wed, 3 Jun 2020 13:41:38 -0400 Subject: [PATCH 06/11] wip --- module-snapshot-publishing.yml | 4 ++-- org.hl7.fhir.validation/pom.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module-snapshot-publishing.yml b/module-snapshot-publishing.yml index 2c6d5454b..aef3eb77c 100644 --- a/module-snapshot-publishing.yml +++ b/module-snapshot-publishing.yml @@ -19,8 +19,8 @@ strategy: # module: "org.hl7.fhir.r4" r5: module: "org.hl7.fhir.r5" -# validator: -# module: "org.hl7.fhir.validation" + validator: + module: "org.hl7.fhir.validation" # validator_cli: # module: "org.hl7.fhir.validation.cli" maxParallel: 3 diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 234ed6fc1..eb8add0b9 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -27,6 +27,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.utilities + ${project.version} From 3075deaae079b4ae2363960e8b9e120fb2834eaa Mon Sep 17 00:00:00 2001 From: markiantorno Date: Wed, 3 Jun 2020 13:51:19 -0400 Subject: [PATCH 07/11] wip wip --- module-snapshot-publishing.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/module-snapshot-publishing.yml b/module-snapshot-publishing.yml index aef3eb77c..836425dbc 100644 --- a/module-snapshot-publishing.yml +++ b/module-snapshot-publishing.yml @@ -9,20 +9,20 @@ pr: none strategy: matrix: -# dstu2: -# module: "org.hl7.fhir.dstu2" -# dstu3: -# module: "org.hl7.fhir.dstu3" -# dstu2016may: -# module: "org.hl7.fhir.dstu2016may" -# r4: -# module: "org.hl7.fhir.r4" + dstu2: + module: "org.hl7.fhir.dstu2" + dstu3: + module: "org.hl7.fhir.dstu3" + dstu2016may: + module: "org.hl7.fhir.dstu2016may" + r4: + module: "org.hl7.fhir.r4" r5: module: "org.hl7.fhir.r5" validator: module: "org.hl7.fhir.validation" -# validator_cli: -# module: "org.hl7.fhir.validation.cli" + validator_cli: + module: "org.hl7.fhir.validation.cli" maxParallel: 3 pool: From 0dae75b88b43d72216d950c966e74c240d6b9f4c Mon Sep 17 00:00:00 2001 From: markiantorno Date: Wed, 3 Jun 2020 13:54:37 -0400 Subject: [PATCH 08/11] Apparently I get up to 10 threads at a time I can use to do things on Azure. Here I was using 3 like some kind of peasant. --- module-snapshot-publishing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-snapshot-publishing.yml b/module-snapshot-publishing.yml index 836425dbc..e89de15be 100644 --- a/module-snapshot-publishing.yml +++ b/module-snapshot-publishing.yml @@ -23,7 +23,7 @@ strategy: module: "org.hl7.fhir.validation" validator_cli: module: "org.hl7.fhir.validation.cli" - maxParallel: 3 + maxParallel: 8 pool: vmImage: "ubuntu-16.04" From 85414c7b2a0469ab1a7ddc00559feaa452ac885f Mon Sep 17 00:00:00 2001 From: markiantorno Date: Wed, 3 Jun 2020 14:14:58 -0400 Subject: [PATCH 09/11] wip wip wip --- module-snapshot-publishing.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/module-snapshot-publishing.yml b/module-snapshot-publishing.yml index e89de15be..cb93faebd 100644 --- a/module-snapshot-publishing.yml +++ b/module-snapshot-publishing.yml @@ -108,5 +108,14 @@ steps: inputs: mavenPomFile: '$(System.DefaultWorkingDirectory)/$(module)/pom.xml' goals: clean deploy - options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -X' + 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 \ No newline at end of file From 16ef9c5692603acbac3b371acdb46705ffc05af3 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Wed, 3 Jun 2020 15:43:09 -0400 Subject: [PATCH 10/11] upping fhir-test-cases dep --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c17cfcd0..585f727b0 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 5.0.0 - 1.1.18-SNAPSHOT + 1.1.18 5.6.2 3.0.0-M4 0.8.5 From e8756694d8aff962b2c1c63efc5dfcb9d9458610 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Wed, 3 Jun 2020 16:00:48 -0400 Subject: [PATCH 11/11] forking might be bad --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 585f727b0..84be315c6 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 1.8 false UTF-8 - true + false 512m 4000m true