Skip to content

Commit

Permalink
Bump the backend group across 1 directory with 18 updates (#6247)
Browse files Browse the repository at this point in the history 
* Bump the backend group across 1 directory with 18 updates

Bumps the backend group with 18 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [com.zaxxer:HikariCP](https://github.com/brettwooldridge/HikariCP) | `6.0.0` | `6.1.0` |
| [org.flywaydb:flyway-core](https://github.com/flyway/flyway) | `10.18.2` | `10.20.1` |
| org.flywaydb:flyway-database-postgresql | `10.18.2` | `10.20.1` |
| com.fasterxml.jackson.datatype:jackson-datatype-jsr310 | `2.18.0` | `2.18.1` |
| com.fasterxml.jackson.datatype:jackson-datatype-jdk8 | `2.18.0` | `2.18.1` |
| [com.fasterxml.jackson.module:jackson-module-kotlin](https://github.com/FasterXML/jackson-module-kotlin) | `2.18.0` | `2.18.1` |
| [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) | `1.5.8` | `1.5.12` |
| [no.nav.security:token-client-core](https://github.com/navikt/token-support) | `5.0.5` | `5.0.8` |
| [no.nav.security:token-validation-ktor-v2](https://github.com/navikt/token-support) | `5.0.5` | `5.0.8` |
| [no.nav.security:mock-oauth2-server](https://github.com/navikt/mock-oauth2-server) | `2.1.9` | `2.1.10` |
| [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) | `5.11.1` | `5.11.3` |
| [org.junit.jupiter:junit-jupiter-params](https://github.com/junit-team/junit5) | `5.11.1` | `5.11.3` |
| [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) | `5.11.1` | `5.11.3` |
| [io.mockk:mockk](https://github.com/mockk/mockk) | `1.13.12` | `1.13.13` |
| [org.testcontainers:junit-jupiter](https://github.com/testcontainers/testcontainers-java) | `1.20.2` | `1.20.3` |
| [org.testcontainers:postgresql](https://github.com/testcontainers/testcontainers-java) | `1.20.2` | `1.20.3` |
| [org.testcontainers:kafka](https://github.com/testcontainers/testcontainers-java) | `1.20.2` | `1.20.3` |
| [io.github.smiley4:ktor-swagger-ui](https://github.com/SMILEY4/ktor-swagger-ui) | `3.4.0` | `4.0.0` |



Updates `com.zaxxer:HikariCP` from 6.0.0 to 6.1.0
- [Changelog](https://github.com/brettwooldridge/HikariCP/blob/dev/CHANGES)
- [Commits](brettwooldridge/HikariCP@HikariCP-6.0.0...HikariCP-6.1.0)

Updates `org.flywaydb:flyway-core` from 10.18.2 to 10.20.1
- [Release notes](https://github.com/flyway/flyway/releases)
- [Commits](flyway/flyway@flyway-10.18.2...flyway-10.20.1)

Updates `org.flywaydb:flyway-database-postgresql` from 10.18.2 to 10.20.1

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.18.0 to 2.18.1

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jdk8` from 2.18.0 to 2.18.1

Updates `com.fasterxml.jackson.module:jackson-module-kotlin` from 2.18.0 to 2.18.1
- [Commits](FasterXML/jackson-module-kotlin@jackson-module-kotlin-2.18.0...jackson-module-kotlin-2.18.1)

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jdk8` from 2.18.0 to 2.18.1

Updates `com.fasterxml.jackson.module:jackson-module-kotlin` from 2.18.0 to 2.18.1
- [Commits](FasterXML/jackson-module-kotlin@jackson-module-kotlin-2.18.0...jackson-module-kotlin-2.18.1)

Updates `ch.qos.logback:logback-classic` from 1.5.8 to 1.5.12
- [Commits](qos-ch/logback@v_1.5.8...v_1.5.12)

Updates `no.nav.security:token-client-core` from 5.0.5 to 5.0.8
- [Release notes](https://github.com/navikt/token-support/releases)
- [Commits](navikt/token-support@5.0.5...5.0.8)

Updates `no.nav.security:token-validation-ktor-v2` from 5.0.5 to 5.0.8
- [Release notes](https://github.com/navikt/token-support/releases)
- [Commits](navikt/token-support@5.0.5...5.0.8)

Updates `no.nav.security:token-validation-ktor-v2` from 5.0.5 to 5.0.8
- [Release notes](https://github.com/navikt/token-support/releases)
- [Commits](navikt/token-support@5.0.5...5.0.8)

Updates `no.nav.security:mock-oauth2-server` from 2.1.9 to 2.1.10
- [Release notes](https://github.com/navikt/mock-oauth2-server/releases)
- [Commits](navikt/mock-oauth2-server@2.1.9...2.1.10)

Updates `org.junit.jupiter:junit-jupiter-api` from 5.11.1 to 5.11.3
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.11.1...r5.11.3)

Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.1 to 5.11.3
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.11.1...r5.11.3)

Updates `org.junit.jupiter:junit-jupiter-engine` from 5.11.1 to 5.11.3
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.11.1...r5.11.3)

Updates `org.junit.jupiter:junit-jupiter-params` from 5.11.1 to 5.11.3
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.11.1...r5.11.3)

Updates `org.junit.jupiter:junit-jupiter-engine` from 5.11.1 to 5.11.3
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](junit-team/junit5@r5.11.1...r5.11.3)

Updates `io.mockk:mockk` from 1.13.12 to 1.13.13
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](mockk/mockk@1.13.12...1.13.13)

Updates `org.testcontainers:junit-jupiter` from 1.20.2 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](testcontainers/testcontainers-java@1.20.2...1.20.3)

Updates `org.testcontainers:postgresql` from 1.20.2 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](testcontainers/testcontainers-java@1.20.2...1.20.3)

Updates `org.testcontainers:kafka` from 1.20.2 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](testcontainers/testcontainers-java@1.20.2...1.20.3)

Updates `org.testcontainers:postgresql` from 1.20.2 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](testcontainers/testcontainers-java@1.20.2...1.20.3)

Updates `org.testcontainers:kafka` from 1.20.2 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](testcontainers/testcontainers-java@1.20.2...1.20.3)

Updates `io.github.smiley4:ktor-swagger-ui` from 3.4.0 to 4.0.0
- [Release notes](https://github.com/SMILEY4/ktor-swagger-ui/releases)
- [Commits](SMILEY4/ktor-swagger-ui@3.4.0...4.0.0)

---
updated-dependencies:
- dependency-name: com.zaxxer:HikariCP
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: backend
- dependency-name: org.flywaydb:flyway-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: backend
- dependency-name: org.flywaydb:flyway-database-postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: backend
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: com.fasterxml.jackson.module:jackson-module-kotlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: com.fasterxml.jackson.module:jackson-module-kotlin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: no.nav.security:token-client-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: no.nav.security:token-validation-ktor-v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: no.nav.security:token-validation-ktor-v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: no.nav.security:mock-oauth2-server
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: org.junit.jupiter:junit-jupiter-params
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: org.testcontainers:junit-jupiter
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: org.testcontainers:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: org.testcontainers:kafka
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: org.testcontainers:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: org.testcontainers:kafka
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: backend
- dependency-name: io.github.smiley4:ktor-swagger-ui
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: backend
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fikser nytt navn accesstoken

* Bruker eldre versjon for swagger-ui inntil vi går til ktor 3.0

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Henrik Gundersen <[email protected]>
  • Loading branch information
@dependabot @henrikg
dependabot[bot] and henrikg authored Nov 14, 2024
1 parent a220ad4 commit 592dea5
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ versions = { id = "se.ascp.gradle.gradle-versions-filter", version = "0.1.16" }
license = { id = 'com.github.jk1.dependency-license-report', version = '2.9' }

[versions]
jackson-version = "2.18.0"
jupiter-version = "5.11.1"
jackson-version = "2.18.1"
jupiter-version = "5.11.3"
ktor2-version = "2.3.12"
navfelles-token-version = "5.0.5"
navfelles-token-version = "5.0.8"
prometheus-version = "0.16.0"
testcontainer-version = "1.20.2"
testcontainer-version = "1.20.3"
tjenestespesifikasjoner-version = "1.1436e29"

[libraries]
cache-caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version = "3.1.8" }

database-hikaricp = { module = "com.zaxxer:HikariCP", version = "6.0.0" }
database-flywaydb = { module = "org.flywaydb:flyway-core", version = "10.18.2" }
database-flywaydbpostgres = { module = "org.flywaydb:flyway-database-postgresql", version = "10.18.2" }
database-hikaricp = { module = "com.zaxxer:HikariCP", version = "6.1.0" }
database-flywaydb = { module = "org.flywaydb:flyway-core", version = "10.20.1" }
database-flywaydbpostgres = { module = "org.flywaydb:flyway-database-postgresql", version = "10.20.1" }
database-postgresql = { module = "org.postgresql:postgresql", version = "42.7.4" }
database-kotliquery = { module = "com.github.seratch:kotliquery", version = "1.9.0" }

Expand Down Expand Up @@ -61,7 +61,7 @@ etterlatte-common = { module = "pensjon-etterlatte-felles:common", version = "20
teamdokumenthandtering-avroschemas = { module = "no.nav.teamdokumenthandtering:teamdokumenthandtering-avro-schemas", version = "08c0b2d2" }

logging-slf4japi = { module = "org.slf4j:slf4j-api", version = "2.0.16" }
logging-logbackclassic = { module = "ch.qos.logback:logback-classic", version = "1.5.8" }
logging-logbackclassic = { module = "ch.qos.logback:logback-classic", version = "1.5.12" }
logging-logstashlogbackencoder = { module = "net.logstash.logback:logstash-logback-encoder", version = "8.0" }

metrics-micrometer-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version = "1.13.6" }
Expand All @@ -79,20 +79,20 @@ navfelles-tjenestespesifikasjoner-oppdragsimulering = { module = "com.github.nav
navfelles-tjenestespesifikasjoner-tilbakekreving = { module = "com.github.navikt.pensjon-etterlatte-tjenestespesifikasjoner:tilbakekreving-v1-tjenestespesifikasjon", version.ref = "tjenestespesifikasjoner-version" }
navfelles-tokenclientcore = { module = "no.nav.security:token-client-core", version.ref = "navfelles-token-version" }
navfelles-tokenvalidationktor2 = { module = "no.nav.security:token-validation-ktor-v2", version.ref = "navfelles-token-version" }
navfelles-mockoauth2server = { module = "no.nav.security:mock-oauth2-server", version = "2.1.9" }
navfelles-mockoauth2server = { module = "no.nav.security:mock-oauth2-server", version = "2.1.10" }

test-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter-version" }
test-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "jupiter-version" }
test-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiter-version" }
test-kotest-assertionscore = { module = "io.kotest:kotest-assertions-core", version = "5.9.1" }
test-mockk = { module = "io.mockk:mockk", version = "1.13.12" }
test-mockk = { module = "io.mockk:mockk", version = "1.13.13" }
test-testcontainer-jupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainer-version" }
test-testcontainer-postgresql = { module = "org.testcontainers:postgresql", version.ref = "testcontainer-version" }
test-testcontainer-kafka = { module = "org.testcontainers:kafka", version.ref = "testcontainer-version" }

commons-compress = { module = "org.apache.commons:commons-compress", version = "1.27.1" }
unleash-client = { module = "io.getunleash:unleash-client-java", version = "9.2.4" }
openapi = { module = "io.github.smiley4:ktor-swagger-ui", version = "3.4.0" }
openapi = { module = "io.github.smiley4:ktor-swagger-ui", version = "3.6.0" }

[bundles]
jackson = ["jackson-datatypejsr310", "jackson-datatypejdk8", "jackson-modulekotlin"]
2 changes: 1 addition & 1 deletion libs/etterlatte-ktor/src/main/kotlin/ktor/ClientCredentialAuthProvider.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ClientCredentialAuthProvider(
request: HttpRequestBuilder,
authHeader: HttpAuthHeader?,
) {
accessTokenService.getAccessToken(clientPropertiesConfig).accessToken.also {
accessTokenService.getAccessToken(clientPropertiesConfig).access_token.also {
request.headers[HttpHeaders.Authorization] = "Bearer $it"
}
}
Expand Down

0 comments on commit 592dea5

Please sign in to comment.