Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
quality_checks:
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
needs: [get_asdf_version]
secrets:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
quality_checks:
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
needs: [get_asdf_version]
with:
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
quality_checks:
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
needs: [get_asdf_version]
secrets:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Expand Down
20 changes: 20 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# various vulnerabilities due to running an old version of hapi-fhir
CVE-2023-24057
CVE-2023-28465
CVE-2024-51132
CVE-2024-55887
CVE-2022-42889
CVE-2024-45294
CVE-2024-52007
CVE-2024-45294
CVE-2024-52007
CVE-2024-45294
CVE-2024-52007
CVE-2024-45294
CVE-2024-52007
CVE-2024-45294
CVE-2024-52007
CVE-2021-35515
CVE-2021-35516
CVE-2021-35517
CVE-2021-36090
10 changes: 3 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,9 @@ lint-githubaction-scripts:
test: download-dependencies
mvn test

check-licenses: check-licenses-python check-licenses-java

check-licenses-python:
scripts/check_python_licenses.sh

check-licenses-java:
mvn validate
check-licenses:
echo "not implemented from console"
exit 1

show-unused-dependencies:
mvn dependency:analyze
Expand Down
8 changes: 0 additions & 8 deletions licenses/allowedMissingLicense.xml

This file was deleted.

153 changes: 0 additions & 153 deletions licenses/licenses.xml

This file was deleted.

50 changes: 1 addition & 49 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 0 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -175,27 +175,6 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>se.ayoy.maven-plugins</groupId>
<artifactId>ayoy-license-verifier-maven-plugin</artifactId>
<version>1.2.0</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration>
<licenseFile>${project.basedir}/licenses/licenses.xml</licenseFile>
<excludedMissingLicensesFile>
${project.basedir}/licenses/allowedMissingLicense.xml</excludedMissingLicensesFile>
<failOnForbidden>true</failOnForbidden>
<failOnMissing>true</failOnMissing>
<failOnUnknown>true</failOnUnknown>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.9.0</version>
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ flake8 = "^7.3.0"
requests = "^2.32.5"

[tool.poetry.group.dev.dependencies]
pip-licenses = "^5.0.0"
pre-commit = "^4.5.1"
cfn-lint = "^1.43.2"

Expand Down
2 changes: 2 additions & 0 deletions trivy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
license:
ignored: ["LGPL-2.1-only", "GPL-2.0-with-classpath-exception"]
Loading