Merge pull request #335 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0

* commit '7ddbaefd70fcac9a5188ecd5ae758a33ace94da9':
  KERNEL-1335 fine-third支持JDK11，打包

build.third_step1.gradle

@@ -112,9 +112,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-org-dom4j/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	// @branch - 分支信息
-	// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
-	// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
+	compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
  	testCompile 'junit:junit:4.12'
 }
 
@@ -165,6 +163,7 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
 		with dataContent.call("${srcDir}/fine-joda/src")
 		with dataContent.call("${srcDir}/fine-jodd/src")
 		with dataContent.call("${srcDir}/fine-jpa/src")
+		// with dataContent.call("${srcDir}/fine-lookandfeel/src")
 		with dataContent.call("${srcDir}/fine-lucene/src")
 		with dataContent.call("${srcDir}/fine-lz4/src")
 		with dataContent.call("${srcDir}/fine-objenesis/src/main/java")

build.third_step2.gradle

@@ -76,9 +76,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-batik/lib",include: '**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/lib",include: '**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	// @branch - 分支信息
-	// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
-	// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
+	compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
  	testCompile 'junit:junit:4.12'
 }
 

build.third_step3.gradle

@@ -50,9 +50,7 @@ def MVN_BRANCH = branchVariable.toUpperCase()
 dependencies{
 	compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	// @branch - 分支信息
-	// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
-	// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
+	compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
  	testCompile 'junit:junit:4.12'
 }
 

build.third_step4.gradle

@@ -51,9 +51,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	// @branch - 分支信息
-	// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
-	// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
+	compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
  	testCompile 'junit:junit:4.12'
 }
 

build.third_step5.gradle

@@ -50,9 +50,7 @@ dependencies{
 	compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
-	// @branch - 分支信息
-	// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
-	// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
+	compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
  	testCompile 'junit:junit:4.12'
 }
 

build.third_step6.gradle

@@ -47,9 +47,7 @@ def MVN_BRANCH = branchVariable.toUpperCase()
 //指定依赖
 dependencies{
 	compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar')
-	// @branch - 分支信息
-	// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
-	// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
+	compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
  	testCompile 'junit:junit:4.12'
 }
 

build.third_step7.gradle

@@ -48,8 +48,7 @@ def MVN_BRANCH = branchVariable.toUpperCase()
 dependencies{
 	compile fileTree(dir:"${srcDir}/fine-ehcache/lib",include:'**/*.jar')
 	// @branch - 分支信息
-	// compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT"
-	// compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
+	compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
  	testCompile 'junit:junit:4.12'
 }