From 020a5eae6dd12c2c28fd21a2259ff75537edcf2f Mon Sep 17 00:00:00 2001 From: siujamo Date: Fri, 16 May 2025 10:17:12 +0800 Subject: [PATCH] chore: upgrade dependencies --- devkit-core/build.gradle.kts | 4 ---- gradle/libs.versions.toml | 16 ++++++++-------- key-pair-loader/build.gradle.kts | 2 +- .../build.gradle.kts | 8 ++++---- simple-jwt-authzero/build.gradle.kts | 2 +- simple-jwt-spring-boot-starter/build.gradle.kts | 10 +++++----- .../build.gradle.kts | 12 ++++++------ 7 files changed, 25 insertions(+), 29 deletions(-) diff --git a/devkit-core/build.gradle.kts b/devkit-core/build.gradle.kts index 314ede0..e6d3134 100644 --- a/devkit-core/build.gradle.kts +++ b/devkit-core/build.gradle.kts @@ -52,10 +52,6 @@ tasks.withType { } dependencies { - val slf4jVersion: String by project - val logbackVersion: String by project - val junitVersion: String by project - compileOnly(libs.slf4j) implementation(libs.logback) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3edd2cc..64b7a22 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,10 +16,10 @@ [versions] slf4j = "2.0.17" logback = "1.5.18" -jackson = "2.18.3" +jackson = "2.18.4" jwt = "4.5.0" spring = "6.2.6" -springBoot = "3.4.4" +springBoot = "3.4.5" junit = "5.11.4" [libraries] @@ -27,11 +27,11 @@ slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" } logback = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logback" } jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core", version.ref = "jackson" } jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson" } -jwt = { group = "com.auth0", name = "java-jwt", version.ref = "jwt" } -spring-boot-autoconfigure = { group = "org.springframework.boot", name = "spring-boot-autoconfigure", version.ref = "springBoot" } -spring-boot-starter-logging = { group = "org.springframework.boot", name = "spring-boot-starter-logging", version.ref = "springBoot" } -spring-boot-configuration-processor = { group = "org.springframework.boot", name = "spring-boot-configuration-processor", version.ref = "springBoot" } -spring-boot-starter-redis = { group = "org.springframework.boot", name = "spring-boot-starter-data-redis", version.ref = "springBoot" } -spring-boot-starter-test = { group = "org.springframework.boot", name = "spring-boot-starter-test", version.ref = "springBoot" } +jwt-core = { group = "com.auth0", name = "java-jwt", version.ref = "jwt" } +springBoot-autoconfigure = { group = "org.springframework.boot", name = "spring-boot-autoconfigure", version.ref = "springBoot" } +springBoot-starter-logging = { group = "org.springframework.boot", name = "spring-boot-starter-logging", version.ref = "springBoot" } +springBoot-configurationProcessor = { group = "org.springframework.boot", name = "spring-boot-configuration-processor", version.ref = "springBoot" } +springBoot-starter-redis = { group = "org.springframework.boot", name = "spring-boot-starter-data-redis", version.ref = "springBoot" } +springBoot-starter-test = { group = "org.springframework.boot", name = "spring-boot-starter-test", version.ref = "springBoot" } junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" } junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit" } diff --git a/key-pair-loader/build.gradle.kts b/key-pair-loader/build.gradle.kts index 562b54c..86244ee 100644 --- a/key-pair-loader/build.gradle.kts +++ b/key-pair-loader/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { compileOnly(libs.slf4j) implementation(libs.logback) api(project(":devkit-core")) - testImplementation(libs.jwt) + testImplementation(libs.jwt.core) testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) } diff --git a/property-guard-spring-boot-starter/build.gradle.kts b/property-guard-spring-boot-starter/build.gradle.kts index 6dc02b7..d9a4682 100644 --- a/property-guard-spring-boot-starter/build.gradle.kts +++ b/property-guard-spring-boot-starter/build.gradle.kts @@ -56,13 +56,13 @@ dependencies { implementation(libs.logback) api(project(":devkit-core")) api(project(":devkit-utils")) - implementation(libs.spring.boot.autoconfigure) - implementation(libs.spring.boot.starter.logging) - implementation(libs.spring.boot.configuration.processor) + implementation(libs.springBoot.autoconfigure) + implementation(libs.springBoot.starter.logging) + implementation(libs.springBoot.configurationProcessor) testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) - testImplementation(libs.spring.boot.starter.test) + testImplementation(libs.springBoot.starter.test) } tasks.test { diff --git a/simple-jwt-authzero/build.gradle.kts b/simple-jwt-authzero/build.gradle.kts index 7fba7f5..b006490 100644 --- a/simple-jwt-authzero/build.gradle.kts +++ b/simple-jwt-authzero/build.gradle.kts @@ -60,7 +60,7 @@ dependencies { api(project(":key-pair-loader")) api(project(":simple-jwt-facade")) api(libs.jackson.databind) - api(libs.jwt) + api(libs.jwt.core) testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) diff --git a/simple-jwt-spring-boot-starter/build.gradle.kts b/simple-jwt-spring-boot-starter/build.gradle.kts index 0ff904f..d030b2b 100644 --- a/simple-jwt-spring-boot-starter/build.gradle.kts +++ b/simple-jwt-spring-boot-starter/build.gradle.kts @@ -58,14 +58,14 @@ dependencies { api(project(":guid")) api(project(":simple-jwt-facade")) api(project(":simple-jwt-authzero")) - implementation(libs.spring.boot.autoconfigure) - implementation(libs.spring.boot.starter.logging) - implementation(libs.spring.boot.configuration.processor) - annotationProcessor(libs.spring.boot.configuration.processor) + implementation(libs.springBoot.autoconfigure) + implementation(libs.springBoot.starter.logging) + implementation(libs.springBoot.configurationProcessor) + annotationProcessor(libs.springBoot.configurationProcessor) testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) - testImplementation(libs.spring.boot.starter.test) + testImplementation(libs.springBoot.starter.test) } java { diff --git a/simple-serial-spring-boot-starter/build.gradle.kts b/simple-serial-spring-boot-starter/build.gradle.kts index a38cc43..b8bef0c 100644 --- a/simple-serial-spring-boot-starter/build.gradle.kts +++ b/simple-serial-spring-boot-starter/build.gradle.kts @@ -56,15 +56,15 @@ dependencies { implementation(libs.logback) implementation(libs.jackson.databind) - implementation(libs.spring.boot.autoconfigure) - implementation(libs.spring.boot.starter.logging) - implementation(libs.spring.boot.configuration.processor) - implementation(libs.spring.boot.starter.redis) - annotationProcessor(libs.spring.boot.configuration.processor) + implementation(libs.springBoot.autoconfigure) + implementation(libs.springBoot.starter.logging) + implementation(libs.springBoot.configurationProcessor) + implementation(libs.springBoot.starter.redis) + annotationProcessor(libs.springBoot.configurationProcessor) testImplementation(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter) - testImplementation(libs.spring.boot.starter.test) + testImplementation(libs.springBoot.starter.test) } tasks.test {