Browse Source

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

* commit 'a8037a2431ccc0f141f50ae3a91ab5f965eae1d3':
  DEC-12126 javax.el改为依赖jar JDK11版本
research/10.0
Cloud.Liu 5 years ago
parent
commit
1f5ff1db1c
  1. 3
      build.third_step1-jdk11.gradle

3
build.third_step1-jdk11.gradle

@ -68,7 +68,6 @@ sourceSets{
"${srcDir}/fine-org-dom4j/src/main/java", "${srcDir}/fine-org-dom4j/src/main/java",
"${srcDir}/fine-roaringbitmap/src", "${srcDir}/fine-roaringbitmap/src",
"${srcDir}/fine-sense4/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-mail/src/main/java",
"${srcDir}/fine-third-default/fine-javax-cdi/src/main/java", "${srcDir}/fine-third-default/fine-javax-cdi/src/main/java",
"${srcDir}/fine-third-default/fine-javax-jms/src/main/java", "${srcDir}/fine-third-default/fine-javax-jms/src/main/java",
@ -133,7 +132,6 @@ def resourceDirs = [
"${srcDir}/fine-org-dom4j/src/main/java", "${srcDir}/fine-org-dom4j/src/main/java",
"${srcDir}/fine-roaringbitmap/src", "${srcDir}/fine-roaringbitmap/src",
"${srcDir}/fine-sense4/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-mail/src/main/java",
"${srcDir}/fine-third-default/fine-mail/src/main/resources", "${srcDir}/fine-third-default/fine-mail/src/main/resources",
"${srcDir}/fine-third-default/fine-javax-cdi/src/main/java", "${srcDir}/fine-third-default/fine-javax-cdi/src/main/java",
@ -183,6 +181,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-org-dom4j/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-org-dom4j/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-sense4/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-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:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "com.fr.third.server", name: "servlet-api", version: "3.0"

Loading…
Cancel
Save