From a9c325df952c2bf0d67b8798e7354d7ab8c732d9 Mon Sep 17 00:00:00 2001 From: Harrison Date: Tue, 30 Apr 2019 14:25:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=20jira=20=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=20=E6=81=A2=E5=A4=8D=E5=88=86=E6=94=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step0.gradle | 6 ++++-- 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, 16 insertions(+), 8 deletions(-) diff --git a/build.third_step0.gradle b/build.third_step0.gradle index 7de441b96..b35313dfe 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -41,7 +41,8 @@ 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 maven_version="${version}-RELEASE-SNAPSHOT" +// @branch - 分支信息 +def maven_version="${version}-FEATURE-SNAPSHOT" def jar_version = version configurations { @@ -50,7 +51,8 @@ configurations { } dependencies { - thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" + // @branch - 分支信息 + thirdjar "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT" sigar "com.fr.third:sigar:1.6.0" testCompile 'junit:junit:4.12' } diff --git a/build.third_step1.gradle b/build.third_step1.gradle index e84c6bc8a..92eea1a66 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -59,7 +59,8 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-poi/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" + // @branch - 分支信息 + compile "com.fr.third:fine-third:10.0-FEATURE-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 8242521fb..dd34d407c 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -48,7 +48,8 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" + // @branch - 分支信息 + compile "com.fr.third:fine-third:10.0-FEATURE-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 af7e44eb1..28ea10970 100644 --- a/build.third_step3.gradle +++ b/build.third_step3.gradle @@ -46,7 +46,8 @@ def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+ dependencies{ compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" + // @branch - 分支信息 + compile "com.fr.third:fine-third:10.0-FEATURE-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 44f21f29c..1c309789a 100644 --- a/build.third_step4.gradle +++ b/build.third_step4.gradle @@ -45,7 +45,8 @@ def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+ dependencies{ compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" + // @branch - 分支信息 + compile "com.fr.third:fine-third:10.0-FEATURE-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 34ad92d5e..d7ce2b8fe 100644 --- a/build.third_step5.gradle +++ b/build.third_step5.gradle @@ -44,7 +44,8 @@ dependencies{ 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}/build/libs/",include:'**/*.jar') - compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" + // @branch - 分支信息 + compile "com.fr.third:fine-third:10.0-FEATURE-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 7b416a1f2..ab206af76 100644 --- a/build.third_step6.gradle +++ b/build.third_step6.gradle @@ -75,7 +75,8 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-jgit/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" + // @branch - 分支信息 + compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT" compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' }