DEC-17833 feat: CBB独立发布 third打包脚本修改

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"
-}
+// 主体代码与essential的对应关系配置在TeamCity
+String essentialVersion = findProperty("essentialVersion")
+String cbbVersion = findProperty("cbbVersion")
 
+//指定依赖
 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 "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'

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')

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")

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')

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')

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')

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"