Merge remote-tracking branch 'origin/master'
This commit is contained in:
Grahame Grieve
commit
5a59db667f
|
|
@ -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
|
||||
|
|
@ -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)
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
# 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"
|
||||
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 clean install -DskipTests
|
||||
- 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
|
||||
|
|
@ -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
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
4
pom.xml
4
pom.xml
|
|
@ -14,13 +14,13 @@
|
|||
HAPI FHIR
|
||||
-->
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.0.25-SNAPSHOT</version>
|
||||
<version>6.0.26-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<guava_version>32.0.1-jre</guava_version>
|
||||
<hapi_fhir_version>6.4.1</hapi_fhir_version>
|
||||
<validator_test_case_version>1.3.25-SNAPSHOT</validator_test_case_version>
|
||||
<validator_test_case_version>1.3.25</validator_test_case_version>
|
||||
<jackson_version>2.15.2</jackson_version>
|
||||
<junit_jupiter_version>5.9.2</junit_jupiter_version>
|
||||
<junit_platform_launcher_version>1.8.2</junit_platform_launcher_version>
|
||||
|
|
|
|||
Loading…
Reference in New Issue