diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 410231ad..17d73383 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,11 +14,20 @@ updates: interval: "monthly" open-pull-requests-limit: 10 groups: + backend: + patterns: + - "io.micrometer*" + - "ca.cutterslade.analyze" + - "io.ktor*" + - "org.jetbrains.kotlinx*" + - "no.nav.security:token*" + - "org.slf4j*" test: patterns: - "org.testcontainers*" - "org.junit*" - "io.mockk:mockk" + - "no.nav.security:mock-oauth2-server" - package-ecosystem: "github-actions" directory: "/" schedule: diff --git a/.github/workflows/.deploy.yaml b/.github/workflows/.deploy.yaml index 9883bdb0..80767344 100644 --- a/.github/workflows/.deploy.yaml +++ b/.github/workflows/.deploy.yaml @@ -33,7 +33,7 @@ jobs: timeout-minutes: 10 steps: - uses: actions/checkout@v4 - - uses: andstor/file-existence-action@v2 + - uses: andstor/file-existence-action@v3 id: check_files with: files: "apps/${{ github.workflow }}/.nais/prod.yaml" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0c420d72..85d4044b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -35,7 +35,7 @@ jobs: cache: gradle - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 - name: Assemble run: ./gradlew assemble --no-build-cache --no-configuration-cache diff --git a/apps/ey-pdfgen/Dockerfile b/apps/ey-pdfgen/Dockerfile index 4bcd7bfe..96d20831 100644 --- a/apps/ey-pdfgen/Dockerfile +++ b/apps/ey-pdfgen/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/navikt/pdfgen:2.0.22 +FROM ghcr.io/navikt/pdfgen:2.0.23 COPY templates /app/templates COPY fonts /app/fonts diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7d3fa873..0092e2a2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [plugins] -cutterslade-analyze = { id = "ca.cutterslade.analyze", version = "1.9.1" } +cutterslade-analyze = { id = "ca.cutterslade.analyze", version = "1.9.2" } [versions] -navfelles-token-version = "4.1.0" -ktor-version = "2.3.7" +navfelles-token-version = "4.1.3" +ktor-version = "2.3.8" jupiter-version = "5.10.1" cxf-version = "4.0.2" @@ -13,7 +13,7 @@ cxf-version = "4.0.2" #NavFelles rapidAndRivers = { module = "com.github.navikt:rapids-and-rivers", version = "2024010209171704183456.6d035b91ffb4" } brukernotifikasjonSchemas = { module = "com.github.navikt:brukernotifikasjon-schemas", version = "2.5.2"} -mockOauth2Server = { module = "no.nav.security:mock-oauth2-server", version = "2.1.0"} +mockOauth2Server = { module = "no.nav.security:mock-oauth2-server", version = "2.1.1"} navFellesTokenClientCore = { module = "no.nav.security:token-client-core", version.ref = "navfelles-token-version"} tjenestespesifikasjonerTilbakekreving = { module = "com.github.navikt.pensjon-etterlatte-tjenestespesifikasjoner:tilbakekreving-v1-tjenestespesifikasjon", version = "1.78ffd1e"} @@ -44,7 +44,7 @@ jacksonDatatypejsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datat #Kafka kafka-clients = { module = "org.apache.kafka:kafka-clients", version = "3.6.1"} kafka-avro-serializer = { module = "io.confluent:kafka-avro-serializer", version = "7.3.1"} -kafka-testcontainer = { module = "org.testcontainers:kafka", version = "1.19.3" } +kafka-testcontainer = { module = "org.testcontainers:kafka", version = "1.19.4" } #Jupiter jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter-version" } @@ -52,15 +52,15 @@ jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.re jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiter-version" } #Logging -logging-slf4jApi = { module = "org.slf4j:slf4j-api", version = "2.0.10" } +logging-slf4jApi = { module = "org.slf4j:slf4j-api", version = "2.0.11" } logging-logbackClassic = { module = "ch.qos.logback:logback-classic", version = "1.4.14" } logging-logstashLogbackEncoder = { module = "net.logstash.logback:logstash-logback-encoder", version = "7.4"} #Micrometer -micrometer-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version = "1.12.1"} +micrometer-prometheus = { module = "io.micrometer:micrometer-registry-prometheus", version = "1.12.2"} #MockK -mockk = { module = "io.mockk:mockk", version = "1.13.8" } +mockk = { module = "io.mockk:mockk", version = "1.13.9" } #Cxf cxf-logging = { module = "org.apache.cxf:cxf-rt-features-logging", version.ref = "cxf-version" }