Skip to content

Commit

Permalink
chore(deps): update all non-major dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Feb 8, 2024
1 parent c67050d commit 733faf3
Show file tree
Hide file tree
Showing 28 changed files with 359 additions and 395 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.25.0",
"version": "0.27.2",
"commands": ["dotnet-csharpier"]
}
}
Expand Down
8 changes: 4 additions & 4 deletions charts/recruit/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ dependencies:
version: 5.2.3
- name: ohdsi
repository: oci://ghcr.io/chgl/charts
version: 0.21.9
version: 0.22.3
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 13.2.27
- name: fhir-pseudonymizer
repository: oci://ghcr.io/miracum/charts
version: 0.5.7
digest: sha256:4f368946f11d32880d68fef79f1f6def7d407897da7e11d34e237b12b5fe0200
generated: "2024-01-13T16:34:38.919972344+01:00"
version: 0.6.3
digest: sha256:8d6e1a0eae2d0b1d846cfe5faa2c4bda040630ec7cf8de0c0b2596e5053deee4
generated: "2024-02-08T13:44:44.135607576Z"
4 changes: 2 additions & 2 deletions charts/recruit/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ dependencies:
- condition: ohdsi.enabled
name: ohdsi
repository: oci://ghcr.io/chgl/charts
version: 0.21.9
version: 0.22.3
- 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.5.7
version: 0.6.3
repository: oci://ghcr.io/miracum/charts
# x-release-please-start-version
version: 10.1.8
Expand Down
2 changes: 1 addition & 1 deletion charts/recruit/values.yaml
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.4.0@sha256:4a3396ae573c44932d06ba33f8696db4429c419da87cbdc82965ee96a37dd0af
tag: 8.6.0@sha256:c3b8bee303c6c6beed656cfc921218c529d65aa61114eb9e27c62047a1271b9b

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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
health-probes:
image: docker.io/curlimages/curl:8.4.0@sha256:4a3396ae573c44932d06ba33f8696db4429c419da87cbdc82965ee96a37dd0af
image: docker.io/curlimages/curl:8.6.0@sha256:c3b8bee303c6c6beed656cfc921218c529d65aa61114eb9e27c62047a1271b9b
ipc: private
security_opt:
- "no-new-privileges:true"
Expand Down
8 changes: 4 additions & 4 deletions docker-compose/docker-compose.staging.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
traefik:
image: docker.io/library/traefik:2.10.5@sha256:948978f7ec62f137a79f8af7044a1785bd7868706ef2c8cba9c88db688d08661
image: docker.io/library/traefik:2.10.7@sha256:6341b98aec5ec8969b99e9730f4c5b22cca3103d42b6bbe4b7a3c910758fe565
restart: unless-stopped
ipc: none
security_opt:
Expand Down Expand Up @@ -36,7 +36,7 @@ services:
memory: 2048m

ohdsi-webapi:
image: docker.io/ohdsi/webapi:2.13.0@sha256:04313754fc79a6e362a8116ef462360e3891581a045924f4ec5ed404fbb9b837
image: docker.io/ohdsi/webapi:2.14.0@sha256:582b59b186fde5936081c1df6e41cba53e45e112d5b4875ddfda1e4dee4b2981
restart: unless-stopped
ipc: none
security_opt:
Expand Down Expand Up @@ -79,7 +79,7 @@ services:
- "traefik.http.routers.ohdsi-webapi.entrypoints=web"

ohdsi-atlas:
image: docker.io/ohdsi/atlas:2.13.0@sha256:e91501a45c96debc83715631a31b3417a37d0ac3020701f9823413ec86cb5b0e
image: docker.io/ohdsi/atlas:2.14.1@sha256:bd095ed794a6619f877d72c13ecfc22c8bb8a863937392857866e4bd6015157f
restart: unless-stopped
ipc: none
security_opt:
Expand All @@ -102,7 +102,7 @@ services:
- "traefik.http.routers.ohdsi-atlas.entrypoints=web"

fhir:
image: docker.io/hapiproject/hapi:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27
image: docker.io/hapiproject/hapi:v6.10.1@sha256:4eac1b3481180b028616d1fab7e657e368538063d75f7ed3be2032e34c657dd4
restart: unless-stopped
cap_drop:
- ALL
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/gradle:8.4.0-jdk17@sha256:70da12adf27e83bcc125af9d2bc6f9432590e89c96609625aa688135b27e75fb AS build
FROM docker.io/library/gradle:8.6.0-jdk17@sha256:05a2d55e715fa98b1bb75a87c9589d349721137ae0825c4ee726907523a62af7 AS build
WORKDIR /home/gradle/src
ENV GRADLE_USER_HOME="/gradle"

Expand Down
6 changes: 3 additions & 3 deletions src/buildSrc/build.gradle
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.1.5'
implementation 'io.spring.gradle:dependency-management-plugin:1.1.3'
implementation 'org.springframework.boot:spring-boot-gradle-plugin:3.2.2'
implementation 'io.spring.gradle:dependency-management-plugin:1.1.4'
implementation 'com.google.cloud.tools:jib-gradle-plugin:3.4.0'
implementation 'com.diffplug.spotless:spotless-plugin-gradle:6.22.0'
implementation 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
implementation 'io.freefair.gradle:lombok-plugin:8.4'
implementation 'de.undercouch:gradle-download-task:5.5.0'
}
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-base:6.8.5'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-client:6.8.5'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:6.8.4'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-client-okhttp:6.8.5'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:6.10.4'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-client:6.10.4'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:6.10.4'
implementation 'ca.uhn.hapi.fhir:hapi-fhir-client-okhttp:6.10.4'

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

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

implementation 'org.postgresql:postgresql:42.6.0'
implementation 'org.postgresql:postgresql:42.7.1'

implementation 'io.micrometer:micrometer-registry-prometheus:1.11.5'
implementation 'io.micrometer:micrometer-core:1.11.5'
implementation 'io.micrometer:micrometer-registry-prometheus:1.12.2'
implementation 'io.micrometer:micrometer-core:1.12.2'

constraints {
implementation('org.apache.commons:commons-text:1.11.0')
Expand Down Expand Up @@ -105,7 +105,7 @@ spotless {
}

checkstyle {
toolVersion '10.12.4'
toolVersion '10.13.0'
configFile = file('../config/checkstyle/checkstyle.xml')
}

Expand Down
Binary file modified src/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion src/gradle/wrapper/gradle-wrapper.properties
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.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 7 additions & 7 deletions src/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
20 changes: 10 additions & 10 deletions src/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
10 changes: 5 additions & 5 deletions src/hack/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
traefik:
image: docker.io/library/traefik:2.10.5@sha256:948978f7ec62f137a79f8af7044a1785bd7868706ef2c8cba9c88db688d08661
image: docker.io/library/traefik:2.10.7@sha256:6341b98aec5ec8969b99e9730f4c5b22cca3103d42b6bbe4b7a3c910758fe565
restart: unless-stopped
ipc: none
security_opt:
Expand All @@ -23,7 +23,7 @@ services:
memory: 128m

fhir:
image: docker.io/hapiproject/hapi:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27
image: docker.io/hapiproject/hapi:v6.10.1@sha256:4eac1b3481180b028616d1fab7e657e368538063d75f7ed3be2032e34c657dd4
restart: unless-stopped
cap_drop:
- ALL
Expand Down Expand Up @@ -84,7 +84,7 @@ services:
- "127.0.0.1:25432:5432"

ohdsi-webapi:
image: docker.io/ohdsi/webapi:2.13.0@sha256:04313754fc79a6e362a8116ef462360e3891581a045924f4ec5ed404fbb9b837
image: docker.io/ohdsi/webapi:2.14.0@sha256:582b59b186fde5936081c1df6e41cba53e45e112d5b4875ddfda1e4dee4b2981
restart: unless-stopped
ipc: none
security_opt:
Expand Down Expand Up @@ -143,7 +143,7 @@ services:
- "traefik.http.routers.ohdsi-webapi.entrypoints=web"

ohdsi-atlas:
image: docker.io/ohdsi/atlas:2.13.0@sha256:e91501a45c96debc83715631a31b3417a37d0ac3020701f9823413ec86cb5b0e
image: docker.io/ohdsi/atlas:2.14.1@sha256:bd095ed794a6619f877d72c13ecfc22c8bb8a863937392857866e4bd6015157f
restart: unless-stopped
ipc: none
security_opt:
Expand Down Expand Up @@ -270,7 +270,7 @@ services:
OTEL_EXPORTER_JAEGER_ENDPOINT: "http://jaeger:14250"

jaeger:
image: docker.io/jaegertracing/all-in-one:1.50.0@sha256:d589499a01e1e2f9d302db8e210af09688076fd8a93278fa024824a755c1a0f1
image: docker.io/jaegertracing/all-in-one:1.54.0@sha256:f4044964505c81bf12131c2dfd1f4ddf1d1421bbbd9d79f691221cac077599a8
ports:
- "127.0.0.1:16686:16686"
- "127.0.0.1:6831:6831/udp"
Expand Down
2 changes: 1 addition & 1 deletion src/list/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/node:20.9.0@sha256:146bbe4eaee99ae885be2a0a767f63a4b96032141d70d80e590f10e0d7ebabcb AS base
FROM docker.io/library/node:20.11.0@sha256:fd0115473b293460df5b217ea73ff216928f2b0bb7650c5e7aa56aae4c028426 AS base
WORKDIR /app

COPY package.json ./
Expand Down
8 changes: 4 additions & 4 deletions src/list/frontend/deploy/docker-compose.dev.yml
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:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27
image: docker.io/hapiproject/hapi:v6.10.1@sha256:4eac1b3481180b028616d1fab7e657e368538063d75f7ed3be2032e34c657dd4
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.4.0@sha256:4a3396ae573c44932d06ba33f8696db4429c419da87cbdc82965ee96a37dd0af
image: docker.io/curlimages/curl:8.6.0@sha256:c3b8bee303c6c6beed656cfc921218c529d65aa61114eb9e27c62047a1271b9b
command: >
sh -c "curl -X POST -H 'Content-Type:application/fhir+json' --retry-connrefuse --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-connrefuse --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.50@sha256:d589499a01e1e2f9d302db8e210af09688076fd8a93278fa024824a755c1a0f1
image: docker.io/jaegertracing/all-in-one:1.54@sha256:f4044964505c81bf12131c2dfd1f4ddf1d1421bbbd9d79f691221cac077599a8
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.1@sha256:5aa89bff83b57d7206ec7c70363623ddfcc22936044325e34cc3075499e436ba
image: ghcr.io/miracum/fhir-pseudonymizer:v2.21.5@sha256:3716c2f31a4d975dc5a301b5799f92a8d5ef126159110e4e57c3cac497bd45d2
environment:
APIKEY: "fhir-pseudonymizer-api-key"
TRACING__ENABLED: "true"
Expand Down
28 changes: 14 additions & 14 deletions src/list/frontend/package.json
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.6.0",
"buefy": "0.9.25",
"core-js": "3.33.2",
"csv-stringify": "6.4.4",
"fhirclient": "2.5.2",
"fhirpath": "3.8.1",
"vue": "2.7.15",
"axios": "1.6.7",
"buefy": "0.9.27",
"core-js": "3.35.1",
"csv-stringify": "6.4.5",
"fhirclient": "2.5.3",
"fhirpath": "3.10.1",
"vue": "2.7.16",
"vue-router": "3.6.5",
"vuejs-logger": "1.5.5"
},
"devDependencies": {
"@babel/eslint-parser": "7.22.15",
"@babel/eslint-parser": "7.23.10",
"@vue/cli-plugin-babel": "5.0.8",
"@vue/cli-plugin-eslint": "5.0.8",
"@vue/cli-plugin-router": "5.0.8",
Expand All @@ -35,14 +35,14 @@
"@vue/test-utils": "1.3.6",
"@vue/vue2-jest": "29.2.2",
"cypress-keycloak": "2.0.1",
"eslint": "8.52.0",
"eslint": "8.56.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-vue": "9.18.1",
"eslint-plugin-vue": "9.21.1",
"jest": "29.7.0",
"pino": "8.16.1",
"sass": "1.69.5",
"sass-loader": "14.0.0",
"vue-template-compiler": "2.7.15"
"pino": "8.18.0",
"sass": "1.70.0",
"sass-loader": "14.1.0",
"vue-template-compiler": "2.7.16"
},
"optionalDependencies": {
"@vue/cli-plugin-e2e-cypress": "5.0.8",
Expand Down
2 changes: 1 addition & 1 deletion src/list/frontend/tests/e2e/cypress.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/cypress/included:13.6.2@sha256:0f48995a7d06113a405534448a6bf6529e324d69a4b3e0e9b2fa02a8308ec2da
FROM docker.io/cypress/included:13.6.4@sha256:2bac8865f25128665d2184b1592623398b4428ea0e1c82e586c82fb65a7aa46b
WORKDIR /root
ENV CI=1

Expand Down
6 changes: 3 additions & 3 deletions src/list/frontend/tests/e2e/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ services:
- ${PWD}/frontend:/root/e2e

fhir:
image: docker.io/hapiproject/hapi:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27
image: docker.io/hapiproject/hapi:v6.10.1@sha256:4eac1b3481180b028616d1fab7e657e368538063d75f7ed3be2032e34c657dd4
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.4.0@sha256:4a3396ae573c44932d06ba33f8696db4429c419da87cbdc82965ee96a37dd0af
image: docker.io/curlimages/curl:8.6.0@sha256:c3b8bee303c6c6beed656cfc921218c529d65aa61114eb9e27c62047a1271b9b
command: >
sh -c "curl -X POST -H 'Content-Type: application/fhir+json' --retry-connrefuse --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-connrefuse --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 @@ services:
- ${PWD}/frontend/deploy/data/aio-export.json:/tmp/realm.json:ro

jaeger:
image: docker.io/jaegertracing/all-in-one:1.50@sha256:d589499a01e1e2f9d302db8e210af09688076fd8a93278fa024824a755c1a0f1
image: docker.io/jaegertracing/all-in-one:1.54@sha256:f4044964505c81bf12131c2dfd1f4ddf1d1421bbbd9d79f691221cac077599a8
Loading

0 comments on commit 733faf3

Please sign in to comment.