From 7d5460f813b308d83d998030903e2106fa95d823 Mon Sep 17 00:00:00 2001
From: "Cloud.Liu" <cloud.liu@fanruan.com>
Date: Fri, 16 Apr 2021 19:58:05 +0800
Subject: [PATCH] =?UTF-8?q?DEC-17833=20feat:=20CBB=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=20third=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.third_step0.gradle | 30 ++++++++++--------------------
 build.third_step2.gradle | 18 +++---------------
 build.third_step3.gradle | 19 +++----------------
 build.third_step4.gradle | 18 +++---------------
 build.third_step5.gradle | 18 +++---------------
 build.third_step6.gradle | 18 +++---------------
 build.third_step7.gradle | 18 +++---------------
 7 files changed, 28 insertions(+), 111 deletions(-)

diff --git a/build.third_step0.gradle b/build.third_step0.gradle
index b847efe06..0c78f0285 100644
--- a/build.third_step0.gradle
+++ b/build.third_step0.gradle
@@ -71,26 +71,16 @@ configurations {
 	essential
 }
 
-// 主体代码与CBB的对应关系
-String essentialBranch
-switch (branchNameUpperCase) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
-
-dependencies {
-	essential "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
-	essential "com.fr.cbb:fine-scheduler:1.0-${essentialBranch}-SNAPSHOT"
-	essential "com.fr.cbb:fine-function:1.0-${essentialBranch}-SNAPSHOT"
-	essential "com.fr.cbb:fine-sql:1.0-${essentialBranch}-SNAPSHOT"
+// 主体代码与essential的对应关系配置在TeamCity
+String essentialVersion = findProperty("essentialVersion")
+String cbbVersion = findProperty("cbbVersion")
+
+//指定依赖
+dependencies{
+	essential "com.fr.essential:fine-essential:${essentialVersion}"
+	essential "com.fr.cbb:fine-scheduler:${cbbVersion}"
+	essential "com.fr.cbb:fine-function:${cbbVersion}"
+	essential "com.fr.cbb:fine-sql:${cbbVersion}"
     // thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
 	// sigar "com.fr.third:sigar:1.6.0"
     testCompile 'junit:junit:4.12'
diff --git a/build.third_step2.gradle b/build.third_step2.gradle
index 7b50ca71e..9c0401242 100644
--- a/build.third_step2.gradle
+++ b/build.third_step2.gradle
@@ -71,24 +71,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// 主体代码与CBB的对应关系
-String essentialBranch
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
+// 主体代码与essential的对应关系配置在TeamCity
+String essentialVersion = findProperty("essentialVersion")
 
 //指定依赖
 dependencies{
-	compileOnly "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
+	compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
 	compile fileTree(dir:"${srcDir}/fine-byte-buddy/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-commons-fileupload/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-httpcomponents/http-client/lib",include:'**/*.jar')
diff --git a/build.third_step3.gradle b/build.third_step3.gradle
index 9f68a329e..f0a827de5 100644
--- a/build.third_step3.gradle
+++ b/build.third_step3.gradle
@@ -54,25 +54,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// 主体代码与CBB的对应关系
-String essentialBranch
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
-
+// 主体代码与essential的对应关系配置在TeamCity
+String essentialVersion = findProperty("essentialVersion")
 
 //指定依赖
 dependencies{
-	compileOnly "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
+	compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
 	compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
 	compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
diff --git a/build.third_step4.gradle b/build.third_step4.gradle
index ee70404e8..9c9b696cb 100644
--- a/build.third_step4.gradle
+++ b/build.third_step4.gradle
@@ -54,24 +54,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// 主体代码与CBB的对应关系
-String essentialBranch
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
+// 主体代码与essential的对应关系配置在TeamCity
+String essentialVersion = findProperty("essentialVersion")
 
 //指定依赖
 dependencies{
-	compileOnly "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
+	compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
 	// compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
diff --git a/build.third_step5.gradle b/build.third_step5.gradle
index e1bac0140..ebe8bc015 100644
--- a/build.third_step5.gradle
+++ b/build.third_step5.gradle
@@ -54,24 +54,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// 主体代码与CBB的对应关系
-String essentialBranch
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
+// 主体代码与essential的对应关系配置在TeamCity
+String essentialVersion = findProperty("essentialVersion")
 
 //指定依赖
 dependencies{
-	compileOnly "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
+	compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
 	compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar')
 	// compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
diff --git a/build.third_step6.gradle b/build.third_step6.gradle
index 702fcf2c5..e7bb4bc44 100644
--- a/build.third_step6.gradle
+++ b/build.third_step6.gradle
@@ -52,24 +52,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// 主体代码与CBB的对应关系
-String essentialBranch
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
+// 主体代码与essential的对应关系配置在TeamCity
+String essentialVersion = findProperty("essentialVersion")
 
 //指定依赖
 dependencies{
-	compileOnly "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
+	compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
 	compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'ojdbc7-12.1.0.jar')
 	compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar')
diff --git a/build.third_step7.gradle b/build.third_step7.gradle
index 0ec3d15a2..99d69af27 100644
--- a/build.third_step7.gradle
+++ b/build.third_step7.gradle
@@ -52,24 +52,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// 主体代码与CBB的对应关系
-String essentialBranch
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
+// 主体代码与essential的对应关系配置在TeamCity
+String essentialVersion = findProperty("essentialVersion")
 
 //指定依赖
 dependencies{
-	compileOnly "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
+	compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
 	compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
 	compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"