Merge pull request #1923 in CORE/base-third from feature/10.0 to feature/x

* commit 'd7f108a7f12afe060e85d16de9176fe8bfbb42ce':
  无JIRA任务 feat: CBB增加分支
  无JIRA任务 fix: 修改third打包脚本
  无JIRA任务 fix: 修改third打包脚本

build.third_step2.gradle

@@ -71,8 +71,20 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
+// 主体代码与CBB的对应关系
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER'
+String essentialBranch
+switch (version) {
+	case "FEATURE":
+	case "RESEARCH":
+		essentialBranch = "FEATURE"
+		break
+	case "RELEASE":
+	case "BUGFIX":
+		essentialBranch = "RELEASE"
+		break
+	default:
+		essentialBranch = "MASTER"
+}
 
 //指定依赖
 dependencies{

build.third_step3.gradle

@@ -54,8 +54,20 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
+// 主体代码与CBB的对应关系
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER'
+String essentialBranch
+switch (version) {
+	case "FEATURE":
+	case "RESEARCH":
+		essentialBranch = "FEATURE"
+		break
+	case "RELEASE":
+	case "BUGFIX":
+		essentialBranch = "RELEASE"
+		break
+	default:
+		essentialBranch = "MASTER"
+}
 
 
 //指定依赖

build.third_step4.gradle

@@ -54,8 +54,20 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
+// 主体代码与CBB的对应关系
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER'
+String essentialBranch
+switch (version) {
+	case "FEATURE":
+	case "RESEARCH":
+		essentialBranch = "FEATURE"
+		break
+	case "RELEASE":
+	case "BUGFIX":
+		essentialBranch = "RELEASE"
+		break
+	default:
+		essentialBranch = "MASTER"
+}
 
 //指定依赖
 dependencies{

build.third_step5.gradle

@@ -54,8 +54,20 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
+// 主体代码与CBB的对应关系
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER'
+String essentialBranch
+switch (version) {
+	case "FEATURE":
+	case "RESEARCH":
+		essentialBranch = "FEATURE"
+		break
+	case "RELEASE":
+	case "BUGFIX":
+		essentialBranch = "RELEASE"
+		break
+	default:
+		essentialBranch = "MASTER"
+}
 
 //指定依赖
 dependencies{

build.third_step6.gradle

@@ -52,8 +52,20 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
+// 主体代码与CBB的对应关系
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER'
+String essentialBranch
+switch (version) {
+	case "FEATURE":
+	case "RESEARCH":
+		essentialBranch = "FEATURE"
+		break
+	case "RELEASE":
+	case "BUGFIX":
+		essentialBranch = "RELEASE"
+		break
+	default:
+		essentialBranch = "MASTER"
+}
 
 //指定依赖
 dependencies{

build.third_step7.gradle

@@ -52,8 +52,20 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
+// 主体代码与CBB的对应关系
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER'
+String essentialBranch
+switch (version) {
+	case "FEATURE":
+	case "RESEARCH":
+		essentialBranch = "FEATURE"
+		break
+	case "RELEASE":
+	case "BUGFIX":
+		essentialBranch = "RELEASE"
+		break
+	default:
+		essentialBranch = "MASTER"
+}
 
 //指定依赖
 dependencies{

build.third_step8.gradle

@@ -53,8 +53,20 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
+// 主体代码与CBB的对应关系
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER'
+String essentialBranch
+switch (version) {
+	case "FEATURE":
+	case "RESEARCH":
+		essentialBranch = "FEATURE"
+		break
+	case "RELEASE":
+	case "BUGFIX":
+		essentialBranch = "RELEASE"
+		break
+	default:
+		essentialBranch = "MASTER"
+}
 
 //指定依赖
 dependencies{