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

fix(deps): update all non-major dependencies #131

Merged
merged 4 commits into from
Jan 3, 2025
Merged

fix(deps): update all non-major dependencies #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48eb6eb
fix(deps): update dependency org.springframework.cloud:spring-cloud-d…
renovate[bot] Jan 1, 2025
a28d21c
fix(deps): update all non-major dependencies
renovate[bot] Jan 3, 2025
9980678
Merge remote-tracking branch 'origin/renovate/major-spring-cloud' int…
chgl Jan 3, 2025
24f4cac
chore: update .renovaterc.json to ignore self dependency
chgl Jan 3, 2025
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
3 changes: 2 additions & 1 deletion .renovaterc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
"ignorePaths": ["**/node_modules/**", "**/bower_components/**", "fhir/**"],
"pip-compile": {
"fileMatch": ["(^|/|\\.)requirements\\.txt$"]
}
},
"ignoreDeps": ["ghcr.io/miracum/kafka-fhir-to-server"]
}
2 changes: 1 addition & 1 deletion 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.11.0-jdk21@sha256:09f2f9448e8d490fc7d8f041cf03502c9749ec72aef6307a0042e5d03494b044 AS build
FROM docker.io/library/gradle:8.12.0-jdk21@sha256:74da5b70f4799823c01971487627fd9ad1d3f9146f0f9871e34af2bd86c76b43 AS build
WORKDIR /home/gradle/project

COPY --chown=gradle:gradle . .
Expand Down
18 changes: 9 additions & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'org.springframework.boot' version '3.3.5'
id 'io.spring.dependency-management' version '1.1.6'
id 'org.springframework.boot' version '3.4.1'
id 'io.spring.dependency-management' version '1.1.7'
id 'java'
id 'jacoco'
id 'com.diffplug.spotless' version '6.25.0'
Expand All @@ -26,8 +26,8 @@ repositories {
}

ext {
set('springCloudVersion', '2023.0.3')
set('hapiVersion', '7.4.5')
set('springCloudVersion', '2024.0.0')
set('hapiVersion', '7.6.1')
}

dependencies {
Expand All @@ -40,8 +40,8 @@ dependencies {

implementation 'org.apache.kafka:kafka-streams'

implementation 'io.micrometer:micrometer-registry-prometheus:1.14.1'
implementation 'io.micrometer:micrometer-core:1.14.1'
implementation 'io.micrometer:micrometer-registry-prometheus:1.14.2'
implementation 'io.micrometer:micrometer-core:1.14.2'

implementation 'org.miracum:kafka-fhir-serializer:1.0.8'

Expand All @@ -54,11 +54,11 @@ dependencies {
implementation "ca.uhn.hapi.fhir:hapi-fhir-caching-caffeine:${hapiVersion}"

// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
implementation 'com.fasterxml.jackson.core:jackson-core:2.18.1'
implementation 'com.fasterxml.jackson.core:jackson-core:2.18.2'

implementation 'org.fhir:ucum:1.0.8'
implementation 'org.fhir:ucum:1.0.9'

implementation platform("software.amazon.awssdk:bom:2.29.43")
implementation platform("software.amazon.awssdk:bom:2.29.45")
implementation "software.amazon.awssdk:s3"

testImplementation 'org.springframework.boot:spring-boot-starter-test'
Expand Down
6 changes: 3 additions & 3 deletions compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
fhir:
image: docker.io/hapiproject/hapi:v7.4.0@sha256:f34b41f5002665f384cf344da2d8e653025bd095aa37aa6f5a9d6dc0dac75684
image: docker.io/hapiproject/hapi:v7.6.0@sha256:4771a178e764896c83881c1b3a52bd487e53d06e1acc3653ea0db0c6f6b2b8a1
environment:
HAPI_FHIR_VALIDATION_REQUESTS_ENABLED: "false"
HAPI_FHIR_SUBSCRIPTION_RESTHOOK_ENABLED: "false"
Expand Down Expand Up @@ -49,7 +49,7 @@ services:
- kafka

mock-data-loader:
image: docker.io/confluentinc/cp-kafkacat:7.1.14@sha256:85ef7339cc27b33660d48c6bc3fd7e63317fd359f7f6b1bdc10f091db486b061
image: docker.io/confluentinc/cp-kafkacat:7.1.15@sha256:273c2022aee0cfc0a181acf1801912c45b0e1fb62785711ab2ca64065d072fc7
entrypoint: ["/bin/bash", "-c"]
restart: on-failure
command:
Expand All @@ -62,7 +62,7 @@ services:
- kafka

minio:
image: docker.io/bitnami/minio:2024.11.7-debian-12-r1@sha256:9f2d9c45006a2ada1bc485e1393291ce7d54ae1a46260dd491381a4eb8b2fd47
image: docker.io/bitnami/minio:2024.12.18-debian-12-r0@sha256:cce234b4381a169d80836584d966bb5c82365e5f7f0becfcf2d1cf8c57be754b
environment:
MINIO_ROOT_USER: "admin"
# kics-scan ignore-line
Expand Down
2 changes: 1 addition & 1 deletion 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.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
condition: service_started

wait-for-fhir-server:
image: docker.io/curlimages/curl:8.8.0@sha256:73e4d532ea62d7505c5865b517d3704966ffe916609bedc22af6833dc9969bcd
image: docker.io/curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69
ipc: none
security_opt:
- "no-new-privileges:true"
Expand Down
Loading