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.

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

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

Merged
merged 1 commit into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:8.6.0-jdk17-alpine@sha256:9c5f1d6b88d7c6e97db10d4cacfbb44cfdf957fa4e11a3012316e811ab9da49c AS build
FROM gradle:8.9.0-jdk17-alpine@sha256:1b2cc1b2eafa12bd1240b419fa26eb8c87bebc6ca4090d097b98dcb64b8be8ed AS build
WORKDIR /home/gradle/src
ENV GRADLE_USER_HOME /gradle

Expand Down
24 changes: 12 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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 {
Expand All @@ -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'

Expand All @@ -48,7 +48,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 {
Expand All @@ -62,7 +62,7 @@ tasks.named('test') {
}

jacoco {
toolVersion = "0.8.11"
toolVersion = "0.8.12"
}

spotless {
Expand Down
8 changes: 4 additions & 4 deletions deploy/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- ./oracle/init:/docker-entrypoint-initdb.d/setup

zoo1:
image: zookeeper:3.9.1
image: zookeeper:3.9.2
restart: unless-stopped
hostname: zoo1
ports:
Expand All @@ -24,7 +24,7 @@ services:
ZOO_SERVERS: server.1=zoo1:2888:3888;2181

kafka1:
image: confluentinc/cp-kafka:7.5.3@sha256:51145a40d23336a11085ca695d02bdeee66fe01b582837c6d223384952226be9
image: confluentinc/cp-kafka:7.6.2@sha256:29c57d630410981edb82a09806b2a7fbbcda51029e6e89283a843e64e68b29c1
hostname: kafka1
ports:
- "9092:9092"
Expand All @@ -40,7 +40,7 @@ services:
- zoo1

kafka-connect:
image: confluentinc/cp-kafka-connect:7.5.3@sha256:e6bc1b88b43a23de290da574b0bbc06135b0005ecb9cac0c95155d3ff50f283a
image: confluentinc/cp-kafka-connect:7.6.2@sha256:7e6aca3d6f60c6458cea2b35458f78c16183fb3a5b230ae16c33eaab5dd6a896
hostname: kafka-connect
ports:
- "8083:8083"
Expand All @@ -67,7 +67,7 @@ services:
- kafka1

akhq:
image: tchiotludo/akhq:0.24.0
image: tchiotludo/akhq:0.25.1
environment:
AKHQ_CONFIGURATION: |
akhq:
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion 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.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -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/.
Expand Down Expand Up @@ -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
Expand Down
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##########################################################################
Expand Down Expand Up @@ -43,11 +45,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 +59,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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "Creates FHIR resources from oBDS-XML data",
"dependencies": {
"hl7.fhir.r4.core": "4.0.1",
"de.dktk.oncology": "1.3.0",
"de.medizininformatikinitiative.kerndatensatz.person": "2024.0.0-ballot"
"de.dktk.oncology": "1.6.0",
"de.medizininformatikinitiative.kerndatensatz.person": "2024.0.0"
},
"fhirVersions": [
"4.0.1"
Expand Down
Loading