diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b1c1b2a..447f8127 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ permissions: read-all jobs: build: - uses: miracum/.github/.github/workflows/standard-build.yaml@392030c6f94fcfaa509a606af2b0907d022f2257 # v1.8.3 + uses: miracum/.github/.github/workflows/standard-build.yaml@6e79e87ffce2b28fa1052cbe3ac78f9ab7a2ea77 # v1.11.3 permissions: contents: read id-token: write @@ -80,7 +80,7 @@ jobs: contents: read steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Create KinD cluster uses: helm/kind-action@0025e74a8c7512023d06dc019c617aa3cf561fde # v1.10.0 @@ -138,14 +138,14 @@ jobs: - name: Upload cluster dump if: always() - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 with: name: kind-cluster-dump.txt path: | kind-cluster-dump.txt lint: - uses: miracum/.github/.github/workflows/standard-lint.yaml@392030c6f94fcfaa509a606af2b0907d022f2257 # v1.8.3 + uses: miracum/.github/.github/workflows/standard-lint.yaml@6e79e87ffce2b28fa1052cbe3ac78f9ab7a2ea77 # v1.11.3 permissions: contents: read pull-requests: write @@ -159,7 +159,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} release: - uses: miracum/.github/.github/workflows/standard-release.yaml@392030c6f94fcfaa509a606af2b0907d022f2257 # v1.8.3 + uses: miracum/.github/.github/workflows/standard-release.yaml@6e79e87ffce2b28fa1052cbe3ac78f9ab7a2ea77 # v1.11.3 needs: - build permissions: diff --git a/.github/workflows/lint-pr-title.yaml b/.github/workflows/lint-pr-title.yaml index 0f8ff7ba..dac8af31 100644 --- a/.github/workflows/lint-pr-title.yaml +++ b/.github/workflows/lint-pr-title.yaml @@ -16,6 +16,6 @@ jobs: permissions: pull-requests: write steps: - - uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f # v5 + - uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/schedule.yaml b/.github/workflows/schedule.yaml index 23bdfe79..5511d6b4 100644 --- a/.github/workflows/schedule.yaml +++ b/.github/workflows/schedule.yaml @@ -10,7 +10,7 @@ permissions: read-all jobs: schedule: - uses: miracum/.github/.github/workflows/standard-schedule.yaml@392030c6f94fcfaa509a606af2b0907d022f2257 # v1.8.3 + uses: miracum/.github/.github/workflows/standard-schedule.yaml@6e79e87ffce2b28fa1052cbe3ac78f9ab7a2ea77 # v1.11.3 permissions: contents: read issues: write diff --git a/.github/workflows/scorecard.yaml b/.github/workflows/scorecard.yaml index c05bce4a..419131c8 100644 --- a/.github/workflows/scorecard.yaml +++ b/.github/workflows/scorecard.yaml @@ -32,12 +32,12 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1 + uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3 with: results_file: results.sarif results_format: sarif @@ -67,6 +67,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@ceaec5c11a131e0d282ff3b6f095917d234caace # v2.25.3 + uses: github/codeql-action/upload-sarif@e113c555ef0956479345cfc3ed530c938d670db0 # v2.25.12 with: sarif_file: results.sarif diff --git a/.github/workflows/validate-fhir-resources.yaml b/.github/workflows/validate-fhir-resources.yaml index 0afea798..73ac9c5f 100644 --- a/.github/workflows/validate-fhir-resources.yaml +++ b/.github/workflows/validate-fhir-resources.yaml @@ -12,10 +12,10 @@ jobs: validate-fhir-resource: name: Validate FHIR resources runs-on: ubuntu-22.04 - container: ghcr.io/miracum/ig-build-tools:v2.0.55@sha256:21cab0f2b6b3c73a68f1c0e74d5d09f3171a14d294d640a862d51977e9f828e4 + container: ghcr.io/miracum/ig-build-tools:v2.1.3@sha256:171494f5e32d29c2865e071359e17f96a73fdfff7652e354a05a83c5582cc4c7 steps: - name: Checkout code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Restore FHIR package dependencies run: | diff --git a/build.gradle b/build.gradle index e758ee7c..a0c39de1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'org.springframework.boot' version '3.2.2' - id 'io.spring.dependency-management' version '1.1.4' + id 'org.springframework.boot' version '3.3.2' + id 'io.spring.dependency-management' version '1.1.6' id 'jacoco' id 'java' id 'com.diffplug.spotless' version '6.25.0' - id "io.freefair.lombok" version "8.4" + id "io.freefair.lombok" version "8.6" } group = 'org.miracum.streams.ume' @@ -23,8 +23,8 @@ repositories { } ext { - set('springCloudVersion', "2023.0.0") - set('hapiVersion', "6.10.4") + set('springCloudVersion', "2023.0.3") + set('hapiVersion', "6.10.5") } dependencies { @@ -34,11 +34,11 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator" implementation "org.springframework.boot:spring-boot-starter-web" implementation "ca.uhn.hapi.fhir:hapi-fhir-structures-r4:${hapiVersion}" - implementation 'io.micrometer:micrometer-registry-prometheus:1.12.2' - implementation 'io.micrometer:micrometer-core:1.12.2' - implementation "org.miracum:kafka-fhir-serializer:1.0.4" - implementation "org.apache.commons:commons-text:1.11.0" - implementation "org.scala-lang:scala-library:2.13.12" + implementation 'io.micrometer:micrometer-registry-prometheus:1.13.2' + implementation 'io.micrometer:micrometer-core:1.13.2' + implementation "org.miracum:kafka-fhir-serializer:1.0.6" + implementation "org.apache.commons:commons-text:1.12.0" + implementation "org.scala-lang:scala-library:2.13.14" implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' // Jackson v3 supports Optional out-of-the-box but isn't yet provided by Spring Boot by default @@ -52,7 +52,7 @@ dependencies { testImplementation "ca.uhn.hapi.fhir:hapi-fhir-validation-resources-r4:${hapiVersion}" testImplementation "org.springframework.boot:spring-boot-starter-test" testImplementation "org.springframework.cloud:spring-cloud-stream-test-support" - testImplementation "com.approvaltests:approvaltests:22.3.3" + testImplementation "com.approvaltests:approvaltests:22.4.0" } dependencyManagement { @@ -66,7 +66,7 @@ tasks.named('test') { } jacoco { - toolVersion = "0.8.11" + toolVersion = "0.8.12" } spotless { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd491..2c352119 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index 1aa94a42..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e4..9b42019c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/package.json b/package.json index cfdb3310..d3916289 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Creates FHIR resources from oBDS-XML data", "dependencies": { "hl7.fhir.r4.core": "4.0.1", - "de.dktk.oncology": "1.3.0", + "de.dktk.oncology": "1.6.0", "de.medizininformatikinitiative.kerndatensatz.person": "2024.0.0" }, "fhirVersions": [