Merge pull request #81 from cnlkl/issue_73

feat: 升级devops-framework版本 #73
TencentBlueKing · Nov 28, 2022 · 41ed699 · 41ed699
2 parents d3399b3 + 7ae6f7f
commit 41ed699
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/backend/buildSrc/src/main/kotlin/Versions.kt b/src/backend/buildSrc/src/main/kotlin/Versions.kt
@@ -31,7 +31,7 @@ object Release {
 }
 
 object Versions {
-    const val DevopsBoot = "0.0.6"
+    const val DevopsBoot = "0.0.7-SNAPSHOT"
     const val Netty = "4.1.77.Final"
     const val SpringCloudCircuitbreaker = "2.1.2"
     const val Jersey = "2.35"

diff --git a/...c/main/kotlin/com/tencent/bkrepo/common/api/thread/TransmittableInheritableThreadLocal.kt b/...c/main/kotlin/com/tencent/bkrepo/common/api/thread/TransmittableInheritableThreadLocal.kt
@@ -9,7 +9,7 @@ open class TransmittableInheritableThreadLocal<T> : InheritableThreadLocal<T>()
 
     override fun set(value: T) {
         super.set(value)
-        if (!Transmitter.holder.get().contains(this)) {
+        if (!Transmitter.holder.get().contains(this as ThreadLocal<Any>)) {
             Transmitter.holder.get().add(this as ThreadLocal<Any>)
         }
     }

diff --git a/...mmon-api/src/main/kotlin/com/tencent/bkrepo/common/api/thread/TransmittableThreadLocal.kt b/...mmon-api/src/main/kotlin/com/tencent/bkrepo/common/api/thread/TransmittableThreadLocal.kt
@@ -11,7 +11,7 @@ open class TransmittableThreadLocal<T> : ThreadLocal<T>() {
 
     override fun set(value: T) {
         super.set(value)
-        if (!Transmitter.holder.get().contains(this)) {
+        if (!Transmitter.holder.get().contains(this as ThreadLocal<Any>)) {
             Transmitter.holder.get().add(this as ThreadLocal<Any>)
         }
     }

diff --git a/src/backend/settings.gradle.kts b/src/backend/settings.gradle.kts
@@ -41,6 +41,14 @@ pluginManagement {
             mavenCentral()
             maven(url = "https://repo.spring.io/milestone")
             gradlePluginPortal()
+            // 用于拉取devops framework gradle plugin snapshot版本
+            maven {
+                name = "MavenSnapshot"
+                url = java.net.URI("https://oss.sonatype.org/content/repositories/snapshots/")
+                mavenContent {
+                    snapshotsOnly()
+                }
+            }
         }
     }
 }