Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/minor-and-patch-3a90…
Browse files Browse the repository at this point in the history
…d08eca

# Conflicts:
#	pnpm-lock.yaml
  • Loading branch information
sndrem committed Dec 2, 2024
2 parents 6e6f813 + 96b143a commit 51f3130
Show file tree
Hide file tree
Showing 6 changed files with 870 additions and 665 deletions.
2 changes: 1 addition & 1 deletion frontend/arena-adapter-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"@types/react-dom": "18.3.1",
"@vitejs/plugin-react": "4.3.4",
"typescript": "5.7.2",
"vite": "5.4.6"
"vite": "6.0.2"
}
}
2 changes: 1 addition & 1 deletion frontend/arrangor-flate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"postcss-import": "16.1.0",
"tailwindcss": "3.4.15",
"typescript": "5.7.2",
"vite": "5.4.10",
"vite": "6.0.2",
"vite-tsconfig-paths": "5.1.3"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion frontend/mr-admin-flate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"playwright": "1.49.0",
"sass-embedded": "1.81.0",
"typescript": "5.7.2",
"vite": "5.4.10",
"vite": "6.0.2",
"vite-tsconfig-paths": "5.1.3",
"vitest": "2.1.6"
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/mulighetsrommet-veileder-flate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"rollup-plugin-visualizer": "5.12.0",
"sass-embedded": "1.81.0",
"typescript": "5.7.2",
"vite": "5.4.6",
"vite": "6.0.2",
"vite-plugin-shadow-style": "1.1.1",
"vite-tsconfig-paths": "5.1.3",
"vitest": "2.1.6"
Expand Down
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[versions]
common-java-modules = "3.2024.10.25_13.44-9db48a0dbe67"
common-java-modules = "3.2024.11.26_16.35-432a29107830"
flyway = "11.0.0"
hoplite = "2.8.2"
hoplite = "2.9.0"
koin = "4.1.0-Beta1"
kotest = "5.9.1"
kotest-testcontainers = "2.0.2"
kotlin = "2.0.21"
kotlin = "2.1.0"
ktor = "3.0.1"
logback = "1.5.12"
metrics = "4.2.28"
metrics = "4.2.29"
arrow = "1.2.4"

[plugins]
flyway = { id = "org.flywaydb.flyway", version.ref = "flyway" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
ktlint = "org.jlleitschuh.gradle.ktlint:12.1.1"
ktlint = "org.jlleitschuh.gradle.ktlint:12.1.2"
shadow = "com.github.johnrengelman.shadow:8.1.1"
openapi-generator = "org.openapi.generator:7.10.0"

Expand All @@ -35,7 +35,7 @@ arrow-core-serialization = { module = "io.arrow-kt:arrow-core-serialization", ve
assertj-db = "org.assertj:assertj-db:2.0.2"

caffeine = "com.github.ben-manes.caffeine:caffeine:3.1.8"
pdfgen-core = "no.nav.pdfgen:pdfgen-core:1.1.35"
pdfgen-core = "no.nav.pdfgen:pdfgen-core:1.1.36"
verapdf = "org.verapdf:validation-model:1.26.1"
handlebars = "com.github.jknack:handlebars:4.4.0"

Expand Down Expand Up @@ -110,7 +110,7 @@ nav-common-auditLog = { module = "no.nav.common:audit-log", version.ref = "commo
nav-common-kafka = { module = "no.nav.common:kafka", version.ref = "common-java-modules" }
nav-common-tokenClient = { module = "no.nav.common:token-client", version.ref = "common-java-modules" }
nav-common-client = { module = "no.nav.common:client", version.ref = "common-java-modules" }
nav-poaoTilgang-client = "no.nav.poao-tilgang:client:2024.10.04_12.38-e183cd9d187f"
nav-poaoTilgang-client = "no.nav.poao-tilgang:client:2024.11.26_08.36-ad014162ce23"
nav-mockOauth2Server = "no.nav.security:mock-oauth2-server:2.1.10"

opentelemetry = "io.opentelemetry:opentelemetry-sdk-trace:1.44.1"
Expand All @@ -128,4 +128,4 @@ slf4j = "org.slf4j:slf4j-api:2.0.16"
apache-poi = "org.apache.poi:poi:5.3.0"
apache-poi-ooxml = "org.apache.poi:poi-ooxml:5.3.0"

unleash = "io.getunleash:unleash-client-java:9.2.5"
unleash = "io.getunleash:unleash-client-java:9.2.6"
Loading

0 comments on commit 51f3130

Please sign in to comment.