From b968aae1b0081595abf9a8ead0dde1440df74b35 Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 4 Aug 2023 11:50:12 -0400 Subject: [PATCH 1/7] Bump to fhir-test-cases 1.3.25 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e95160b52..01684c22e 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 32.0.1-jre 6.4.1 - 1.3.25-SNAPSHOT + 1.3.25 2.15.2 5.9.2 1.8.2 From bc3f3481080e113114e575a54ba4365609f9994c Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 4 Aug 2023 17:27:42 +0000 Subject: [PATCH 2/7] Release: v6.0.25 ## Validator Changes * Fix problem with evaluating extension contexts * Fix up support for inactive codes and fix error message syntax * Fix issue with collection status of resolve() being wrong * Improved paths in profile error messages * Fix problem with extension slicing being missed sometimes. * Fix problem with code validation caching ignoring whitespace * Produce useful error message when whitespace is wrong in display name * Support for x-version extensions when generating snapshots ## Other code changes * Render inactive property in expansions * Resolve URL for x-version extensions * Don't warn for loading a wrong version package more than once * Do not supercede R4 terminology when loading R5 IGs * Migrate type support when generating differentials ***NO_CI*** --- 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.r4b/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, 12 insertions(+), 12 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 87657d416..3dae362d2 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 5797b1a2c..7e2ca62cf 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 4ad20750f..75871ba2e 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 17056f54a..65e20a781 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 2e1024bd8..5c9e6f95e 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 555f61798..5740a8846 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 694145870..ed2f5860c 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 6f5dcae12..37fb28b00 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index b3ed07d98..17a0ec2da 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index c3167bc0d..81e5d2b18 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 3b892cd43..1ed78ed29 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 - 6.0.25-SNAPSHOT + 6.0.25 ../pom.xml diff --git a/pom.xml b/pom.xml index 01684c22e..c6aa568ed 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 6.0.25-SNAPSHOT + 6.0.25 pom From 9c3a6a7f3708089c561006a09517fa9f5af3920d Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 4 Aug 2023 17:55:11 +0000 Subject: [PATCH 3/7] Updating version to: 6.0.26-SNAPSHOT and incrementing test cases dependency. --- RELEASE_NOTES.md | 16 ++-------------- 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.r4b/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 +- 13 files changed, 14 insertions(+), 26 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 2f788ead1..7b06c6ab5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,19 +1,7 @@ ## Validator Changes -* Fix problem with evaluating extension contexts -* Fix up support for inactive codes and fix error message syntax -* Fix issue with collection status of resolve() being wrong -* Improved paths in profile error messages -* Fix problem with extension slicing being missed sometimes. -* Fix problem with code validation caching ignoring whitespace -* Produce useful error message when whitespace is wrong in display name -* Support for x-version extensions when generating snapshots +* no changes ## Other code changes -* Render inactive property in expansions -* Resolve URL for x-version extensions -* Don't warn for loading a wrong version package more than once -* Do not supercede R4 terminology when loading R5 IGs -* Migrate type support when generating differentials - +* 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 3dae362d2..934701ca5 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 7e2ca62cf..982979400 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 75871ba2e..14b6af817 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 65e20a781..de2223d63 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 5c9e6f95e..00d596acb 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 5740a8846..2cc0ac0cf 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index ed2f5860c..b8f690535 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 37fb28b00..7b44f4c5f 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 17a0ec2da..475ec5a2a 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 81e5d2b18..034a2209a 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 1ed78ed29..f1d784b1a 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 - 6.0.25 + 6.0.26-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index c6aa568ed..254bb68b6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 6.0.25 + 6.0.26-SNAPSHOT pom From 3361e93bdf71a7e5ca7799bd4310d8478c1f8948 Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 4 Aug 2023 16:29:17 -0400 Subject: [PATCH 4/7] License check action (#1384) * Add scripts + support docs for license check action * Switch to genuine bash --- .../workflows/license-check/license-check.sh | 49 +++++++++++++++++++ .../license-check/license-special-cases.txt | 3 ++ .../license-check/license-whitelist.txt | 25 ++++++++++ 3 files changed, 77 insertions(+) create mode 100755 .github/workflows/license-check/license-check.sh create mode 100644 .github/workflows/license-check/license-special-cases.txt create mode 100644 .github/workflows/license-check/license-whitelist.txt diff --git a/.github/workflows/license-check/license-check.sh b/.github/workflows/license-check/license-check.sh new file mode 100755 index 000000000..b23dc8440 --- /dev/null +++ b/.github/workflows/license-check/license-check.sh @@ -0,0 +1,49 @@ +#!/bin/bash +IFS=$'\n' + +readarray -t whitelist < ./.github/workflows/license-check/license-whitelist.txt +readarray -t specialcases < <( grep -vE "^#" ./.github/workflows/license-check/license-special-cases.txt ) + +exitStatus=0 + +for specialcase in "${specialcases[@]}" +do + echo "Special case: " "$specialcase" +done + +readarray -t thirdparty < <( tail -n +3 ./target/generated-sources/license/THIRD-PARTY.txt ) +for thirdpartyentry in "${thirdparty[@]}" +do + allLicensesValid=true + # Remove leading spaces + thirdpartyentry="${thirdpartyentry#"${thirdpartyentry%%[![:space:]]*}"}" + echo "Evaluating Dependency: " "$thirdpartyentry" + if [[ $(echo "${specialcases[@]}" | fgrep -w $thirdpartyentry) ]] + then + echo " Ignoring: " "$thirdpartyentry" + else + licenses=($(echo $thirdpartyentry | awk -vRS=")" -vFS="(" '{print $2}')) + for (( i=0; i < ${#licenses[@]} - 1 ; i++ )) + do + #echo ${licenses[i]} + licenseToCheck=${licenses[i]} + if [[ $(echo "${whitelist[@]}" | fgrep -w $licenseToCheck) ]] + then + #do nothing bsh no-op + : + else + echo " Unknown license found: " $licenseToCheck + allLicensesValid=false + exitStatus=1 + fi + done + fi + if $allLicensesValid + then + echo " All licenses OK" + else + echo " Possible license incompatibilities found" + fi +done + +exit $exitStatus \ No newline at end of file diff --git a/.github/workflows/license-check/license-special-cases.txt b/.github/workflows/license-check/license-special-cases.txt new file mode 100644 index 000000000..906c41759 --- /dev/null +++ b/.github/workflows/license-check/license-special-cases.txt @@ -0,0 +1,3 @@ +(Unknown license) javaparser (com.google.code.javaparser:javaparser:1.0.11 - http://code.google.com/p/javaparser/) +# IGNORE ME +(Apache Software License 2.0) HAPI FHIR - Validation Resources (FHIR R4) (ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4:6.4.1 - https://hapifhir.io/hapi-deployable-pom/hapi-fhir-validation-resources-r4) \ No newline at end of file diff --git a/.github/workflows/license-check/license-whitelist.txt b/.github/workflows/license-check/license-whitelist.txt new file mode 100644 index 000000000..f734f12c1 --- /dev/null +++ b/.github/workflows/license-check/license-whitelist.txt @@ -0,0 +1,25 @@ +The Apache Software License, Version 2.0 +Apache Software License, version 1.1 +Apache Software License 2.0 +The Apache License, Version 2.0 +The Apache Software License, Version 2.0 +MIT License +The MIT License +Apache Software License, version 1.1 +Apache 2 +Apache 2.0 +Apache License 2.0 +Eclipse Public License v2.0 +BSD licence +The BSD License +BSD-Style License +BSD License 3 +New BSD License +BSD 3 Clause +The JSON License +Eclipse Public License - v 1.0 +Eclipse Public License v. 2.0 +Eclipse Distribution License v. 1.0 +Eclipse Distribution License - v 1.0 +Unicode/ICU License +BSD 2-Clause License \ No newline at end of file From c1da51e16cfb5f02a8b1661851b4ba3d488af933 Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 4 Aug 2023 16:51:01 -0400 Subject: [PATCH 5/7] Create manual.yml --- .github/workflows/manual.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/manual.yml diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml new file mode 100644 index 000000000..0216acc10 --- /dev/null +++ b/.github/workflows/manual.yml @@ -0,0 +1,26 @@ +# This is a basic workflow that is manually triggered + +name: License Check + +on: + workflow_dispatch: + + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "greet" + greet: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + - name: Collect module licenses + run: mvn license:add-third-party + - name: Aggregate licenses + run: mvn license:aggregate-add-third-party + - name: Set script permissions + run: chmod u+x .github/workflows/license-check/license-check.sh + - name: Run script + run: .github/workflows/license-check/license-check.sh + continue-on-error: true From 2398dd927c1dc80ebed5512993d73fd7cb118e37 Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 4 Aug 2023 16:53:26 -0400 Subject: [PATCH 6/7] Update manual.yml (#1385) --- .github/workflows/manual.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 0216acc10..ba38d561b 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -9,12 +9,14 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "greet" - greet: + check: # The type of runner that the job will run on runs-on: ubuntu-latest # Steps represent a sequence of tasks that will be executed as part of the job steps: + - name: Checkout repository + uses: actions/checkout@v3 - name: Collect module licenses run: mvn license:add-third-party - name: Aggregate licenses From 2681867d2d4b1e8363975a4bdafaab499e8110e4 Mon Sep 17 00:00:00 2001 From: dotasek Date: Fri, 4 Aug 2023 16:59:40 -0400 Subject: [PATCH 7/7] Update manual.yml --- .github/workflows/manual.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index ba38d561b..86e85e017 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -17,6 +17,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Collect module licenses + run: mvn clean install -DskipTests - name: Collect module licenses run: mvn license:add-third-party - name: Aggregate licenses