diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml index 7b7fc23fd..b2fc78445 100644 --- a/.github/workflows/build-mariadb.yml +++ b/.github/workflows/build-mariadb.yml @@ -18,7 +18,7 @@ jobs: options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=5s --health-timeout=2s --health-retries=3 mock-oauth2-server: - image: ghcr.io/navikt/mock-oauth2-server:2.1.9 + image: ghcr.io/navikt/mock-oauth2-server:2.1.10 ports: - 9000:9000 env: diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml index a14afa758..9394e0af5 100644 --- a/.github/workflows/build-mysql.yml +++ b/.github/workflows/build-mysql.yml @@ -18,7 +18,7 @@ jobs: options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3 mock-oauth2-server: - image: ghcr.io/navikt/mock-oauth2-server:2.1.9 + image: ghcr.io/navikt/mock-oauth2-server:2.1.10 ports: - 9000:9000 env: diff --git a/.github/workflows/build-postgresql.yml b/.github/workflows/build-postgresql.yml index 8d4106a50..77ec80601 100644 --- a/.github/workflows/build-postgresql.yml +++ b/.github/workflows/build-postgresql.yml @@ -19,7 +19,7 @@ jobs: options: --health-cmd="pg_isready -q -d postgres -U root" --health-interval=5s --health-timeout=2s --health-retries=3 mock-oauth2-server: - image: ghcr.io/navikt/mock-oauth2-server:2.1.9 + image: ghcr.io/navikt/mock-oauth2-server:2.1.10 ports: - 9000:9000 env: diff --git a/build.gradle b/build.gradle index cba4529df..556483d97 100644 --- a/build.gradle +++ b/build.gradle @@ -95,20 +95,20 @@ plugins { id 'com.github.hierynomus.license' version '0.16.1' apply false id 'com.github.jk1.dependency-license-report' version '2.9' apply false id 'org.zeroturnaround.gradle.jrebel' version '1.2.0' apply false - id 'org.springframework.boot' version '3.3.4' apply false + id 'org.springframework.boot' version '3.3.5' apply false id 'net.ltgt.errorprone' version '3.1.0' apply false - id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.23' apply false + id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.25' apply false id 'com.gorylenko.gradle-git-properties' version '2.4.2' apply false id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false - id 'com.google.cloud.tools.jib' version '3.4.3' apply false + id 'com.google.cloud.tools.jib' version '3.4.4' apply false id 'org.sonarqube' version '4.4.1.3373' - id 'com.github.andygoossens.modernizer' version '1.9.3' apply false + id 'com.github.andygoossens.modernizer' version '1.10.0' apply false // TODO: upgrade to 6.0.4 - id 'com.github.spotbugs' version '6.0.24' apply false + id 'com.github.spotbugs' version '6.0.26' apply false id 'se.thinkcode.cucumber-runner' version '0.0.11' apply false id "com.github.davidmc24.gradle.plugin.avro-base" version "1.9.1" apply false - id 'org.openapi.generator' version '7.8.0' apply false + id 'org.openapi.generator' version '7.9.0' apply false } apply from: "${rootDir}/buildSrc/src/main/groovy/org.apache.fineract.release.gradle" diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle index 09314a214..2e4b1c5a4 100644 --- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle +++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle @@ -24,18 +24,18 @@ dependencyManagement { imports { mavenBom 'com.squareup.okhttp3:okhttp-bom:4.12.0' mavenBom 'org.slf4j:slf4j-bom:2.0.16' - mavenBom 'io.micrometer:micrometer-bom:1.13.5' - mavenBom 'org.springframework:spring-framework-bom:6.1.13' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.3.4' - mavenBom 'io.awspring.cloud:spring-cloud-aws-dependencies:3.2.0' - mavenBom 'io.opentelemetry:opentelemetry-bom:1.43.0' + mavenBom 'io.micrometer:micrometer-bom:1.13.6' + mavenBom 'org.springframework:spring-framework-bom:6.1.14' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.3.5' + mavenBom 'io.awspring.cloud:spring-cloud-aws-dependencies:3.2.1' + mavenBom 'io.opentelemetry:opentelemetry-bom:1.44.1' mavenBom 'org.jetbrains.kotlin:kotlin-bom:2.0.21' - mavenBom 'org.junit:junit-bom:5.11.2' - mavenBom 'com.fasterxml.jackson:jackson-bom:2.18.0' + mavenBom 'org.junit:junit-bom:5.11.3' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.18.1' mavenBom 'io.cucumber:cucumber-bom:7.20.1' mavenBom 'io.netty:netty-bom:4.1.114.Final' - mavenBom 'org.mockito:mockito-bom:5.14.1' - mavenBom 'software.amazon.awssdk:bom:2.28.21' + mavenBom 'org.mockito:mockito-bom:5.14.2' + mavenBom 'software.amazon.awssdk:bom:2.29.9' mavenBom 'io.github.resilience4j:resilience4j-bom:2.2.0' } @@ -44,8 +44,8 @@ dependencyManagement { // We do not use :+ to get the latest available version available on Maven Central, as that could suddenly break things. // We use the Renovate Bot to automatically propose Pull Requests (PRs) when upgrades for all of these versions are available. - dependency 'ch.qos.logback:logback-core:1.5.10' - dependency 'ch.qos.logback:logback-classic:1.5.10' + dependency 'ch.qos.logback:logback-core:1.5.12' + dependency 'ch.qos.logback:logback-classic:1.5.12' dependency 'ch.qos.logback.contrib:logback-json-classic:0.1.5' dependency 'ch.qos.logback.contrib:logback-jackson:0.1.5' dependency 'org.codehaus.janino:janino:3.1.12' @@ -156,8 +156,8 @@ dependencyManagement { dependency "commons-codec:commons-codec:1.17.1" dependency "org.projectlombok:lombok:1.18.34" - dependency 'org.bouncycastle:bcpkix-jdk15to18:1.78.1' - dependency 'org.bouncycastle:bcprov-jdk15to18:1.78.1' + dependency 'org.bouncycastle:bcpkix-jdk15to18:1.79' + dependency 'org.bouncycastle:bcprov-jdk15to18:1.79' dependency 'org.bouncycastle:bcprov-jdk15on:1.70' dependency 'org.bouncycastle:bcpg-jdk15on:1.70' @@ -196,10 +196,10 @@ dependencyManagement { exclude 'jakarta.activation:jakarta.activation-api' } - dependency ('org.liquibase:liquibase-core:4.29.2') { + dependency ('org.liquibase:liquibase-core:4.30.0') { exclude 'javax.xml.bind:jaxb-api' } - dependency 'org.liquibase.ext:liquibase-postgresql:4.29.2' + dependency 'org.liquibase.ext:liquibase-postgresql:4.30.0.1' dependency ('org.dom4j:dom4j:2.1.4') { exclude 'relaxngDatatype:relaxngDatatype' // already in com.sun.xml.bind:jaxb-osgi:2.3.0.1 @@ -222,15 +222,15 @@ dependencyManagement { entry 'json-path' entry 'xml-path' } - dependency 'org.apache.groovy:groovy-xml:4.0.23' - dependency 'org.apache.groovy:groovy-json:4.0.23' + dependency 'org.apache.groovy:groovy-xml:4.0.24' + dependency 'org.apache.groovy:groovy-json:4.0.24' - dependency 'org.mapstruct:mapstruct:1.6.2' - dependency 'org.mapstruct:mapstruct-processor:1.6.2' + dependency 'org.mapstruct:mapstruct:1.6.3' + dependency 'org.mapstruct:mapstruct-processor:1.6.3' dependency "org.apache.avro:avro:1.12.0" - dependency ('org.mariadb.jdbc:mariadb-java-client:3.4.1') { + dependency ('org.mariadb.jdbc:mariadb-java-client:3.5.0') { exclude 'org.slf4j:jcl-over-slf4j' exclude 'org.slf4j:slf4j-api' } diff --git a/docker-compose-postgresql-kafka.yml b/docker-compose-postgresql-kafka.yml index 367b12f46..078ad3a75 100644 --- a/docker-compose-postgresql-kafka.yml +++ b/docker-compose-postgresql-kafka.yml @@ -20,7 +20,7 @@ version: "3.7" services: kafka: - image: "bitnami/kafka:3.8.0-debian-12-r6" + image: "bitnami/kafka:3.8.1-debian-12-r1" ports: - "9092:9092" env_file: