Browse Source

Merge branch 'bugfix/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into bugfix/10.0

bugfix/10.0
Hugh.C 5 years ago
parent
commit
8571a7f695
  1. 3
      build.third_step6.gradle
  2. 3
      fine-third-default/readme.md
  3. 1133
      fine-third-default/src/com/fr/third/javax/xml/stream/XMLEntityReaderImpl.java

3
build.third_step6.gradle

@ -21,6 +21,7 @@ sourceSets{
main{ main{
java{ java{
srcDirs=[ srcDirs=[
"${srcDir}/fine-third-default/src",
"${srcDir}/fine-commons-codec/src", "${srcDir}/fine-commons-codec/src",
"${srcDir}/fine-icu4j/src", "${srcDir}/fine-icu4j/src",
"${srcDir}/fine-itext-old/src", "${srcDir}/fine-itext-old/src",
@ -65,6 +66,7 @@ def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+
// //
dependencies{ dependencies{
compile fileTree(dir:"${srcDir}/fine-third-default/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-commons-codec/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-commons-codec/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-icu4j/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-icu4j/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-jackson/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-jackson/lib",include:'**/*.jar')
@ -95,6 +97,7 @@ def dataContent ={def dir ->
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ copy{
println "------------------------------------------------copyfiles" println "------------------------------------------------copyfiles"
with dataContent.call("${srcDir}/fine-third-default/src")
with dataContent.call("${srcDir}/fine-commons-codec/src") with dataContent.call("${srcDir}/fine-commons-codec/src")
with dataContent.call("${srcDir}/fine-icu4j/src") with dataContent.call("${srcDir}/fine-icu4j/src")
with dataContent.call("${srcDir}/fine-icu4j/resources") with dataContent.call("${srcDir}/fine-icu4j/resources")

3
fine-third-default/readme.md

@ -0,0 +1,3 @@
用于针对性的修改原3rd中的class
1.修改javax.xml.stream.XMLEntityReaderImpl 阅读特殊字符出现的问题 责任人-Bryant 2019/08/01

1133
fine-third-default/src/com/fr/third/javax/xml/stream/XMLEntityReaderImpl.java

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save