Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): update all non-major dependencies #367

Merged
merged 3 commits into from
Oct 22, 2024
Merged

chore(deps): update all non-major dependencies #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a54da02
chore(deps): update all non-major dependencies
renovate[bot] Oct 22, 2024
604424f
chore: downgrade python
chgl Oct 22, 2024
447c0d3
fix hashes
chgl Oct 22, 2024
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 .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.28.2",
"version": "0.29.2",
"commands": ["dotnet-csharpier"]
}
}
Expand Down
10 changes: 5 additions & 5 deletions charts/recruit/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
dependencies:
- name: hapi-fhir-jpaserver
repository: https://hapifhir.github.io/hapi-fhir-jpaserver-starter
version: 0.17.0
version: 0.17.1
- name: mailhog
repository: https://codecentric.github.io/helm-charts
version: 5.2.3
- name: ohdsi
repository: oci://ghcr.io/chgl/charts
version: 0.24.0
version: 0.24.12
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 13.2.27
- name: fhir-pseudonymizer
repository: oci://ghcr.io/miracum/charts
version: 0.7.1
digest: sha256:894a9ff4a95903742b8fa297e10cf976d2fabfb3af8cb0417be14a9b1d199596
generated: "2024-07-31T19:10:34.104012744Z"
version: 0.7.15
digest: sha256:339f783e0f48e30e27a655edbe42af4d6d3c09efcec91063a3ceacae577dbb6a
generated: "2024-10-22T08:51:43.274845629Z"
6 changes: 3 additions & 3 deletions charts/recruit/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@ dependencies:
alias: fhirserver
name: hapi-fhir-jpaserver
repository: https://hapifhir.github.io/hapi-fhir-jpaserver-starter
version: 0.17.0
version: 0.17.1
- condition: mailhog.enabled
name: mailhog
repository: https://codecentric.github.io/helm-charts
version: 5.2.3
- condition: ohdsi.enabled
name: ohdsi
repository: oci://ghcr.io/chgl/charts
version: 0.24.0
version: 0.24.12
- name: postgresql
version: 13.2.27
repository: oci://registry-1.docker.io/bitnamicharts
condition: postgresql.enabled
- condition: fhir-pseudonymizer.enabled
name: fhir-pseudonymizer
version: 0.7.1
version: 0.7.15
repository: oci://ghcr.io/miracum/charts
# x-release-please-start-version
version: 10.1.12
Expand Down
2 changes: 1 addition & 1 deletion charts/recruit/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ curl: # +doc-gen:ignore
image:
registry: docker.io
repository: curlimages/curl
tag: 8.9.1@sha256:8addc281f0ea517409209f76832b6ddc2cabc3264feb1ebbec2a2521ffad24e4
tag: 8.10.1@sha256:d9b4541e214bcd85196d6e92e2753ac6d0ea699f0af5741f8c6cccbfcf00ef4b

broadseaAtlasdb:
# -- whether to deploy the OHDSI Broadsea Atlasdb (<https://github.com/OHDSI/Broadsea-Atlasdb>)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.probe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
health-probes:
image: docker.io/curlimages/curl:8.9.1@sha256:8addc281f0ea517409209f76832b6ddc2cabc3264feb1ebbec2a2521ffad24e4
image: docker.io/curlimages/curl:8.10.1@sha256:d9b4541e214bcd85196d6e92e2753ac6d0ea699f0af5741f8c6cccbfcf00ef4b
ipc: private
security_opt:
- "no-new-privileges:true"
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/docker-compose.staging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
traefik:
image: docker.io/library/traefik:v3.1.1@sha256:9f68c02f50786068f6687128ae8e8632b0bc24bc806705c9ff9fcbe9e38d19ae
image: docker.io/library/traefik:v3.1.6@sha256:f703a2ac2ddf75f6e06c9cccac7f158765e2ab42d642b04e79e2e3d7355c2ddc
restart: unless-stopped
ipc: none
security_opt:
Expand Down Expand Up @@ -102,7 +102,7 @@ services:
- "traefik.http.routers.ohdsi-atlas.entrypoints=web"

fhir:
image: docker.io/hapiproject/hapi:v7.2.0@sha256:9bcafa8342b572eee248cb7c48c496863d352bbd0347e1d98ea238d09620e89b
image: docker.io/hapiproject/hapi:v7.4.0@sha256:f34b41f5002665f384cf344da2d8e653025bd095aa37aa6f5a9d6dc0dac75684
restart: unless-stopped
cap_drop:
- ALL
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/gradle:8.9.0-jdk21@sha256:0c13b320f227a67179fca5d5746ab889c011ed143023c80c5fc8520609fe427f AS build
FROM docker.io/library/gradle:8.10.2-jdk21@sha256:68b2622349ffd414aee2f94901b2d0f6e7b309cfb5550904520e75f5e5ef1053 AS build
WORKDIR /home/gradle/project
ARG OPENTELEMETRY_JAVA_AGENT_VERSION=2.4.0
RUN wget --quiet "https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${OPENTELEMETRY_JAVA_AGENT_VERSION}/opentelemetry-javaagent.jar"
Expand Down
6 changes: 3 additions & 3 deletions src/buildSrc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ repositories {
}

dependencies {
implementation 'org.springframework.boot:spring-boot-gradle-plugin:3.3.2'
implementation 'org.springframework.boot:spring-boot-gradle-plugin:3.3.4'
implementation 'io.spring.gradle:dependency-management-plugin:1.1.6'
implementation 'com.google.cloud.tools:jib-gradle-plugin:3.4.3'
implementation 'com.google.cloud.tools:jib-gradle-plugin:3.4.4'
implementation 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
implementation 'io.freefair.gradle:lombok-plugin:8.6'
implementation 'io.freefair.gradle:lombok-plugin:8.10.2'
implementation 'de.undercouch:gradle-download-task:5.6.0'
}
16 changes: 8 additions & 8 deletions src/buildSrc/src/main/groovy/org.miracum.recruit.java-application-conventions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'

implementation 'ca.uhn.hapi.fhir:hapi-fhir-client:7.2.2'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:7.2.2'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.2.2'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-client-okhttp:7.2.2'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-client:7.4.4'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:7.4.4'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:7.4.4'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-client-okhttp:7.4.4'

implementation 'com.squareup.okhttp3:okhttp:4.12.0'

implementation 'net.logstash.logback:logstash-logback-encoder:8.0'

implementation 'org.postgresql:postgresql:42.7.3'
implementation 'org.postgresql:postgresql:42.7.4'

implementation 'io.micrometer:micrometer-registry-prometheus:1.13.2'
implementation 'io.micrometer:micrometer-core:1.13.2'
implementation 'io.micrometer:micrometer-registry-prometheus:1.13.6'
implementation 'io.micrometer:micrometer-core:1.13.6'

developmentOnly 'org.springframework.boot:spring-boot-devtools'

Expand Down Expand Up @@ -101,7 +101,7 @@ spotless {
}

checkstyle {
toolVersion '10.17.0'
toolVersion '10.18.2'
configFile = file('../config/checkstyle/checkstyle.xml')
}

Expand Down
Binary file modified src/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
8 changes: 4 additions & 4 deletions src/hack/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
traefik:
image: docker.io/library/traefik:v3.1.1@sha256:9f68c02f50786068f6687128ae8e8632b0bc24bc806705c9ff9fcbe9e38d19ae
image: docker.io/library/traefik:v3.1.6@sha256:f703a2ac2ddf75f6e06c9cccac7f158765e2ab42d642b04e79e2e3d7355c2ddc
restart: unless-stopped
ipc: none
security_opt:
Expand All @@ -23,7 +23,7 @@
memory: 128m

fhir:
image: docker.io/hapiproject/hapi:v7.2.0@sha256:9bcafa8342b572eee248cb7c48c496863d352bbd0347e1d98ea238d09620e89b
image: docker.io/hapiproject/hapi:v7.4.0@sha256:f34b41f5002665f384cf344da2d8e653025bd095aa37aa6f5a9d6dc0dac75684
restart: unless-stopped
cap_drop:
- ALL
Expand Down Expand Up @@ -79,7 +79,7 @@
POSTGRES_DB: fhir

broadsea-atlasdb:
image: docker.io/ohdsi/broadsea-atlasdb:2.1.0@sha256:99b4bd5515b3d82adb5bac9b14558b434df55fced6c194c965e3fb1371cb36c5
image: docker.io/ohdsi/broadsea-atlasdb:2.2.0@sha256:ec23023c756ed32426c922a2565af26718100e8cef09c927d0a7b9f07b204935
ports:
- "127.0.0.1:25432:5432"

Expand Down Expand Up @@ -117,7 +117,7 @@
FLYWAY_SCHEMAS: webapi
FLYWAY_BASELINEONMIGRATE: "true"
FLYWAY_TABLE: schema_history
flyway_baselineVersionAsString: "2.2.5.20180212152023" # this env var is case sensitive

Check warning on line 120 in src/hack/docker-compose.yaml

View workflow job for this annotation

GitHub Actions / yamllint 

120:62 [comments] too few spaces before comment
FLYWAY_BASELINEDESCRIPTION: Base Migration
SECURITY_CORS_ENABLED: "true"
SECURITY_ORIGIN: "*"
Expand Down Expand Up @@ -270,7 +270,7 @@
OTEL_EXPORTER_JAEGER_ENDPOINT: "http://jaeger:14250"

jaeger:
image: docker.io/jaegertracing/all-in-one:1.59.0@sha256:e369bd9a8e4a212bfed67aaff59b77ce0676df32828aaccca468a866efcb732b
image: docker.io/jaegertracing/all-in-one:1.62.0@sha256:836e9b69c88afbedf7683ea7162e179de63b1f981662e83f5ebb68badadc710f
ports:
- "127.0.0.1:16686:16686"
- "127.0.0.1:6831:6831/udp"
Expand Down Expand Up @@ -319,7 +319,7 @@
- "no-new-privileges:true"
privileged: false
environment:
POSTGRES_PASSWORD: postgres # pragma: allowlist secret

Check warning on line 322 in src/hack/docker-compose.yaml

View workflow job for this annotation

GitHub Actions / yamllint 

322:35 [comments] too few spaces before comment
POSTGRES_DB: recruit_notify_jobs
ports:
- "127.0.0.1:6432:5432"
Expand Down
2 changes: 1 addition & 1 deletion src/list/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/node:22.5.1-slim@sha256:2fb92fe9d7350866a73c5cc311c1a19919ffd47e8592d4233374ee330e3bdb1e AS base
FROM docker.io/library/node:22.10.0-slim@sha256:e09207f9eca57bc0f93f35f5e252f46ce4c8f86cf2ab4ede5e2a75d1dbc9ae74 AS base
WORKDIR /app

COPY package.json ./
Expand Down
8 changes: 4 additions & 4 deletions src/list/frontend/deploy/docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.9"

services:
fhir:
image: docker.io/hapiproject/hapi:v7.2.0@sha256:9bcafa8342b572eee248cb7c48c496863d352bbd0347e1d98ea238d09620e89b
image: docker.io/hapiproject/hapi:v7.4.0@sha256:f34b41f5002665f384cf344da2d8e653025bd095aa37aa6f5a9d6dc0dac75684
environment:
HAPI_FHIR_VALIDATION_REQUESTS_ENABLED: "true"
HAPI_FHIR_SUBSCRIPTION_RESTHOOK_ENABLED: "true"
Expand All @@ -14,7 +14,7 @@ services:
- 8082:8080

loader:
image: docker.io/curlimages/curl:8.9.1@sha256:8addc281f0ea517409209f76832b6ddc2cabc3264feb1ebbec2a2521ffad24e4
image: docker.io/curlimages/curl:8.10.1@sha256:d9b4541e214bcd85196d6e92e2753ac6d0ea699f0af5741f8c6cccbfcf00ef4b
command: >
sh -c "curl -X POST -H 'Content-Type:application/fhir+json' --retry-connrefused --connect-timeout 30 --max-time 60 --retry 5 --retry-delay 15 --data '@/data/sample-record-1.json' http://fhir:8080/fhir &&
curl -X POST -H 'Content-Type:application/fhir+json' --retry-connrefused --connect-timeout 30 --max-time 60 --retry 5 --retry-delay 15 --data '@/data/sample-record-2.json' http://fhir:8080/fhir &&
Expand All @@ -26,7 +26,7 @@ services:
- fhir

jaeger:
image: docker.io/jaegertracing/all-in-one:1.59@sha256:e369bd9a8e4a212bfed67aaff59b77ce0676df32828aaccca468a866efcb732b
image: docker.io/jaegertracing/all-in-one:1.60@sha256:4fd2d70fa347d6a47e79fcb06b1c177e6079f92cba88b083153d56263082135e
environment:
COLLECTOR_OTLP_ENABLED: "true"
ports:
Expand All @@ -51,7 +51,7 @@ services:
- 8083:8080

fhir-pseudonymizer:
image: ghcr.io/miracum/fhir-pseudonymizer:v2.21.13@sha256:0b922e09ef628d2f99a18fffd237ba261a4e6be87f33aea76e770a0102b3bf58
image: ghcr.io/miracum/fhir-pseudonymizer:v2.22.0@sha256:d999debd8191486b14f18fa509f2a89f4148d8a0b7eca0f440c6f41f9e51708e
environment:
APIKEY: "fhir-pseudonymizer-api-key"
TRACING__ENABLED: "true"
Expand Down
20 changes: 10 additions & 10 deletions src/list/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
"@fortawesome/fontawesome-svg-core": "1.2.36",
"@fortawesome/free-solid-svg-icons": "5.15.4",
"@fortawesome/vue-fontawesome": "2.0.10",
"axios": "1.7.4",
"axios": "1.7.7",
"buefy": "0.9.29",
"core-js": "3.37.1",
"core-js": "3.38.1",
"csv-stringify": "6.5.1",
"fhirclient": "2.5.3",
"fhirpath": "3.14.1",
"fhirclient": "2.5.4",
"fhirpath": "3.15.2",
"vue": "2.7.16",
"vue-router": "3.6.5",
"vuejs-logger": "1.5.5"
},
"devDependencies": {
"@babel/eslint-parser": "7.25.1",
"@babel/eslint-parser": "7.25.8",
"@vue/cli-plugin-babel": "5.0.8",
"@vue/cli-plugin-eslint": "5.0.8",
"@vue/cli-plugin-router": "5.0.8",
Expand All @@ -34,15 +34,15 @@
"@vue/eslint-config-airbnb": "6.0.0",
"@vue/test-utils": "2.4.6",
"@vue/vue2-jest": "29.2.2",
"cypress-keycloak": "2.0.1",
"eslint": "8.57.0",
"cypress-keycloak": "2.0.2",
"eslint": "8.57.1",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-vue": "9.27.0",
"eslint-plugin-vue": "9.29.1",
"jest": "29.7.0",
"sass": "1.77.8",
"sass": "1.80.3",
"sass-loader": "14.2.1",
"vue-template-compiler": "2.7.16",
"pino": "9.3.2"
"pino": "9.5.0"
},
"optionalDependencies": {
"@vue/cli-plugin-e2e-cypress": "5.0.8",
Expand Down
2 changes: 1 addition & 1 deletion src/list/frontend/tests/e2e/cypress.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/cypress/included:13.13.2@sha256:dd58e9bd00587ee6de52bef9400c159048e9e4eb82c67a73d1f54c95229b6677
FROM docker.io/cypress/included:13.15.0@sha256:d2123cf33edc48d3e3f30bd24231459ca5291dcf66b91b0b30b50ffe568eb707
WORKDIR /root
ENV CI=1

Expand Down
6 changes: 3 additions & 3 deletions src/list/frontend/tests/e2e/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
KEYCLOAK_REALM: MIRACUM
KEYCLOAK_AUTH_URL: http://keycloak:8080/auth
RULES_FILE_PATH: /etc/notify-rules.yaml
TRACING_ENABLED: "false" # TODO: fix and re-enable

Check warning on line 10 in src/list/frontend/tests/e2e/docker-compose.yaml

View workflow job for this annotation

GitHub Actions / yamllint 

10:32 [comments] too few spaces before comment
OTEL_EXPORTER_JAEGER_ENDPOINT: "jaeger"
depends_on:
- fhir
Expand All @@ -34,15 +34,15 @@
- ${PWD}/frontend:/root/e2e

fhir:
image: docker.io/hapiproject/hapi:v7.2.0@sha256:9bcafa8342b572eee248cb7c48c496863d352bbd0347e1d98ea238d09620e89b
image: docker.io/hapiproject/hapi:v7.4.0@sha256:f34b41f5002665f384cf344da2d8e653025bd095aa37aa6f5a9d6dc0dac75684
environment:
HAPI_FHIR_VALIDATION_REQUESTS_ENABLED: "true"
HAPI_FHIR_SUBSCRIPTION_RESTHOOK_ENABLED: "true"
HAPI_FHIR_FHIR_VERSION: "R4"
HAPI_FHIR_CORS_ALLOWED_ORIGIN: "http://list:8080"

loader:
image: docker.io/curlimages/curl:8.9.1@sha256:8addc281f0ea517409209f76832b6ddc2cabc3264feb1ebbec2a2521ffad24e4
image: docker.io/curlimages/curl:8.10.1@sha256:d9b4541e214bcd85196d6e92e2753ac6d0ea699f0af5741f8c6cccbfcf00ef4b
command: >
sh -c "curl -X POST -H 'Content-Type: application/fhir+json' --retry-connrefused --connect-timeout 30 --max-time 60 --retry 10 --retry-delay 15 --data '@/data/sample-record-1.json' http://fhir:8080/fhir &&
curl -X POST -H 'Content-Type: application/fhir+json' --retry-connrefused --connect-timeout 30 --max-time 60 --retry 10 --retry-delay 15 --data '@/data/sample-record-2.json' http://fhir:8080/fhir &&
Expand Down Expand Up @@ -70,4 +70,4 @@
- ${PWD}/frontend/deploy/data/aio-export.json:/tmp/realm.json:ro

jaeger:
image: docker.io/jaegertracing/all-in-one:1.59@sha256:e369bd9a8e4a212bfed67aaff59b77ce0676df32828aaccca468a866efcb732b
image: docker.io/jaegertracing/all-in-one:1.60@sha256:4fd2d70fa347d6a47e79fcb06b1c177e6079f92cba88b083153d56263082135e
Loading
Loading