Skip to content

Commit a25371b

Browse files
Bump the all-dependencies group across 1 directory with 11 updates (#141)
* Bump the all-dependencies group across 1 directory with 11 updates Bumps the all-dependencies group with 11 updates in the / directory: | Package | From | To | | --- | --- | --- | | [no.nav.security:token-validation-spring](https://github.com/navikt/token-support) | `4.1.8` | `5.0.5` | | [no.nav.security:token-validation-spring-test](https://github.com/navikt/token-support) | `4.1.8` | `5.0.5` | | [no.nav.familie.kontrakter:enslig-forsorger](https://github.com/navikt/familie-kontrakter) | `3.0_20240903082713_4cc7504` | `3.0_20241030123037_58542dd` | | [no.nav.familie.kontrakter:felles](https://github.com/navikt/familie-kontrakter) | `3.0_20240903082713_4cc7504` | `3.0_20241030123037_58542dd` | | [org.testcontainers:oracle-xe](https://github.com/testcontainers/testcontainers-java) | `1.20.1` | `1.20.3` | | [io.mockk:mockk-jvm](https://github.com/mockk/mockk) | `1.13.12` | `1.13.13` | | [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.3.3` | `3.3.5` | | [jvm](https://github.com/JetBrains/kotlin) | `2.0.20` | `2.0.21` | | [plugin.spring](https://github.com/JetBrains/kotlin) | `2.0.20` | `2.0.21` | | [plugin.jpa](https://github.com/JetBrains/kotlin) | `2.0.20` | `2.0.21` | | org.cyclonedx.bom | `1.7.4` | `1.10.0` | Updates `no.nav.security:token-validation-spring` from 4.1.8 to 5.0.5 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@4.1.8...5.0.5) Updates `no.nav.security:token-validation-spring-test` from 4.1.8 to 5.0.5 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@4.1.8...5.0.5) Updates `no.nav.familie.kontrakter:enslig-forsorger` from 3.0_20240903082713_4cc7504 to 3.0_20241030123037_58542dd - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `no.nav.familie.kontrakter:felles` from 3.0_20240903082713_4cc7504 to 3.0_20241030123037_58542dd - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `no.nav.familie.kontrakter:felles` from 3.0_20240903082713_4cc7504 to 3.0_20241030123037_58542dd - [Commits](https://github.com/navikt/familie-kontrakter/commits) Updates `no.nav.security:token-validation-spring-test` from 4.1.8 to 5.0.5 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@4.1.8...5.0.5) Updates `org.testcontainers:oracle-xe` from 1.20.1 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.1...1.20.3) Updates `io.mockk:mockk-jvm` 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.springframework.boot` from 3.3.3 to 3.3.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.3.3...v3.3.5) Updates `jvm` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.20...v2.0.21) Updates `plugin.spring` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.20...v2.0.21) Updates `plugin.jpa` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.20...v2.0.21) Updates `plugin.spring` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.20...v2.0.21) Updates `plugin.jpa` from 2.0.20 to 2.0.21 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](JetBrains/kotlin@v2.0.20...v2.0.21) Updates `org.cyclonedx.bom` from 1.7.4 to 1.10.0 --- updated-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-validation-spring-test dependency-type: direct:production update-type: version-update:semver-major dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:enslig-forsorger dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:felles dependency-type: direct:production dependency-group: all-dependencies - dependency-name: no.nav.familie.kontrakter:felles dependency-type: direct:production 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.testcontainers:oracle-xe dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: io.mockk:mockk-jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: plugin.spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: plugin.jpa dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: plugin.spring dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: plugin.jpa dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-dependencies - dependency-name: org.cyclonedx.bom dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-dependencies ... Signed-off-by: dependabot[bot] <[email protected]> * cyclonedx plugin fix * oppdaterer GA for main --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: throndi <[email protected]>
1 parent b731a10 commit a25371b

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

.github/workflows/master.yml

+3
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,16 @@ jobs:
2525
run: |
2626
./gradlew wrapper --gradle-version=8.5
2727
./gradlew test build --no-daemon
28+
- name: Generer SBOM
29+
run: ./gradlew cyclonedxBom
2830
- uses: nais/docker-build-push@v0
2931
id: docker-push
3032
with:
3133
team: teamfamilie
3234
tag: latest
3335
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
3436
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
37+
byosbom: build/resources/main/META-INF/sbom/application.cdx.json
3538
outputs:
3639
image: ${{ steps.docker-push.outputs.image }}
3740
deploy:

build.gradle.kts

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

3-
val mockkVersion = "1.13.12"
4-
val tokenSupportVersion = "4.1.8"
3+
val mockkVersion = "1.13.13"
4+
val tokenSupportVersion = "5.0.5"
55
val springdocVersion = "1.8.0"
66
val navFoedselsnummerVersion = "1.0-SNAPSHOT.6"
7-
val kontrakterVersion = "3.0_20240903082713_4cc7504"
7+
val kontrakterVersion = "3.0_20241030123037_58542dd"
88
val mainClass = "no.nav.familie.ef.infotrygd.Main"
99
val ktlint by configurations.creating
1010

1111
plugins {
12-
val kotlinVersion = "2.0.20"
13-
val springBootVersion = "3.3.3"
12+
val kotlinVersion = "2.0.21"
13+
val springBootVersion = "3.3.5"
1414
id("org.springframework.boot") version springBootVersion
1515
id("io.spring.dependency-management") version "1.1.6"
1616
kotlin("jvm") version kotlinVersion
1717
kotlin("plugin.spring") version kotlinVersion
1818
kotlin("plugin.jpa") version kotlinVersion
19-
id("org.cyclonedx.bom") version "1.7.4"
19+
id("org.cyclonedx.bom") version "1.8.1"
2020
}
2121

2222
group = "no.nav"
@@ -77,7 +77,7 @@ dependencies {
7777
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
7878
testImplementation("org.springframework.boot:spring-boot-starter-test")
7979
testImplementation("com.github.doyaaaaaken:kotlin-csv-jvm:1.10.0")
80-
testImplementation("org.testcontainers:oracle-xe:1.20.1")
80+
testImplementation("org.testcontainers:oracle-xe:1.20.3")
8181
testImplementation("com.h2database:h2")
8282
testImplementation("org.flywaydb:flyway-core")
8383
testImplementation("io.mockk:mockk-jvm:$mockkVersion")
@@ -127,11 +127,5 @@ tasks.test {
127127
jvmArgs = listOf("-Dnet.bytebuddy.experimental=true")
128128
}
129129

130-
tasks.register("generateSBOM") {
131-
dependsOn("cyclonedxBom")
132-
doLast {
133-
println("SBOM generated at build/reports/bom.json")
134-
}
135-
}
136130

137131
// tasks.findByName('publish').mustRunAfter 'build'

0 commit comments

Comments
 (0)