diff --git a/.gitignore b/.gitignore index 249963d2c..7eefa4456 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.iml -.idea/ \ No newline at end of file +.idea/ +.gradle/ \ No newline at end of file diff --git a/build.third_step0.gradle b/build.third_step0.gradle index 53ad94e18..808113ee6 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -49,7 +49,7 @@ configurations { } dependencies { - thirdjar "com.fr.third:fine-third:10.0-RELEASE-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 20fa92efd..b219bea26 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -58,7 +58,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-RELEASE-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 7a3a7d875..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-RELEASE-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 e30a07a11..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-RELEASE-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 2542e2eb3..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-RELEASE-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 324c9a8c4..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-RELEASE-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 e5613e8e3..a4cfe051c 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-RELEASE-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' }