From 7e306b867e4a224670d9e9dcd7aef2f0ccc17558 Mon Sep 17 00:00:00 2001 From: Harrison Date: Thu, 7 Nov 2019 11:42:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=20jira=20=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=20=E5=A4=84=E7=90=86=E5=88=86=E6=94=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step0.gradle | 4 +++- build.third_step1.gradle | 3 ++- build.third_step2.gradle | 3 ++- build.third_step3.gradle | 3 ++- build.third_step4.gradle | 3 ++- build.third_step5.gradle | 3 ++- build.third_step6.gradle | 3 ++- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/build.third_step0.gradle b/build.third_step0.gradle index c9bc2aeda..20fbade8c 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -43,8 +43,10 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.s def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) def srcDir="." +def MVN_BRANCH = branchName.toUpperCase() + // @branch - 分支信息 -def maven_version="${version}-RELEASE-SNAPSHOT" +def maven_version="${version}-${MVN_BRANCH}-SNAPSHOT" def jar_version = version configurations { diff --git a/build.third_step1.gradle b/build.third_step1.gradle index 4ee016047..d75b4d367 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -58,6 +58,7 @@ repositories{ FileTree files =fileTree(dir:'./',include:'build.*.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator)) def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) +def MVN_BRANCH = branchName.toUpperCase() //指定依赖 dependencies{ @@ -65,7 +66,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') // @branch - 分支信息 - compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' } diff --git a/build.third_step2.gradle b/build.third_step2.gradle index 9e1e2cb2e..d96413d0e 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -46,6 +46,7 @@ repositories{ FileTree files =fileTree(dir:'./',include:'build.*.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator)) def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) +def MVN_BRANCH = branchName.toUpperCase() //指定依赖 dependencies{ @@ -55,7 +56,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-antlr4/lib",include: '**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') // @branch - 分支信息 - compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' } diff --git a/build.third_step3.gradle b/build.third_step3.gradle index e5658dba6..d1742fe78 100644 --- a/build.third_step3.gradle +++ b/build.third_step3.gradle @@ -45,13 +45,14 @@ repositories{ FileTree files =fileTree(dir:'./',include:'build.*.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator)) def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) +def MVN_BRANCH = branchName.toUpperCase() //指定依赖 dependencies{ compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') // @branch - 分支信息 - compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' } diff --git a/build.third_step4.gradle b/build.third_step4.gradle index b38e93e7f..dadd4e63a 100644 --- a/build.third_step4.gradle +++ b/build.third_step4.gradle @@ -44,13 +44,14 @@ repositories{ FileTree files =fileTree(dir:'./',include:'build.*.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator)) def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) +def MVN_BRANCH = branchName.toUpperCase() //指定依赖 dependencies{ compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') // @branch - 分支信息 - compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' } diff --git a/build.third_step5.gradle b/build.third_step5.gradle index 819ba5457..d981eb718 100644 --- a/build.third_step5.gradle +++ b/build.third_step5.gradle @@ -42,6 +42,7 @@ repositories{ FileTree files =fileTree(dir:'./',include:'build.*.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator)) def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) +def MVN_BRANCH = branchName.toUpperCase() //指定依赖 dependencies{ @@ -49,7 +50,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') // @branch - 分支信息 - compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' } diff --git a/build.third_step6.gradle b/build.third_step6.gradle index f0fb86b0a..40b2df95e 100644 --- a/build.third_step6.gradle +++ b/build.third_step6.gradle @@ -68,6 +68,7 @@ repositories{ FileTree files =fileTree(dir:'./',include:'build*.gradle') def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator)) def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) +def MVN_BRANCH = branchName.toUpperCase() //指定依赖 dependencies{ @@ -83,7 +84,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-jgit/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') // @branch - 分支信息 - compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' }