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

Merge in CORE/base-third from ~CLOUD.LIU/base-third:final/10.0 to final/10.0

* commit 'd655f39e09b17cdf49dcc33b41ff5182f7656654':
  DEC-17833 fix: CBB独立发布 third打包脚本修改 withCBB写反了
  DEC-17833 feat: CBB独立发布 third打包脚本修改
  DEC-17833 feat: CBB独立发布 third打包脚本修改

build.third_step0.gradle

@@ -71,26 +71,16 @@ configurations {
 	essential
 }
 
-// 主体代码与CBB的对应关系
+// 主体代码与essential的对应关系配置在TeamCity
-String essentialBranch
+String essentialVersion = findProperty("essentialVersion")
-switch (branchNameUpperCase) {
+String cbbVersion = findProperty("cbbVersion")
-	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.essential:fine-essential:${essentialVersion}"
-	essential "com.fr.cbb:fine-scheduler:1.0-${essentialBranch}-SNAPSHOT"
+	essential "com.fr.cbb:fine-scheduler:${cbbVersion}"
-	essential "com.fr.cbb:fine-function:1.0-${essentialBranch}-SNAPSHOT"
+	essential "com.fr.cbb:fine-function:${cbbVersion}"
-	essential "com.fr.cbb:fine-sql:1.0-${essentialBranch}-SNAPSHOT"
+	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'
@@ -109,7 +99,7 @@ publishing {
 
 	third_build(MavenPublication) {
             groupId "com.fr.third"
-            artifactId "fine-third"
+            artifactId project.hasProperty("withCBB") ? "fine-third" : "fine-third-without-cbb"
             version maven_version_build
 	    ext.repo = 'snapshot'
             from components.java
@@ -179,11 +169,13 @@ task unpack(type:Copy) {
 
 // 将essential依赖等级的jar全部解压到classes下
 task unpackEssential(type:Copy) {
+	if (project.hasProperty("withCBB")) {
 		for (File file : configurations.essential.files) {
 			from zipTree(file)
 		}
 		into classesDir
 	}
+}
 
 unpackEssential.dependsOn unpack
 

build.third_step2.gradle

@@ -71,24 +71,12 @@ if(indexV != -1){
     version= branchName
 }
 
-// 主体代码与CBB的对应关系
+// 主体代码与essential的对应关系配置在TeamCity
-String essentialBranch
+String essentialVersion = findProperty("essentialVersion")
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
 
 //指定依赖
 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的对应关系
+// 主体代码与essential的对应关系配置在TeamCity
-String essentialBranch
+String essentialVersion = findProperty("essentialVersion")
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
-
 
 //指定依赖
 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的对应关系
+// 主体代码与essential的对应关系配置在TeamCity
-String essentialBranch
+String essentialVersion = findProperty("essentialVersion")
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
 
 //指定依赖
 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的对应关系
+// 主体代码与essential的对应关系配置在TeamCity
-String essentialBranch
+String essentialVersion = findProperty("essentialVersion")
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
 
 //指定依赖
 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的对应关系
+// 主体代码与essential的对应关系配置在TeamCity
-String essentialBranch
+String essentialVersion = findProperty("essentialVersion")
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
 
 //指定依赖
 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的对应关系
+// 主体代码与essential的对应关系配置在TeamCity
-String essentialBranch
+String essentialVersion = findProperty("essentialVersion")
-switch (version) {
-	case "FEATURE":
-	case "RESEARCH":
-		essentialBranch = "FEATURE"
-		break
-	case "RELEASE":
-	case "BUGFIX":
-		essentialBranch = "RELEASE"
-		break
-	default:
-		essentialBranch = "MASTER"
-}
 
 //指定依赖
 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"