From cd53b3f3074d4a17e12c1baea32ac1b41dca1ae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 13:34:41 +0000 Subject: [PATCH 1/2] Bump the all-dependencies group across 1 directory with 19 updates Bumps the all-dependencies group with 19 updates in the / directory: | Package | From | To | | --- | --- | --- | | [io.opentelemetry:opentelemetry-api](https://github.com/open-telemetry/opentelemetry-java) | `1.42.1` | `1.43.0` | | [net.logstash.logback:logstash-logback-encoder](https://github.com/logfellow/logstash-logback-encoder) | `7.4` | `8.0` | | org.apache.pdfbox:pdfbox | `3.0.2` | `3.0.3` | | [org.apache.tika:tika-core](https://github.com/apache/tika) | `2.9.2` | `3.0.0` | | [no.nav.security:token-validation-spring](https://github.com/navikt/token-support) | `4.1.7` | `5.0.5` | | [no.nav.security:token-client-spring](https://github.com/navikt/token-support) | `4.1.7` | `5.0.5` | | [no.nav.security:token-validation-spring-test](https://github.com/navikt/token-support) | `4.1.7` | `5.0.5` | | [net.javacrumbs.shedlock:shedlock-spring](https://github.com/lukas-krecan/ShedLock) | `5.13.0` | `5.16.0` | | net.javacrumbs.shedlock:shedlock-provider-jdbc-template | `5.13.0` | `5.16.0` | | [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) | `2.5.0` | `2.6.0` | | [org.testcontainers:testcontainers](https://github.com/testcontainers/testcontainers-java) | `1.19.8` | `1.20.3` | | [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) | `1.19.8` | `1.20.3` | | [org.testcontainers:postgresql](https://github.com/testcontainers/testcontainers-java) | `1.19.8` | `1.20.3` | | [com.h2database:h2](https://github.com/h2database/h2database) | `2.2.224` | `2.3.232` | | [io.mockk:mockk](https://github.com/mockk/mockk) | `1.13.10` | `1.13.13` | | [org.jetbrains.kotlin.jvm](https://github.com/JetBrains/kotlin) | `1.9.24` | `2.0.21` | | [org.jetbrains.kotlin.plugin.spring](https://github.com/JetBrains/kotlin) | `1.9.24` | `2.0.21` | | [plugin.jpa](https://github.com/JetBrains/kotlin) | `1.9.24` | `2.0.21` | | [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.2.5` | `3.3.5` | Updates `io.opentelemetry:opentelemetry-api` from 1.42.1 to 1.43.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.42.1...v1.43.0) Updates `net.logstash.logback:logstash-logback-encoder` from 7.4 to 8.0 - [Release notes](https://github.com/logfellow/logstash-logback-encoder/releases) - [Commits](https://github.com/logfellow/logstash-logback-encoder/compare/logstash-logback-encoder-7.4...logstash-logback-encoder-8.0) Updates `org.apache.pdfbox:pdfbox` from 3.0.2 to 3.0.3 Updates `org.apache.tika:tika-core` from 2.9.2 to 3.0.0 - [Changelog](https://github.com/apache/tika/blob/main/CHANGES.txt) - [Commits](https://github.com/apache/tika/compare/2.9.2...3.0.0) Updates `no.nav.security:token-validation-spring` from 4.1.7 to 5.0.5 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/4.1.7...5.0.5) Updates `no.nav.security:token-client-spring` from 4.1.7 to 5.0.5 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/4.1.7...5.0.5) Updates `no.nav.security:token-validation-spring-test` from 4.1.7 to 5.0.5 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/4.1.7...5.0.5) Updates `no.nav.security:token-client-spring` from 4.1.7 to 5.0.5 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/4.1.7...5.0.5) Updates `net.javacrumbs.shedlock:shedlock-spring` from 5.13.0 to 5.16.0 - [Commits](https://github.com/lukas-krecan/ShedLock/compare/shedlock-parent-5.13.0...shedlock-parent-5.16.0) Updates `net.javacrumbs.shedlock:shedlock-provider-jdbc-template` from 5.13.0 to 5.16.0 Updates `net.javacrumbs.shedlock:shedlock-provider-jdbc-template` from 5.13.0 to 5.16.0 Updates `org.springdoc:springdoc-openapi-starter-webmvc-ui` from 2.5.0 to 2.6.0 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](https://github.com/springdoc/springdoc-openapi/compare/v2.5.0...v2.6.0) Updates `org.testcontainers:testcontainers` from 1.19.8 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.8...1.20.3) Updates `org.testcontainers:junit-jupiter` from 1.19.8 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.8...1.20.3) Updates `org.testcontainers:postgresql` from 1.19.8 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.8...1.20.3) Updates `org.testcontainers:junit-jupiter` from 1.19.8 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.8...1.20.3) Updates `org.testcontainers:postgresql` from 1.19.8 to 1.20.3 - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.19.8...1.20.3) Updates `com.h2database:h2` from 2.2.224 to 2.3.232 - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-2.2.224...version-2.3.232) Updates `io.mockk:mockk` from 1.13.10 to 1.13.13 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.13.10...1.13.13) Updates `no.nav.security:token-validation-spring-test` from 4.1.7 to 5.0.5 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](https://github.com/navikt/token-support/compare/4.1.7...5.0.5) Updates `org.jetbrains.kotlin.jvm` from 1.9.24 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.21) Updates `org.jetbrains.kotlin.plugin.spring` from 1.9.24 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.21) Updates `plugin.jpa` from 1.9.24 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.21) Updates `org.springframework.boot` from 3.2.5 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.5...v3.3.5) Updates `org.jetbrains.kotlin.plugin.spring` from 1.9.24 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.21) Updates `plugin.jpa` from 1.9.24 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.24...v2.0.21) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-api dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: net.logstash.logback:logstash-logback-encoder dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: org.apache.pdfbox:pdfbox dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.apache.tika:tika-core dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-spring dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: no.nav.security:token-client-spring dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-spring-test dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: no.nav.security:token-client-spring dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: net.javacrumbs.shedlock:shedlock-spring dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: net.javacrumbs.shedlock:shedlock-provider-jdbc-template dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: net.javacrumbs.shedlock:shedlock-provider-jdbc-template dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: org.testcontainers:testcontainers dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: org.testcontainers:junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: org.testcontainers:postgresql dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: org.testcontainers:junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: org.testcontainers:postgresql dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: com.h2database:h2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: io.mockk:mockk dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: no.nav.security:token-validation-spring-test dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin.plugin.spring dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: plugin.jpa dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies - dependency-name: org.jetbrains.kotlin.plugin.spring dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: plugin.jpa dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 836d2906..b10bd66c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,25 +1,25 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile val exposedVersion = "0.45.0" -val h2Version = "2.2.224" +val h2Version = "2.3.232" val pamGeographyVersion = "2.9" val tokenValidationVersion = "1.3.0" -val tokenSupportVersion = "4.1.7" +val tokenSupportVersion = "5.0.5" val oidcSupportVersion = "0.2.18" -val logstashVersion = "7.4" -val pdfboxVersion = "3.0.2" -val tikaVersion = "2.9.2" +val logstashVersion = "8.0" +val pdfboxVersion = "3.0.3" +val tikaVersion = "3.0.0" val resilience4jVersion = "2.2.0" val problemSpringWebStartVersion = "0.27.0" -val shedlockVersion = "5.13.0" -val springDocVersion = "2.5.0" +val shedlockVersion = "5.16.0" +val springDocVersion = "2.6.0" val kodeverkVersion = "1.8.13" val simpleSlackPosterVersion = "0.1.4" val mockitoInlineVersion = "5.2.0" -val testContainersVersion = "1.19.8" -val mockkVersion = "1.13.10" +val testContainersVersion = "1.20.3" +val mockkVersion = "1.13.13" val springMockkVersion = "4.0.2" -val otelVersion = "1.42.1" +val otelVersion = "1.43.0" val githubUser: String by project val githubPassword: String by project @@ -32,9 +32,9 @@ repositories { } plugins { - val kotlinVersion = "1.9.24" + val kotlinVersion = "2.0.21" id("org.jetbrains.kotlin.jvm") version kotlinVersion - id("org.springframework.boot") version "3.2.5" + id("org.springframework.boot") version "3.3.5" id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion kotlin("plugin.jpa") version kotlinVersion idea From 480aab402f2a5ebd1d61c26c0a20134f714844df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20N=2E=20Wed=C3=B8e?= Date: Wed, 30 Oct 2024 15:12:36 +0100 Subject: [PATCH 2/2] Add flyway dependency, remove logback-access. Co-authored-by: Andreas Jonsson --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b10bd66c..4f5c17e7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,6 +59,7 @@ dependencies { implementation("org.flywaydb:flyway-core") implementation("com.zaxxer:HikariCP") + implementation("org.flywaydb:flyway-database-postgresql") implementation("org.postgresql:postgresql") implementation("io.github.resilience4j:resilience4j-retry:$resilience4jVersion") @@ -67,7 +68,6 @@ dependencies { implementation("no.nav.klage:klage-kodeverk:$kodeverkVersion") implementation("ch.qos.logback:logback-classic") - implementation("ch.qos.logback:logback-access") implementation("org.codehaus.janino:janino") implementation("net.logstash.logback:logstash-logback-encoder:$logstashVersion") implementation("com.fasterxml.jackson.module:jackson-module-kotlin")