From 46ac23b29b2107c8b1b57297ed4ce695fdba298d Mon Sep 17 00:00:00 2001 From: carrypan Date: Thu, 29 Jul 2021 17:46:35 +0800 Subject: [PATCH 1/5] 0.0.5-SNAPSHOT --- buildSrc/src/main/kotlin/Versions.kt | 2 +- devops-boot-sample/build.gradle.kts | 2 +- docs/changelog.md | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 9927b0b..b173387 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/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 { diff --git a/devops-boot-sample/build.gradle.kts b/devops-boot-sample/build.gradle.kts index 76b4a6f..3eb6dfb 100644 --- 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.4-SNAPSHOT" + id("com.tencent.devops.boot") version "0.0.5-SNAPSHOT" } allprojects { diff --git a/docs/changelog.md b/docs/changelog.md index aee5c3a..c4d2a50 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,5 +1,7 @@ # 更新日志 +## [0.0.5] (待发布) + ## [0.0.4] (https://github.com/bkdevops-projects/devops-framework/releases/tag/0.0.4) (2021-07-29) ### Features From 5143f01fa04f0a3dc7d535bbbd59a56316f0fb30 Mon Sep 17 00:00:00 2001 From: carrypan Date: Thu, 29 Jul 2021 18:10:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?documentation:=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E6=96=87=E6=A1=A3=20#65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.md b/docs/changelog.md index c4d2a50..7ec7087 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,7 +2,7 @@ ## [0.0.5] (待发布) -## [0.0.4] (https://github.com/bkdevops-projects/devops-framework/releases/tag/0.0.4) (2021-07-29) +## [0.0.4](https://github.com/bkdevops-projects/devops-framework/releases/tag/0.0.4) (2021-07-29) ### Features - 支持k8s云原生编译打包方式 From e63b3b2308abbf71dd56202f3f47b21e3672de37 Mon Sep 17 00:00:00 2001 From: carrypan Date: Thu, 29 Jul 2021 21:39:03 +0800 Subject: [PATCH 3/5] =?UTF-8?q?documentation:=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E6=96=87=E6=A1=A3=20#65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 14 +++++++------- docs/index.md | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index f624a1e..264110a 100644 --- a/README.md +++ b/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) - ... ## 核心依赖 diff --git a/docs/index.md b/docs/index.md index e922fa8..f5c11aa 100644 --- a/docs/index.md +++ b/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) - ... ## 核心依赖 From 42aa026938b9e332c1ebae841f648752decd2dd9 Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Sat, 31 Jul 2021 12:21:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bug:=20dependencies=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=9A=84=E7=89=88=E6=9C=AC=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=95=88=20bug:=20feign=2010.10.1=E8=87=AA=E5=8A=A8=E5=9C=A8he?= =?UTF-8?q?ader=E7=9A=84value=E7=9A=84=E9=80=97=E5=8F=B7=E5=90=8E=E9=9D=A2?= =?UTF-8?q?=E5=8A=A0=E7=A9=BA=E6=A0=BC,=20=E5=AF=BC=E8=87=B4=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=88=B0=E7=9A=84=E5=80=BC=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A2=84=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops-boot-dependencies/build.gradle.kts | 51 +++++++++++-------- .../com/tencent/devops/DevOpsBootPlugin.kt | 5 +- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/devops-boot-project/devops-boot-dependencies/build.gradle.kts b/devops-boot-project/devops-boot-dependencies/build.gradle.kts index 54c8048..5f12c77 100644 --- a/devops-boot-project/devops-boot-dependencies/build.gradle.kts +++ b/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(enforcedPlatform("io.jsonwebtoken:jjwt-api:0.11.2")) + api(enforcedPlatform("io.jsonwebtoken:jjwt-impl:0.11.2")) + api(enforcedPlatform("io.jsonwebtoken:jjwt-jackson:0.11.2")) + + // apache common + api(enforcedPlatform("commons-io:commons-io:2.6")) + api(enforcedPlatform("org.apache.commons:commons-compress:1.18")) + api(enforcedPlatform("org.apache.hadoop:hadoop-hdfs:2.6.0")) + api(enforcedPlatform("org.apache.hadoop:hadoop-common:2.6.0")) + + // guava + api(enforcedPlatform("com.google.guava:guava:29.0-jre")) + + // swagger + api(enforcedPlatform("io.swagger:swagger-annotations:1.5.20")) + api(enforcedPlatform("io.swagger:swagger-models:1.5.20")) + api(enforcedPlatform("io.springfox:springfox-boot-starter:3.0.0")) + + // s3 + api(enforcedPlatform("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")) } diff --git a/devops-boot-project/devops-boot-tools/devops-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/DevOpsBootPlugin.kt b/devops-boot-project/devops-boot-tools/devops-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/DevOpsBootPlugin.kt index 4f4b8d2..4e04f62 100644 --- a/devops-boot-project/devops-boot-tools/devops-boot-gradle-plugin/src/main/kotlin/com/tencent/devops/DevOpsBootPlugin.kt +++ b/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 { 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) From bae9141936a21c8abdc1e19839cf2752109bcc5f Mon Sep 17 00:00:00 2001 From: stubenhuang Date: Tue, 2 Nov 2021 14:51:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?bug:=20dependencies=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E7=9A=84=E7=89=88=E6=9C=AC=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=95=88=20bug:=20feign=2010.10.1=E8=87=AA=E5=8A=A8=E5=9C=A8he?= =?UTF-8?q?ader=E7=9A=84value=E7=9A=84=E9=80=97=E5=8F=B7=E5=90=8E=E9=9D=A2?= =?UTF-8?q?=E5=8A=A0=E7=A9=BA=E6=A0=BC,=20=E5=AF=BC=E8=87=B4=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=88=B0=E7=9A=84=E5=80=BC=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A2=84=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops-boot-dependencies/build.gradle.kts | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/devops-boot-project/devops-boot-dependencies/build.gradle.kts b/devops-boot-project/devops-boot-dependencies/build.gradle.kts index 5f12c77..9cb1ac8 100644 --- a/devops-boot-project/devops-boot-dependencies/build.gradle.kts +++ b/devops-boot-project/devops-boot-dependencies/build.gradle.kts @@ -19,26 +19,26 @@ dependencies { api(platform(MavenBom.SpringCloud)) // jwt - api(enforcedPlatform("io.jsonwebtoken:jjwt-api:0.11.2")) - api(enforcedPlatform("io.jsonwebtoken:jjwt-impl:0.11.2")) - api(enforcedPlatform("io.jsonwebtoken:jjwt-jackson:0.11.2")) + 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(enforcedPlatform("commons-io:commons-io:2.6")) - api(enforcedPlatform("org.apache.commons:commons-compress:1.18")) - api(enforcedPlatform("org.apache.hadoop:hadoop-hdfs:2.6.0")) - api(enforcedPlatform("org.apache.hadoop:hadoop-common:2.6.0")) + 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(enforcedPlatform("com.google.guava:guava:29.0-jre")) + api("com.google.guava:guava:29.0-jre") // swagger - api(enforcedPlatform("io.swagger:swagger-annotations:1.5.20")) - api(enforcedPlatform("io.swagger:swagger-models:1.5.20")) - api(enforcedPlatform("io.springfox:springfox-boot-starter:3.0.0")) + 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(enforcedPlatform("com.amazonaws:aws-java-sdk-s3:1.11.700")) + 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"))