From 0a9712d5d5932489d9f1cac5ceab3aa431af05bf Mon Sep 17 00:00:00 2001 From: "Cloud.Liu" Date: Tue, 11 May 2021 09:39:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20fix:=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0third=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step0-jdk11.gradle | 10 ++++++---- build.third_step2-jdk11.gradle | 6 +++--- build.third_step3-jdk11.gradle | 6 +++--- build.third_step4-jdk11.gradle | 6 +++--- build.third_step5-jdk11.gradle | 6 +++--- build.third_step6-jdk11.gradle | 6 +++--- build.third_step7-jdk11.gradle | 6 +++--- build.third_step8-jdk11.gradle | 6 +++--- build.third_step8.gradle | 18 +++--------------- 9 files changed, 30 insertions(+), 40 deletions(-) diff --git a/build.third_step0-jdk11.gradle b/build.third_step0-jdk11.gradle index 0d43cae58..fd284fa04 100644 --- a/build.third_step0-jdk11.gradle +++ b/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' diff --git a/build.third_step2-jdk11.gradle b/build.third_step2-jdk11.gradle index fc33b1919..8048cf2df 100644 --- a/build.third_step2-jdk11.gradle +++ b/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') diff --git a/build.third_step3-jdk11.gradle b/build.third_step3-jdk11.gradle index 7f3cff8a7..4acc46051 100644 --- a/build.third_step3-jdk11.gradle +++ b/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") diff --git a/build.third_step4-jdk11.gradle b/build.third_step4-jdk11.gradle index 4d9aef08b..a7f572537 100644 --- a/build.third_step4-jdk11.gradle +++ b/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') diff --git a/build.third_step5-jdk11.gradle b/build.third_step5-jdk11.gradle index 07fa4d902..1462676fd 100644 --- a/build.third_step5-jdk11.gradle +++ b/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') diff --git a/build.third_step6-jdk11.gradle b/build.third_step6-jdk11.gradle index d7015ce9a..2153ca4f2 100644 --- a/build.third_step6-jdk11.gradle +++ b/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') diff --git a/build.third_step7-jdk11.gradle b/build.third_step7-jdk11.gradle index e8dd9b010..c5e7881cb 100644 --- a/build.third_step7-jdk11.gradle +++ b/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" diff --git a/build.third_step8-jdk11.gradle b/build.third_step8-jdk11.gradle index 8a57459e4..8de7ddd64 100644 --- a/build.third_step8-jdk11.gradle +++ b/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") diff --git a/build.third_step8.gradle b/build.third_step8.gradle index 06866e437..f9ee214d4 100644 --- a/build.third_step8.gradle +++ b/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")