From a1651ba3e7bc80dc652c090dbc98842e63523cc0 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 12 Jun 2018 11:59:59 +0800 Subject: [PATCH 1/2] build --- build.third_step0.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.third_step0.gradle b/build.third_step0.gradle index c8b19dfb9..51d880adb 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -47,8 +47,8 @@ task unJar{ unjar(dest:"build/classes/main"){ "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT" - fileset(dir:"../../finereport-lib-other/${branchName}"){ - include(name:"batik-all-1.9.jar") + fileset(dir: configurations.compile.asPath){ + include(name:'fine-third*.jar') } fileset(dir:"${srcDir}/fine-poi/lib"){ include(name:'**/*.jar') From c744164ba265211b371fdbc9d60f1e07634875e0 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 12 Jun 2018 12:04:07 +0800 Subject: [PATCH 2/2] build --- build.third_step0.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.third_step0.gradle b/build.third_step0.gradle index 51d880adb..dee7c0b29 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -46,10 +46,12 @@ task unJar{ println "------------------------------------------------unjar" unjar(dest:"build/classes/main"){ - "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT" fileset(dir: configurations.compile.asPath){ include(name:'fine-third*.jar') } + fileset(dir:"../../finereport-lib-other/${branchName}"){ + include(name:"batik-all-1.9.jar") + } fileset(dir:"${srcDir}/fine-poi/lib"){ include(name:'**/*.jar') }