From f514a1d653993441e26c3a82d26bdd718f4b6e79 Mon Sep 17 00:00:00 2001 From: neil <459208047@qq.com> Date: Fri, 26 Apr 2019 15:59:09 +0800 Subject: [PATCH] ct --- build.third_step0.gradle | 5 ++--- build.third_step1.gradle | 2 +- build.third_step2.gradle | 2 +- build.third_step3.gradle | 2 +- build.third_step4.gradle | 2 +- build.third_step5.gradle | 2 +- build.third_step6.gradle | 12 ++---------- 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/build.third_step0.gradle b/build.third_step0.gradle index f23428842..66ce1cac9 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -17,7 +17,6 @@ sourceCompatibility=1.5 version='10.0' jar{ baseName="fine-third" - zip64 true } repositories { @@ -41,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 { @@ -50,7 +49,7 @@ configurations { } dependencies { - thirdjar "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT" + thirdjar "com.fr.third:fine-third-base:10.0-BASE-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 a33ef9f68..e84c6bc8a 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -59,7 +59,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-base:10.0-BASE-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 0631ef5b5..8242521fb 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -48,7 +48,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-base:10.0-BASE-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..af7e44eb1 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-base:10.0-BASE-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..44f21f29c 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-base:10.0-BASE-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..34ad92d5e 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-base:10.0-BASE-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 52cd3e5c2..a4cfe051c 100644 --- a/build.third_step6.gradle +++ b/build.third_step6.gradle @@ -43,10 +43,7 @@ sourceSets{ "${srcDir}/fine-socketio/src", "${srcDir}/fine-itext/src", "${srcDir}/fine-kryo/src", - "${srcDir}/fine-lz4/src", - "${srcDir}/fine-log4j/src", - "${srcDir}/fine-jgit/src" - + "${srcDir}/fine-lz4/src" ] } } @@ -74,9 +71,8 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-byte-buddy/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-redisson/lib",include:'**/*.jar') 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:10.0-FEATURE-SNAPSHOT" + compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' } @@ -115,10 +111,6 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){ with dataContent.call("${srcDir}/fine-kryo/src") with dataContent.call("${srcDir}/fine-lz4/src") with dataContent.call("${srcDir}/fine-lz4/resources") - with dataContent.call("${srcDir}/fine-log4j/src") - with dataContent.call("${srcDir}/fine-log4j/resources") - with dataContent.call("${srcDir}/fine-jgit/src") - with dataContent.call("${srcDir}/fine-jgit/resources") into "${classesDir}" } }