Merge pull request #2321 in CORE/base-third from release/10.0 to bugfix/10.0

* commit '3649ad98513b0882827b7335cc73f1c107c91b5b':
  无JIRA任务 fix: 更新third打包脚本

build.third_step0-jdk11.gradle

@@ -57,10 +57,12 @@ configurations {
 	essential
 }
 
-// third的feature对应essential和cbb的release，其他对应master
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER'
-dependencies {
-	essential "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
+// 主体代码与essential的对应关系配置在TeamCity
+String essentialVersion = findProperty("essentialVersion")
+
+//指定依赖
+dependencies{
+	compileOnly "com.fr.essential:fine-essential:${essentialVersion}"
     // 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-jdk11.gradle

@@ -122,12 +122,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : '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-jdk11.gradle

@@ -75,12 +75,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : '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-jdk11.gradle

@@ -73,12 +73,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : '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-jdk11.gradle

@@ -65,12 +65,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : '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-jdk11.gradle

@@ -63,12 +63,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : '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-jdk11.gradle

@@ -58,12 +58,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : '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: "com.fr.third.server", name: "servlet-api", version: "3.0"

build.third_step8-jdk11.gradle

@@ -62,12 +62,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// third的feature对应essential和cbb的release，其他对应master
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : '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-ehcache/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
 	compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")

build.third_step8.gradle

@@ -53,24 +53,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-ehcache/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
 	compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")