Issue 89&92

README.md

@@ -35,14 +35,14 @@
 - **统一常用工具类** ： 避免代码重复
 
 ## 功能特性
-- 提供gradle快速开发插件[devops-boot-gradle-plugin](./devops-boot-project/devops-boot-tools/devops-boot-gradle-plugin/README.md)
-- 提供gradle快速发布插件[devops-publish-gradle-plugin](./devops-boot-project/devops-boot-tools/devops-publish-gradle-plugin/README.md)
-- 提供统一版本依赖管理[devops-boot-dependencies](./devops-boot-project/devops-boot-dependencies/README.md)
+- 提供gradle快速开发插件[devops-boot-gradle-plugin](./docs/plugin/devops-boot-gradle-plugin.md)
+- 提供gradle快速发布插件[devops-publish-gradle-plugin](./docs/plugin/devops-publish-gradle-plugin.md)
+- 提供统一版本依赖管理[devops-boot-dependencies](./docs/dependency/devops-boot-dependencies.md)
 - 提供多个开箱即用的starter组件
-  - [starter-api](./devops-boot-project/devops-boot-starters/devops-boot-starter-api/README.md)
-  - [starter-logging](./devops-boot-project/devops-boot-starters/devops-boot-starter-logging/README.md)
-  - [starter-web](./devops-boot-project/devops-boot-starters/devops-boot-starter-web/README.md)
-  - [starter-service](./devops-boot-project/devops-boot-starters/devops-boot-starter-service/README.md)
+  - [starter-api](./docs/starter/devops-boot-starter-api.md)
+  - [starter-logging](./docs/starter/devops-boot-starter-logging.md)
+  - [starter-web](./docs/starter/devops-boot-starter-web.md)
+  - [starter-service](./docs/starter/devops-boot-starter-service.md)
   - ...
 
 ## 核心依赖

buildSrc/src/main/kotlin/Versions.kt

@@ -1,6 +1,6 @@
 object Release {
     const val Group = "com.tencent.devops"
-    const val Version = "0.0.4"
+    const val Version = "0.0.5-SNAPSHOT"
 }
 
 object Versions {

devops-boot-project/devops-boot-dependencies/build.gradle.kts

@@ -12,28 +12,37 @@ javaPlatform {
 dependencies {
     constraints {
         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")
-
-        // 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")
-
-        // guava
-        api("com.google.guava:guava:29.0-jre")
-
-        // swagger
-        api("io.swagger:swagger-annotations:1.5.20")
-        api("io.swagger:swagger-models:1.5.20")
-        api("io.springfox:springfox-boot-starter:3.0.0")
-
-        // s3
-        api("com.amazonaws:aws-java-sdk-s3:1.11.700")
     }
+
+    //Spring
     api(platform(MavenBom.SpringBoot))
     api(platform(MavenBom.SpringCloud))
+
+    // 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")
+
+    // 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")
+
+    // guava
+    api("com.google.guava:guava:29.0-jre")
+
+    // swagger
+    api("io.swagger:swagger-annotations:1.5.20")
+    api("io.swagger:swagger-models:1.5.20")
+    api("io.springfox:springfox-boot-starter:3.0.0")
+
+    // s3
+    api("com.amazonaws:aws-java-sdk-s3:1.11.700")
+
+    // TODO : it can be deleted after Spring cloud upgrade feign version (>= 11.4)
+    api(enforcedPlatform("io.github.openfeign:feign-core:11.6"))
+    api(enforcedPlatform("io.github.openfeign:feign-jackson:11.6"))
+    api(enforcedPlatform("io.github.openfeign:feign-jaxrs:11.6"))
+    api(enforcedPlatform("io.github.openfeign:feign-okhttp:11.6"))
 }

devops-boot-project/devops-boot-tools/devops-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/DevOpsBootPlugin.kt

@@ -15,10 +15,11 @@ import java.nio.file.Files
 class DevOpsBootPlugin : Plugin<Project> {
 
     override fun apply(project: Project) {
-        RepositoryConvention().apply(project)
         // solve issue 73
-        JavaConvention().apply(project)
         KotlinConvention().apply(project)
+        JavaConvention().apply(project)
+        // add dependencyManagement
+        RepositoryConvention().apply(project)
         // ignore the next configuration if this is an empty project
         if (isNotEmptyProject(project)) {
             SpringBootConvention().apply(project)

devops-boot-sample/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.tencent.devops.boot") version "0.0.4-SNAPSHOT"
+    id("com.tencent.devops.boot") version "0.0.5-SNAPSHOT"
 }
 
 allprojects {

docs/changelog.md

@@ -1,6 +1,8 @@
 # 更新日志
 
-## [0.0.4] (https://github.com/bkdevops-projects/devops-framework/releases/tag/0.0.4) (2021-07-29)
+## [0.0.5] (待发布)
+
+## [0.0.4](https://github.com/bkdevops-projects/devops-framework/releases/tag/0.0.4) (2021-07-29)
 
 ### Features
 - 支持k8s云原生编译打包方式

docs/index.md

@@ -29,14 +29,14 @@
 - **统一常用工具类** ： 避免代码重复
 
 ## 功能特性
-- 提供gradle快速开发插件[devops-boot-gradle-plugin](./devops-boot-project/devops-boot-tools/devops-boot-gradle-plugin/README.md)
-- 提供gradle快速发布插件[devops-publish-gradle-plugin](./devops-boot-project/devops-boot-tools/devops-publish-gradle-plugin/README.md)
-- 提供统一版本依赖管理[devops-boot-dependencies](./devops-boot-project/devops-boot-dependencies/README.md)
+- 提供gradle快速开发插件[devops-boot-gradle-plugin](/plugin/devops-boot-gradle-plugin.md)
+- 提供gradle快速发布插件[devops-publish-gradle-plugin](/plugin/devops-publish-gradle-plugin.md)
+- 提供统一版本依赖管理[devops-boot-dependencies](/dependency/devops-boot-dependencies.md)
 - 提供多个开箱即用的starter组件
-    - [starter-api](./devops-boot-project/devops-boot-starters/devops-boot-starter-api/README.md)
-    - [starter-logging](./devops-boot-project/devops-boot-starters/devops-boot-starter-logging/README.md)
-    - [starter-web](./devops-boot-project/devops-boot-starters/devops-boot-starter-web/README.md)
-    - [starter-service](./devops-boot-project/devops-boot-starters/devops-boot-starter-service/README.md)
+    - [starter-api](/starter/devops-boot-starter-api.md)
+    - [starter-logging](/starter/devops-boot-starter-logging.md)
+    - [starter-web](/starter/devops-boot-starter-web.md)
+    - [starter-service](/starter/devops-boot-starter-service.md)
     - ...
 
 ## 核心依赖