Merge pull request #28 from hejieehe/feat_6

feat: 增加Gitee和TSvn服务提供者 #6

Author: mingshewhe

.github/workflows/publish-release.yml

@@ -48,7 +48,7 @@ jobs:
         run: |
           echo "GITHUB_REF=${GITHUB_REF}"
           chmod +x ./gradlew
-          ./gradlew clean publish closeSonatypeStagingRepository \
+          ./gradlew clean publishToSonatype closeSonatypeStagingRepository \
           -Dorg.gradle.parallel=false \
           -Psigning.keyId=${{ secrets.SIGNING_KEY_ID }} \
           -Psigning.password='${{ secrets.SIGNING_PASSWORD }}' \

.github/workflows/publish-snapshot.yml

@@ -49,7 +49,7 @@ jobs:
         run: |
           echo "GITHUB_REF=${GITHUB_REF}"
           chmod +x ./gradlew
-          ./gradlew clean publish -Dsnapshot=true \
+          ./gradlew clean publishToSonatype -Dsnapshot=true \
           -Dorg.gradle.parallel=false \
           -Psigning.keyId=${{ secrets.SIGNING_KEY_ID }} \
           -Psigning.password='${{ secrets.SIGNING_PASSWORD }}' \

CHANGELOG.md

@@ -20,3 +20,9 @@
 ##### 2025-05-20
 ### 修复
 - bug: 增加异常错误码 #21 [链接](https://github.com/bkdevops-projects/devops-scm/issues/21)
+
+
+# 1.1.0
+##### 2025-04-20
+### 新增
+- feat: 增加Gitee和TSvn服务提供者 #6 [链接](https://github.com/bkdevops-projects/devops-scm/issues/6)

README.md

@@ -11,6 +11,8 @@ devops-scm提供了一套统一的源代码接口，使得开发者能够方便
 - devops-scm-sample: 使用示例
 - devops-scm-test: 测试工具类
 
+[详情介绍](./doc/PROJECT_STRUCTURE.md)
+
 ## 快速开始
 ### 引包
 - Maven: pom.xml
@@ -112,6 +114,11 @@ devops-scm提供了一套统一的源代码接口，使得开发者能够方便
 [CHANGELOG](CHANGELOG.md)
 
 ## 新增源码管理平台
+- [从零开始接入源码管理平台](./doc/ADD_PROVIDER.md)
+
+
+- [已有sdk,补充适配模块](./doc/ADD_PROVIDER_SIMPLIFICATION.md)
+
 
 ## Contributing
 - [腾讯开源激励计划](https://opensource.tencent.com/contribution) 鼓励开发者的参与和贡献，期待你的加入

build.gradle.kts

@@ -102,3 +102,10 @@ subprojects {
         configFile = file("${rootDir}/config/checkstyle/tencent_checkstyle.xml")
     }
 }
+
+// gitee 演示项目仅供参考，不参与打包等任务
+project("devops-scm-provider:devops-scm-provider-git:devops-scm-provider-gitee-simple") {
+    tasks.all {
+        enabled = false
+    }
+}

buildSrc/src/main/kotlin/Versions.kt

@@ -1,6 +1,6 @@
 object Release {
     const val Group = "com.tencent.bk.devops.scm"
-    const val Version = "1.0.3"
+    const val Version = "1.1.0"
 }
 
 object Versions {

buildSrc/src/main/kotlin/plugins/nexusPublishing.gradle.kts

@@ -1,72 +1,18 @@
+import util.MavenUtil
+
 plugins {
     id("io.github.gradle-nexus.publish-plugin")
 }
 
 nexusPublishing {
     repositories {
-        sonatype {
-            // 正式包
-            var mavenRepoDeployUrl = System.getProperty("mavenRepoDeployUrl")
-            var mavenRepoUsername = System.getProperty("mavenRepoUsername")
-            var mavenRepoPassword = System.getProperty("mavenRepoPassword")
-
-            if (mavenRepoDeployUrl == null) {
-                mavenRepoDeployUrl = System.getenv("build_mavenRepoDeployUrl")
-            }
-
-            if (mavenRepoUsername == null) {
-                mavenRepoUsername = System.getenv("build_mavenRepoUsername")
-            }
-
-            if (mavenRepoPassword == null) {
-                mavenRepoPassword = System.getenv("build_mavenRepoPassword")
-            }
-
-            if (mavenRepoDeployUrl == null) {
-                mavenRepoDeployUrl = project.extra["MAVEN_REPO_DEPLOY_URL"]?.toString()
-            }
-
-            if (mavenRepoUsername == null) {
-                mavenRepoUsername = project.extra["MAVEN_REPO_USERNAME"]?.toString()
-            }
-
-            if (mavenRepoPassword == null) {
-                mavenRepoPassword = project.extra["MAVEN_REPO_PASSWORD"]?.toString()
-            }
 
-            // 快照包
-            var snapshotMavenRepoDeployUrl = System.getProperty("snapshotMavenRepoDeployUrl")
-            var snapshotMavenRepoUsername = System.getProperty("snapshotMavenRepoUsername")
-            var snapshotMavenRepoPassword = System.getProperty("snapshotMavenRepoPassword")
-
-            if (snapshotMavenRepoDeployUrl == null) {
-                snapshotMavenRepoDeployUrl = System.getenv("build_snapshotMavenRepoDeployUrl")
-            }
-
-            if (snapshotMavenRepoUsername == null) {
-                snapshotMavenRepoUsername = System.getenv("build_snapshotMavenRepoUsername")
-            }
-
-            if (snapshotMavenRepoPassword == null) {
-                snapshotMavenRepoPassword = System.getenv("build_snapshotMavenRepoPassword")
-            }
-
-            if (snapshotMavenRepoDeployUrl == null) {
-                snapshotMavenRepoDeployUrl = project.extra["MAVEN_REPO_SNAPSHOT_DEPLOY_URL"]?.toString()
-            }
-
-            if (snapshotMavenRepoUsername == null) {
-                snapshotMavenRepoUsername = project.extra["MAVEN_REPO_SNAPSHOT_USERNAME"]?.toString()
-            }
-
-            if (snapshotMavenRepoPassword == null) {
-                snapshotMavenRepoPassword = project.extra["MAVEN_REPO_SNAPSHOT_PASSWORD"]?.toString()
-            }
+        sonatype {
+            nexusUrl.set(uri(MavenUtil.getUrl(project)))
+            snapshotRepositoryUrl.set(uri(MavenUtil.getUrl(project)))
 
-            nexusUrl.set(uri(mavenRepoDeployUrl))
-            snapshotRepositoryUrl.set(uri(snapshotMavenRepoDeployUrl))
-            username.set(if (System.getProperty("snapshot") == "true") snapshotMavenRepoUsername else mavenRepoUsername)
-            password.set(if (System.getProperty("snapshot") == "true") snapshotMavenRepoPassword else mavenRepoPassword)
+            username.set(MavenUtil.getUserName(project))
+            password.set(MavenUtil.getPassword(project))
         }
     }
 }

buildSrc/src/main/kotlin/plugins/task-deploy-to-maven.gradle.kts

@@ -24,6 +24,7 @@
  * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+import util.MavenUtil
 import java.net.URI
 
 plugins {
@@ -105,13 +106,24 @@ publishing {
             }
         }
     }
+    repositories {
+        maven {
+            name = "nexus3"
+            url = URI(MavenUtil.getUrl(project))
+            credentials {
+                username = MavenUtil.getUserName(project)
+                password = MavenUtil.getPassword(project)
+            }
+        }
+    }
 }
 
 signing {
     sign(publishing.publications["mavenJava"])
 }
 
-val shouldPublish = project.the<SourceSetContainer>()["main"].allSource.files.isNotEmpty()
+val shouldPublish = project.the<SourceSetContainer>()["main"].allSource.files.isNotEmpty() ||
+        !project.name.contains("devops-scm-provider-gitee-simple")
 
 tasks.forEach {
     if (it.group == "publish") {

buildSrc/src/main/kotlin/util/MavenUtil.kt

@@ -0,0 +1,70 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ * A copy of the MIT License is included in this file.
+ *
+ *
+ * Terms of the MIT License:
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package util
+
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.extra
+
+object MavenUtil {
+
+    fun getUrl(project: Project): String {
+        return if (System.getProperty("snapshot") == "true") {
+            System.getProperty("snapshotMavenRepoDeployUrl")
+                ?: System.getenv("build_snapshotMavenRepoDeployUrl")
+                ?: project.extra["MAVEN_REPO_SNAPSHOT_DEPLOY_URL"]?.toString()
+        } else {
+            System.getProperty("mavenRepoDeployUrl")
+                ?: System.getenv("build_mavenRepoDeployUrl")
+                ?: project.extra["MAVEN_REPO_DEPLOY_URL"]?.toString()
+        } ?: ""
+    }
+
+    fun getUserName(project: Project): String? {
+        return if (System.getProperty("snapshot") == "true") {
+            System.getProperty("snapshotMavenRepoUsername")
+                ?: System.getenv("build_snapshotMavenRepoUsername")
+                ?: project.extra["MAVEN_REPO_SNAPSHOT_USERNAME"]?.toString()
+        } else {
+            System.getProperty("mavenRepoUsername")
+                ?: System.getenv("build_mavenRepoUsername")
+                ?: project.extra["MAVEN_REPO_USERNAME"]?.toString()
+        }
+    }
+
+    fun getPassword(project: Project): String? {
+        return if (System.getProperty("snapshot") == "true") {
+            System.getProperty("snapshotMavenRepoPassword")
+                ?: System.getenv("build_snapshotMavenRepoPassword")
+                ?: project.extra["MAVEN_REPO_SNAPSHOT_PASSWORD"]?.toString()
+        } else {
+            System.getProperty("mavenRepoPassword")
+                ?: System.getenv("build_mavenRepoPassword")
+                ?: project.extra["MAVEN_REPO_PASSWORD"]?.toString()
+        }
+    }
+}