Merge branch 'develop' into dependabot-gradle-serverpackcreator-app-d…

…evelop-org.junit.jupiter-junit-jupiter-engine-5.11.3
Griefed · Dec 4, 2024 · 1d03130 · 1d03130
2 parents 2ecd616 + aab670e
commit 1d03130
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/serverpackcreator-api/build.gradle.kts b/serverpackcreator-api/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     api("de.comahe.i18n4k:i18n4k-core:0.9.0")
     api("de.comahe.i18n4k:i18n4k-core-jvm:0.9.0")
     implementation("org.jetbrains.kotlin:kotlin-bom:2.1.0")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.21")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.0")
     implementation(files("${layout.buildDirectory.asFile.get()}/resources/main"))
     api("com.electronwill.night-config:toml:3.7.2")
     api("com.fasterxml.jackson.core:jackson-databind:2.18.1")

diff --git a/serverpackcreator-app/build.gradle.kts b/serverpackcreator-app/build.gradle.kts
@@ -55,7 +55,7 @@ dependencies {
 
     //WEB
     api("org.jetbrains.kotlin:kotlin-reflect:1.9.23")
-    api("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.1")
+    api("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2")
     api("org.springframework.boot:spring-boot-starter-web:3.3.2")
     api("org.springframework.boot:spring-boot-starter-log4j2:3.4.0")
     api("org.springframework.boot:spring-boot-starter-data-jpa:3.3.5")

diff --git a/serverpackcreator-web-frontend/package-lock.json b/serverpackcreator-web-frontend/package-lock.json
diff --git a/serverpackcreator-web-frontend/package.json b/serverpackcreator-web-frontend/package.json
@@ -18,7 +18,7 @@
   "dependencies": {
     "@quasar/extras": "^1.16.11",
     "axios": "^1.7.8",
-    "pinia": "^2.2.2",
+    "pinia": "^2.2.8",
     "quasar": "^2.17.0",
     "vue": "^3.5.12",
     "vue-i18n": "^10.0.5",