feat: 升级jdk到17 #197

bkdevops-projects · Jul 23, 2024 · 09e2cd3 · 09e2cd3
1 parent 221fec8
commit 09e2cd3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,15 +1,15 @@
 object Release {
     const val Group = "com.tencent.devops"
-    const val Version = "0.0.10-SNAPSHOT"
+    const val Version = "0.1.0-SNAPSHOT"
 }
 
 object Versions {
     const val Jib: String = "3.2.0"
     const val Java = "17"
     const val Kotlin = "1.8.22"
-    const val SpringBoot = "3.1.4"
-    const val SpringCloud = "2022.0.4"
-    const val DependencyManagement = "1.1.3"
+    const val SpringBoot = "3.3.2"
+    const val SpringCloud = "2023.0.3"
+    const val DependencyManagement = "1.1.6"
     const val GradleNexusPublish = "1.3.0"
     const val KtLint = "0.50.0"
 }
diff --git a/devops-boot-project/devops-boot-dependencies/build.gradle.kts b/devops-boot-project/devops-boot-dependencies/build.gradle.kts
@@ -18,28 +18,30 @@ dependencies {
         rootProject.subprojects.filter { it.name != project.name }.forEach { api(project(it.path)) }
 
         // jwt
-        api("io.jsonwebtoken:jjwt-api:0.11.2")
-        api("io.jsonwebtoken:jjwt-impl:0.11.2")
-        api("io.jsonwebtoken:jjwt-jackson:0.11.2")
+        api("io.jsonwebtoken:jjwt-api:0.12.6")
+        api("io.jsonwebtoken:jjwt-impl:0.12.6")
+        api("io.jsonwebtoken:jjwt-jackson:0.12.6")
 
         // apache common
-        api("commons-io:commons-io:2.6")
-        api("org.apache.commons:commons-compress:1.18")
-        api("org.apache.hadoop:hadoop-hdfs:2.6.0")
-        api("org.apache.hadoop:hadoop-common:2.6.0")
+        api("commons-io:commons-io:2.16.1")
+        api("org.apache.commons:commons-compress:1.26.2")
+
+        // apache hadoop
+        api("org.apache.hadoop:hadoop-hdfs:3.4.0")
+        api("org.apache.hadoop:hadoop-common:3.4.0")
 
         // guava
-        api("com.google.guava:guava:29.0-jre")
+        api("com.google.guava:guava:33.2.1-jre")
 
         // swagger
-        api("io.swagger.core.v3:swagger-annotations:2.2.16")
-        api("io.swagger.core.v3:swagger-models:2.2.16")
-        api("io.swagger.core.v3:swagger-jaxrs2:2.2.16")
-        api("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
+        api("io.swagger.core.v3:swagger-annotations:2.2.22")
+        api("io.swagger.core.v3:swagger-models:2.2.22")
+        api("io.swagger.core.v3:swagger-jaxrs2:2.2.22")
+        api("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0")
 
         // mq stream
-        api("org.apache.pulsar:pulsar-client:2.9.1")
-        api("com.google.protobuf:protobuf-java:3.19.4")
+        api("org.apache.pulsar:pulsar-client:2.9.5")
+        api("com.google.protobuf:protobuf-java:3.19.6")
 
         // s3
         api("com.amazonaws:aws-java-sdk-s3:1.11.700")

diff --git a/devops-boot-sample/build.gradle.kts b/devops-boot-sample/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.tencent.devops.boot") version "0.0.10-SNAPSHOT"
+    id("com.tencent.devops.boot") version "0.1.0-SNAPSHOT"
 }
 
 allprojects {

diff --git a/devops-boot-sample/settings.gradle.kts b/devops-boot-sample/settings.gradle.kts
@@ -3,12 +3,12 @@ rootProject.name = "devops-boot-sample"
 // for debug devops-boot locally
 pluginManagement {
     repositories {
+        mavenLocal()
         mavenCentral()
         gradlePluginPortal()
         maven {
             setUrl("https://oss.sonatype.org/content/repositories/snapshots/")
         }
-        mavenLocal()
     }
 }