diff --git a/charts/recruit/Chart.lock b/charts/recruit/Chart.lock index 6b3fa0f22..e11283bd0 100644 --- a/charts/recruit/Chart.lock +++ b/charts/recruit/Chart.lock @@ -7,12 +7,12 @@ dependencies: version: 5.2.3 - name: ohdsi repository: oci://ghcr.io/chgl/charts - version: 0.21.4 + version: 0.21.5 - name: postgresql repository: oci://registry-1.docker.io/bitnamicharts version: 12.5.6 - name: fhir-pseudonymizer repository: oci://ghcr.io/miracum/charts - version: 0.4.2 -digest: sha256:c0a958c4084656506f0214b26b5517c6103105f6342d491500314c0e73077ed3 -generated: "2023-06-04T20:46:38.882465413+02:00" + version: 0.4.3 +digest: sha256:be0c1ee70c87cd1878f2f9b68bc94de38df65aa64c7eb3cd2d3a0c0b778b16da +generated: "2023-06-15T22:00:29.20463338Z" diff --git a/charts/recruit/Chart.yaml b/charts/recruit/Chart.yaml index 962c489a7..1394570b9 100644 --- a/charts/recruit/Chart.yaml +++ b/charts/recruit/Chart.yaml @@ -30,14 +30,14 @@ dependencies: - condition: ohdsi.enabled name: ohdsi repository: oci://ghcr.io/chgl/charts - version: 0.21.4 + version: 0.21.5 - name: postgresql version: 12.5.6 repository: oci://registry-1.docker.io/bitnamicharts condition: postgresql.enabled - condition: fhir-pseudonymizer.enabled name: fhir-pseudonymizer - version: 0.4.2 + version: 0.4.3 repository: oci://ghcr.io/miracum/charts # x-release-please-start-version version: 10.1.2 diff --git a/charts/recruit/values.yaml b/charts/recruit/values.yaml index 022c16116..61b465b12 100644 --- a/charts/recruit/values.yaml +++ b/charts/recruit/values.yaml @@ -669,7 +669,7 @@ curl: # +doc-gen:ignore image: registry: docker.io repository: curlimages/curl - tag: 8.00.1@sha256:9e886c104cae1072f7874c9c214f77c6758f2e8a477234e32eda5fcbfa41f225 + tag: 8.1.2@sha256:fcf8b68aa7af25898d21b47096ceb05678665ae182052283bd0d7128149db55f broadseaAtlasdb: # -- whether to deploy the OHDSI Broadsea Atlasdb () diff --git a/src/buildSrc/build.gradle b/src/buildSrc/build.gradle index fb5492edf..37b67a4e3 100644 --- a/src/buildSrc/build.gradle +++ b/src/buildSrc/build.gradle @@ -15,10 +15,10 @@ repositories { } dependencies { - implementation 'org.springframework.boot:spring-boot-gradle-plugin:3.0.6' + implementation 'org.springframework.boot:spring-boot-gradle-plugin:3.1.0' implementation 'io.spring.gradle:dependency-management-plugin:1.1.0' - implementation 'com.google.cloud.tools:jib-gradle-plugin:3.3.1' - implementation 'com.diffplug.spotless:spotless-plugin-gradle:6.18.0' + implementation 'com.google.cloud.tools:jib-gradle-plugin:3.3.2' + implementation 'com.diffplug.spotless:spotless-plugin-gradle:6.19.0' implementation 'io.freefair.gradle:lombok-plugin:6.6.3' implementation 'de.undercouch:gradle-download-task:5.4.0' } diff --git a/src/buildSrc/src/main/groovy/org.miracum.recruit.java-application-conventions.gradle b/src/buildSrc/src/main/groovy/org.miracum.recruit.java-application-conventions.gradle index 10a1f45b5..b1f0123b9 100644 --- a/src/buildSrc/src/main/groovy/org.miracum.recruit.java-application-conventions.gradle +++ b/src/buildSrc/src/main/groovy/org.miracum.recruit.java-application-conventions.gradle @@ -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.4.4' - implementation 'ca.uhn.hapi.fhir:hapi-fhir-client:6.4.4' - implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:6.4.4' - implementation 'ca.uhn.hapi.fhir:hapi-fhir-client-okhttp:6.4.4' + implementation 'ca.uhn.hapi.fhir:hapi-fhir-base:6.6.1' + implementation 'ca.uhn.hapi.fhir:hapi-fhir-client:6.6.1' + implementation 'ca.uhn.hapi.fhir:hapi-fhir-structures-r4:6.6.1' + implementation 'ca.uhn.hapi.fhir:hapi-fhir-client-okhttp:6.6.1' - implementation 'com.squareup.okhttp3:okhttp:4.10.0' + implementation 'com.squareup.okhttp3:okhttp:4.11.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.3' implementation 'org.postgresql:postgresql:42.6.0' - implementation 'io.micrometer:micrometer-registry-prometheus:1.10.5' - implementation 'io.micrometer:micrometer-core:1.10.5' + implementation 'io.micrometer:micrometer-registry-prometheus:1.11.1' + implementation 'io.micrometer:micrometer-core:1.11.1' constraints { implementation('org.apache.commons:commons-text:1.10.0') @@ -89,7 +89,7 @@ bootJar { } jacoco { - toolVersion '0.8.9' + toolVersion '0.8.10' } jacocoTestReport { @@ -105,7 +105,7 @@ spotless { } checkstyle { - toolVersion '10.9.3' + toolVersion '10.12.0' configFile = file('../config/checkstyle/checkstyle.xml') } diff --git a/src/gradle/wrapper/gradle-wrapper.properties b/src/gradle/wrapper/gradle-wrapper.properties index bdc9a83b1..37aef8d3f 100644 --- a/src/gradle/wrapper/gradle-wrapper.properties +++ b/src/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/notify/build.gradle b/src/notify/build.gradle index 2d4b4ce2f..7f8988d00 100644 --- a/src/notify/build.gradle +++ b/src/notify/build.gradle @@ -17,7 +17,7 @@ dependencies { implementation 'org.springframework.retry:spring-retry:1.3.4' // https://mvnrepository.com/artifact/jakarta.mail/jakarta.mail-api - implementation 'jakarta.mail:jakarta.mail-api:2.1.1' + implementation 'jakarta.mail:jakarta.mail-api:2.1.2' testImplementation 'ognl:ognl:3.3.4' } diff --git a/src/query/build.gradle b/src/query/build.gradle index 0cdce03ff..e2f09fd3f 100644 --- a/src/query/build.gradle +++ b/src/query/build.gradle @@ -12,23 +12,23 @@ plugins { dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.apache.camel:camel-sql:4.0.0-M2' - implementation 'org.apache.camel:camel-jackson:4.0.0-M2' - implementation 'org.apache.camel:camel-jsonpath:4.0.0-M2' - implementation 'org.apache.camel:camel-fhir:4.0.0-M2' - implementation 'org.apache.camel:camel-http:4.0.0-M2' - implementation 'org.apache.camel:camel-cron:4.0.0-M2' + implementation 'org.apache.camel:camel-sql:4.0.0-M3' + implementation 'org.apache.camel:camel-jackson:4.0.0-M3' + implementation 'org.apache.camel:camel-jsonpath:4.0.0-M3' + implementation 'org.apache.camel:camel-fhir:4.0.0-M3' + implementation 'org.apache.camel:camel-http:4.0.0-M3' + implementation 'org.apache.camel:camel-cron:4.0.0-M3' - implementation 'org.apache.camel.springboot:camel-rest-starter:4.0.0-M2' - implementation 'org.apache.camel.springboot:camel-servlet-starter:4.0.0-M2' - implementation 'org.apache.camel.springboot:camel-spring-boot-starter:4.0.0-M2' - implementation 'org.apache.camel.springboot:camel-micrometer-starter:4.0.0-M2' + implementation 'org.apache.camel.springboot:camel-rest-starter:4.0.0-M3' + implementation 'org.apache.camel.springboot:camel-servlet-starter:4.0.0-M3' + implementation 'org.apache.camel.springboot:camel-spring-boot-starter:4.0.0-M3' + implementation 'org.apache.camel.springboot:camel-micrometer-starter:4.0.0-M3' - implementation 'com.fasterxml.jackson.core:jackson-annotations:2.14.2' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.2' - implementation 'net.minidev:json-smart:2.4.10' + implementation 'net.minidev:json-smart:2.4.11' - implementation 'com.github.slugify:slugify:3.0.2' + implementation 'com.github.slugify:slugify:3.0.5' testImplementation 'com.approvaltests:approvaltests:18.6.0' testImplementation 'com.google.code.gson:gson:2.10.1' diff --git a/src/query/tests/e2e/requirements.in b/src/query/tests/e2e/requirements.in index 8065546c6..6d1bef1d0 100644 --- a/src/query/tests/e2e/requirements.in +++ b/src/query/tests/e2e/requirements.in @@ -1,3 +1,3 @@ fhirclient==4.1.0 -pytest==7.2.2 +pytest==7.3.2 retrying==1.3.4 diff --git a/src/query/tests/e2e/requirements.txt b/src/query/tests/e2e/requirements.txt index 338abb8fa..4154284d1 100644 --- a/src/query/tests/e2e/requirements.txt +++ b/src/query/tests/e2e/requirements.txt @@ -4,10 +4,6 @@ # # pip-compile --generate-hashes requirements.in # -attrs==23.1.0 \ - --hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \ - --hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015 - # via pytest certifi==2023.5.7 \ --hash=sha256:0f0d56dc5a6ad56fd4ba36484d6cc34451e1c6548c61daad8c320169f91eddc7 \ --hash=sha256:c6c2e98f5c7869efca1f8916fed228dd91539f9f1b444c314c06eef02980c716 @@ -113,9 +109,9 @@ pluggy==1.0.0 \ --hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \ --hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3 # via pytest -pytest==7.2.2 \ - --hash=sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e \ - --hash=sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4 +pytest==7.3.2 \ + --hash=sha256:cdcbd012c9312258922f8cd3f1b62a6580fdced17db6014896053d47cddf9295 \ + --hash=sha256:ee990a3cc55ba808b80795a79944756f315c67c12b56abd3ac993a7b8c17030b # via -r requirements.in requests==2.31.0 \ --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ @@ -131,7 +127,7 @@ six==1.16.0 \ # via # isodate # retrying -urllib3==2.0.2 \ - --hash=sha256:61717a1095d7e155cdb737ac7bb2f4324a858a1e2e6466f6d03ff630ca68d3cc \ - --hash=sha256:d055c2f9d38dc53c808f6fdc8eab7360b6fdbbde02340ed25cfbcd817c62469e +urllib3==2.0.3 \ + --hash=sha256:48e7fafa40319d358848e1bc6809b208340fafe2096f1725d05d67443d0483d1 \ + --hash=sha256:bee28b5e56addb8226c96f7f13ac28cb4c301dd5ea8a6ca179c0b9835e032825 # via requests diff --git a/tests/chaos/tester/tester.csproj b/tests/chaos/tester/tester.csproj index 3650e8ab8..9eeee54b4 100644 --- a/tests/chaos/tester/tester.csproj +++ b/tests/chaos/tester/tester.csproj @@ -8,8 +8,8 @@ - - + +