From b6d6431c581c9e4ac504bf7dd1b57f770c955a23 Mon Sep 17 00:00:00 2001
From: daniel <daniel@finereport.com>
Date: Thu, 4 Jan 2018 16:22:46 +0800
Subject: [PATCH] delete sth

---
 build.third.gradle       | 118 ---------------------------------------
 build.third_step0.gradle |   1 -
 2 files changed, 119 deletions(-)
 delete mode 100644 build.third.gradle

diff --git a/build.third.gradle b/build.third.gradle
deleted file mode 100644
index bcd09a6a2..000000000
--- a/build.third.gradle
+++ /dev/null
@@ -1,118 +0,0 @@
-
-apply plugin: 'java'
-tasks.withType(JavaCompile){
-	options.encoding = 'UTF-8'
-}
-//指定构建的jdk版本
-sourceCompatibility=1.5
-def jarname="fr-third-9.0.jar"
-def classesDir='build/classes/main'
-def ftpreport='E:/ftp/share/report/'
-//解压lib下的jar到classes文件夹
-jar{
-	baseName="fr-third-9.0"
-}
-
-def srcDir="."
-
-//设置源码路径
-sourceSets{
-	main{
-		java{
-			srcDirs=[
-				"${srcDir}/fine-jpa/src",
-				"${srcDir}/fine-jboss-transaction-api/src",
-				"${srcDir}/fine-jboss-logging/src",
-				"${srcDir}/fine-classmate/src",
-				"${srcDir}/fine-hibernate/src",
-				"${srcDir}/fine-druid/src",
-				"${srcDir}/fine-poi/src",
-				"${srcDir}/fine-quartz/src",
-				"${srcDir}/fine-spring/src"
-				]
-		}
-	}
-
-}
-repositories{
-	mavenCentral()
-} 
-
-//获取什么分支名
-FileTree files =fileTree(dir:'./',include:'build.*.gradle')
-def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('/'))
-def branchName=buildDir.substring(buildDir.lastIndexOf ('/')+1)
-
-//指定依赖
-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}/fine-poi/lib",include:'**/*.jar')
-	compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar')
-	compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
-	compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar')
-	compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar')
-	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	compile fileTree(dir:"../../finereport-lib-base/${branchName}",include:'**/*.jar')
-	compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
- 	testCompile 'junit:junit:4.12'
-}
-
-
-
-task unJar{
-	ant{	
-		delete(dir:"build")
-		mkdir(dir:"build/classes/main")
-		println "------------------------------------------------unjar"
-
-		unjar(dest:"build/classes/main"){
-			fileset(dir:"../../finereport-lib-base/${branchName}"){
-				include(name:'3rd.jar')
-			}
-			fileset(dir:"../../finereport-lib-other/${branchName}"){
-				include(name:"batik-all-1.9.jar")
-				include(name:'json.jar')
-			}
-			fileset(dir:"${srcDir}/fine-poi/lib"){
-				include(name:'**/*.jar')
-			}
-			fileset(dir:"${srcDir}/fine-spring/lib"){
-				include(name:'aopalliance-1.0.jar')
-				include(name:'aspectjweaver-1.8.4.jar')
-			}
-		}
-	}
-}
-
-
-
-//指明无法编译文件所在路径
-def dataContent ={def dir ->
-	copySpec{
-		from ("${dir}"){
-			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
-		}
-	}
-
-}
-
-
-
-task copyFiles(type:Copy,dependsOn:'compileJava'){
-	copy{
-		println "------------------------------------------------copyfiles"
-		with dataContent.call("${srcDir}/fine-jpa/src")
-		with dataContent.call("${srcDir}/fine-jboss-transaction-api/src")
-		with dataContent.call("${srcDir}/fine-jboss-logging/src")
-		with dataContent.call("${srcDir}/fine-classmate/src")
-		with dataContent.call("${srcDir}/fine-hibernate/src")
-		with dataContent.call("${srcDir}/fine-druid/src")
-		with dataContent.call("${srcDir}/fine-poi/src")
-		with dataContent.call("${srcDir}/fine-quartz/src")
-		with dataContent.call("${srcDir}/fine-spring/src")
-		into "${classesDir}"
-	}
-}
-
-jar.dependsOn copyFiles
diff --git a/build.third_step0.gradle b/build.third_step0.gradle
index a9737392b..e912fd5b1 100644
--- a/build.third_step0.gradle
+++ b/build.third_step0.gradle
@@ -40,7 +40,6 @@ task unJar{
 			}
 			fileset(dir:"../../finereport-lib-other/${branchName}"){
 				include(name:"batik-all-1.9.jar")
-				include(name:'json.jar')
 			}
 			fileset(dir:"${srcDir}/fine-poi/lib"){
 				include(name:'**/*.jar')