|
|
@ -58,12 +58,12 @@ if(indexV != -1){ |
|
|
|
version= branchName |
|
|
|
version= branchName |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// third的feature对应essential和cbb的release,其他对应master |
|
|
|
// 主体代码与essential的对应关系配置在TeamCity |
|
|
|
String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER' |
|
|
|
String essentialVersion = findProperty("essentialVersion") |
|
|
|
|
|
|
|
|
|
|
|
//指定依赖 |
|
|
|
//指定依赖 |
|
|
|
dependencies{ |
|
|
|
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:"${srcDir}/build/libs/",include:'**/*.jar') |
|
|
|
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") |
|
|
|
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") |
|
|
|
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" |
|
|
|
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" |
|
|
|