Skip to content

Commit

Permalink
chore(deps): updated all minor and major dependencies (#129)
Browse files Browse the repository at this point in the history
* fix(deps): update hapiversion to v7

* chore(deps): update docker.io/bitnami/kafka:3.6.1 docker digest to 5f0ed16

* chore(deps): update github-actions

* chore(deps): update all non-major dependencies

* chore: fixed curl params

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
chgl and renovate[bot] authored Feb 25, 2024
1 parent e5560b8 commit ecbf196
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 45 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions: read-all

jobs:
build:
uses: miracum/.github/.github/workflows/standard-build.yaml@d312bc78e5a4ab6bafc71979f80962177abc6336 # v1.5.7
uses: miracum/.github/.github/workflows/standard-build.yaml@d09a237ae62959d3cf89d526a035fbd9d9d816ee # v1.5.8
permissions:
contents: read
id-token: write
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
docker compose -p e2e -f deploy/docker-compose.yml -f deploy/docker-compose.gw-deps.yml -f tests/e2e/docker-compose.yml down --volumes --remove-orphans
lint:
uses: miracum/.github/.github/workflows/standard-lint.yaml@d312bc78e5a4ab6bafc71979f80962177abc6336 # v1.5.7
uses: miracum/.github/.github/workflows/standard-lint.yaml@d09a237ae62959d3cf89d526a035fbd9d9d816ee # v1.5.8
permissions:
contents: read
pull-requests: write
Expand All @@ -82,7 +82,7 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}

release:
uses: miracum/.github/.github/workflows/standard-release.yaml@d312bc78e5a4ab6bafc71979f80962177abc6336 # v1.5.7
uses: miracum/.github/.github/workflows/standard-release.yaml@d09a237ae62959d3cf89d526a035fbd9d9d816ee # v1.5.8
needs:
- build
- test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions: read-all

jobs:
schedule:
uses: miracum/.github/.github/workflows/standard-schedule.yaml@d312bc78e5a4ab6bafc71979f80962177abc6336 # v1.5.7
uses: miracum/.github/.github/workflows/standard-schedule.yaml@d09a237ae62959d3cf89d526a035fbd9d9d816ee # v1.5.8
permissions:
contents: read
issues: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# syntax=docker/dockerfile:1.6@sha256:ac85f380a63b13dfcefa89046420e1781752bab202122f8f50032edf31be0021
FROM docker.io/library/gradle:8.5.0-jdk21@sha256:873def2b8a73d00f5616043ac9ff65576b055942701391ad66499f1a1f53f1b2 AS build
FROM docker.io/library/gradle:8.6.0-jdk21@sha256:88bc36f015dbea081cc3e05439a54e37be491d553e8570cc5afe8c6783314161 AS build
WORKDIR /home/gradle/src
ENV GRADLE_USER_HOME /gradle

COPY build.gradle settings.gradle gradle.properties ./
COPY build.gradle settings.gradle ./

RUN gradle --no-daemon build || true

Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "org.springframework.boot" version "3.2.2"
id "org.springframework.boot" version "3.2.3"
id "io.spring.dependency-management" version "1.1.4"
id "java"
id "jacoco"
Expand All @@ -19,7 +19,7 @@ configurations {

ext {
set("springCloudVersion", "2023.0.0")
set("hapiVersion", "6.10.3")
set("hapiVersion", "7.0.0")
}

repositories {
Expand All @@ -39,8 +39,8 @@ dependencies {

implementation "org.miracum:kafka-fhir-serializer:1.0.4"

implementation "io.micrometer:micrometer-registry-prometheus:1.12.2"
implementation "io.micrometer:micrometer-core:1.12.2"
implementation "io.micrometer:micrometer-registry-prometheus:1.12.3"
implementation "io.micrometer:micrometer-core:1.12.3"

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

Expand All @@ -50,7 +50,7 @@ dependencies {
implementation "ca.uhn.hapi.fhir:hapi-fhir-client-okhttp:${hapiVersion}"

developmentOnly "org.springframework.boot:spring-boot-devtools"
runtimeOnly "org.postgresql:postgresql:42.7.1"
runtimeOnly "org.postgresql:postgresql:42.7.2"
runtimeOnly 'com.h2database:h2:2.2.224'
annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
testImplementation "org.springframework.boot:spring-boot-starter-test"
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
- kafka

kafka:
image: docker.io/bitnami/kafka:3.6.1@sha256:57b0c5db94c88574c3345fa62e1835442d7987e91fd1bd09aeefc00d78e93ecf
image: docker.io/bitnami/kafka:3.6.1@sha256:5f0ed16902daa9797f5cc22d872e6e40aac729df031ee1db32ddbb74133faa4c
restart: unless-stopped
cap_drop:
- ALL
Expand Down
18 changes: 9 additions & 9 deletions deploy/docker-compose.gw-deps.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
fhir-pseudonymizer:
image: ghcr.io/miracum/fhir-pseudonymizer:v2.21.5@sha256:3716c2f31a4d975dc5a301b5799f92a8d5ef126159110e4e57c3cac497bd45d2
image: ghcr.io/miracum/fhir-pseudonymizer:v2.21.6@sha256:47149d82a5e24248f97831baf406e5bb02f954016798051dcf4a39f845c3a435
ipc: none
cap_drop:
- ALL
Expand All @@ -19,7 +19,7 @@ services:
- vfps

loinc-converter:
image: ghcr.io/miracum/loinc-conversion:v1.14.5@sha256:5b4e8eb90b32b46cf93a5fa7e26c239793b6f18a548d0021d80fc4a584d22901
image: ghcr.io/miracum/loinc-conversion:v1.14.7@sha256:976a38044f131d773b547c7cbf07f977f9319ba43a661c628720b3d39c11dca6
ipc: none
cap_drop:
- ALL
Expand All @@ -29,7 +29,7 @@ services:
- "no-new-privileges:true"

vfps-db:
image: docker.io/library/postgres:16.1@sha256:09f23e02d76670d3b346a3c00aa33a27cf57aab8341eedfcdaed41459d14f5c4
image: docker.io/library/postgres:16.2@sha256:0e564daae78c2eea56ba57c64711bb9c408a512ce73cf81f9c78623354dd6976
restart: unless-stopped
ipc: private
security_opt:
Expand All @@ -41,7 +41,7 @@ services:
POSTGRES_DB: vfps

vfps:
image: ghcr.io/miracum/vfps:v1.3.2@sha256:3f53189024ab609b3b25f08b8270f9880a2d710d68e46d2d7a5e6258085de3d4
image: ghcr.io/miracum/vfps:v1.3.3@sha256:63f37d0541dc9742538cd65292abe314f668ff71308c3a68c8cc15f1281cc903
restart: unless-stopped
ipc: none
cap_drop:
Expand Down Expand Up @@ -80,7 +80,7 @@ services:
privileged: false

fhir-db:
image: docker.io/library/postgres:16.1@sha256:09f23e02d76670d3b346a3c00aa33a27cf57aab8341eedfcdaed41459d14f5c4
image: docker.io/library/postgres:16.2@sha256:0e564daae78c2eea56ba57c64711bb9c408a512ce73cf81f9c78623354dd6976
ipc: private
security_opt:
- "no-new-privileges:true"
Expand All @@ -91,7 +91,7 @@ services:
POSTGRES_DB: fhir

vfps-init-patient:
image: docker.io/curlimages/curl:8.5.0@sha256:08e466006f0860e54fc299378de998935333e0e130a15f6f98482e9f8dab3058
image: docker.io/curlimages/curl:8.6.0@sha256:c3b8bee303c6c6beed656cfc921218c529d65aa61114eb9e27c62047a1271b9b
ipc: none
cap_drop:
- ALL
Expand All @@ -103,7 +103,7 @@ services:
-X POST
-H 'Content-Type: application/json'
--fail
--retry-connrefuse
--retry-connrefused
--connect-timeout 10
--max-time 120
--retry 10
Expand All @@ -115,7 +115,7 @@ services:
condition: service_started

vfps-init-fall:
image: docker.io/curlimages/curl:8.5.0@sha256:08e466006f0860e54fc299378de998935333e0e130a15f6f98482e9f8dab3058
image: docker.io/curlimages/curl:8.6.0@sha256:c3b8bee303c6c6beed656cfc921218c529d65aa61114eb9e27c62047a1271b9b
ipc: none
cap_drop:
- ALL
Expand All @@ -127,7 +127,7 @@ services:
-X POST
-H 'Content-Type: application/json'
--fail
--retry-connrefuse
--retry-connrefused
--connect-timeout 10
--max-time 120
--retry 10
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
gateway:
image: ${FHIR_GATEWAY_IMAGE_NAME:-ghcr.io/miracum/fhir-gateway:v3.12.7@sha256:89756be53946402788235bcddc4161fa2c0b7614e2c76b1daf605d790e1039b3}
image: ${FHIR_GATEWAY_IMAGE_NAME:-ghcr.io/miracum/fhir-gateway:v3.12.8@sha256:00fcc8dc204e3a0759d25c7f45f31917649031bfc31328fee8fc52dfea9b4442}
restart: on-failure
cap_drop:
- ALL
Expand Down
11 changes: 0 additions & 11 deletions gradle.properties

This file was deleted.

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.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions 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

0 comments on commit ecbf196

Please sign in to comment.