Merge pull request #368 in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0

* commit 'e8fbfd3c5a9a3ca09f49a4db71d921ed0e9650ff':
  DEC-12126 javax.el改为依赖jar

build.third_step1.gradle

@@ -69,7 +69,6 @@ sourceSets{
 				"${srcDir}/fine-org-dom4j/src/main/java",
 				"${srcDir}/fine-roaringbitmap/src",
 				"${srcDir}/fine-sense4/src",
-				"${srcDir}/fine-third-default/fine-javax-el/src/main/java",
 				"${srcDir}/fine-third-default/fine-mail/src/main/java",
 				"${srcDir}/fine-third-default/fine-javax-cdi/src/main/java",
 				"${srcDir}/fine-third-default/fine-javax-jms/src/main/java",
@@ -113,6 +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}/fine-third-default/fine-slf4j-api/lib",include:'**/*.jar')
+	compile fileTree(dir:"${srcDir}/fine-third-default/fine-javax-cdi/lib",include:'**/*.jar')
 	compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
 	compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
 	compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"
@@ -173,7 +173,6 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
 		with dataContent.call("${srcDir}/fine-org-dom4j/src/main/java")
 		with dataContent.call("${srcDir}/fine-roaringbitmap/src")
 		with dataContent.call("${srcDir}/fine-sense4/src")
-		with dataContent.call("${srcDir}/fine-third-default/fine-javax-el/src/main/java")
 		with dataContent.call("${srcDir}/fine-third-default/fine-mail/src/main/java")
 		with dataContent.call("${srcDir}/fine-third-default/fine-mail/src/main/resources")
 		with dataContent.call("${srcDir}/fine-third-default/fine-javax-cdi/src/main/java")