Browse Source

Pull request #2317: 无JIRA任务 fix: 更新third打包脚本

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

* commit 'feb77d4f3735a3fa4a18f1cd5e46297786d9fc3b':
  无JIRA任务 fix: 更新third打包脚本
release/10.0
Cloud.Liu 4 years ago
parent
commit
3649ad9851
  1. 10
      build.third_step0-jdk11.gradle
  2. 6
      build.third_step2-jdk11.gradle
  3. 6
      build.third_step3-jdk11.gradle
  4. 6
      build.third_step4-jdk11.gradle
  5. 6
      build.third_step5-jdk11.gradle
  6. 6
      build.third_step6-jdk11.gradle
  7. 6
      build.third_step7-jdk11.gradle
  8. 6
      build.third_step8-jdk11.gradle
  9. 18
      build.third_step8.gradle

10
build.third_step0-jdk11.gradle

@ -57,10 +57,12 @@ configurations {
essential
}
// third的feature对应essential和cbb的releasemaster
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'

6
build.third_step2-jdk11.gradle

@ -122,12 +122,12 @@ if(indexV != -1){
version= branchName
}
// third的feature对应essential和cbb的releasemaster
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')

6
build.third_step3-jdk11.gradle

@ -75,12 +75,12 @@ if(indexV != -1){
version= branchName
}
// third的feature对应essential和cbb的releasemaster
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")

6
build.third_step4-jdk11.gradle

@ -73,12 +73,12 @@ if(indexV != -1){
version= branchName
}
// third的feature对应essential和cbb的releasemaster
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')

6
build.third_step5-jdk11.gradle

@ -65,12 +65,12 @@ if(indexV != -1){
version= branchName
}
// third的feature对应essential和cbb的releasemaster
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')

6
build.third_step6-jdk11.gradle

@ -63,12 +63,12 @@ if(indexV != -1){
version= branchName
}
// third的feature对应essential和cbb的releasemaster
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')

6
build.third_step7-jdk11.gradle

@ -58,12 +58,12 @@ if(indexV != -1){
version= branchName
}
// third的feature对应essential和cbb的releasemaster
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"

6
build.third_step8-jdk11.gradle

@ -62,12 +62,12 @@ if(indexV != -1){
version= branchName
}
// third的feature对应essential和cbb的releasemaster
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")

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

Loading…
Cancel
Save