From c92ae4fa5eefb10831ef5564662647ba4a0c43fb Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Wed, 5 Dec 2018 14:38:27 +0800 Subject: [PATCH] fenzhi --- build.third_step0.gradle | 4 ++-- build.third_step1.gradle | 2 +- build.third_step2.gradle | 8 ++++---- build.third_step3.gradle | 2 +- build.third_step4.gradle | 2 +- build.third_step5.gradle | 2 +- build.third_step6.gradle | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.third_step0.gradle b/build.third_step0.gradle index 000acec14..256b434ab 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -40,7 +40,7 @@ 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}-FEATURE-SNAPSHOT" +def maven_version="${version}-RELEASE-SNAPSHOT" def jar_version = version configurations { @@ -49,7 +49,7 @@ configurations { } dependencies { - thirdjar "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT" + thirdjar "com.fr.third:fine-third:10.0-RELEASE-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 205f72c16..1e65d5896 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -56,7 +56,7 @@ 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:10.0-FEATURE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-RELEASE-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 462459a73..89850e812 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -18,13 +18,13 @@ def srcDir="." //设置源码路径 sourceSets{ main{ - java { - srcDirs = [ + java{ + srcDirs=[ "${srcDir}/fine-aspectj/src", "${srcDir}/fine-spring/src", "${srcDir}/fine-sense4/src", "${srcDir}/fine-spring/resources" - ] + ] } } @@ -47,7 +47,7 @@ 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:10.0-FEATURE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-RELEASE-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 0bf16d70f..e30a07a11 100644 --- a/build.third_step3.gradle +++ b/build.third_step3.gradle @@ -46,7 +46,7 @@ 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:10.0-FEATURE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-RELEASE-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 f75a4f847..2542e2eb3 100644 --- a/build.third_step4.gradle +++ b/build.third_step4.gradle @@ -45,7 +45,7 @@ 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:10.0-FEATURE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-RELEASE-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 67933f2b3..324c9a8c4 100644 --- a/build.third_step5.gradle +++ b/build.third_step5.gradle @@ -44,7 +44,7 @@ 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:10.0-FEATURE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-RELEASE-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 8749f0d82..e5613e8e3 100644 --- a/build.third_step6.gradle +++ b/build.third_step6.gradle @@ -72,7 +72,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-redisson/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT" + compile "com.fr.third:fine-third:10.0-RELEASE-SNAPSHOT" compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' }