opensource
/
fine-third
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
Browse Source

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

* commit '07741ca39affc4b87e75b873a88f2969912239a1':
  KERNEL-1298 调试
research/10.0
zhouping 5 years ago
parent
1e870d91f6 07741ca39a
commit
dfab37bd56
8 changed files with 215 additions and 144 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 132
      build.third_step1-jdk11.gradle
  2. 67
      build.third_step2-jdk11.gradle
  3. 23
      build.third_step3-jdk11.gradle
  4. 25
      build.third_step4-jdk11.gradle
  5. 25
      build.third_step5-jdk11.gradle
  6. 19
      build.third_step6-jdk11.gradle
  7. 17
      build.third_step7-jdk11.gradle
  8. 19
      build.third_step8-jdk11.gradle

132
build.third_step1-jdk11.gradle
Unescape View File

@ -127,76 +127,84 @@ dependencies{
//指明无法编译文件所在路径 //指明无法编译文件所在路径
def dataContent = { def dir -> def dataContent = { def dir ->
copySpec{ copySpec{
println("------------------------------------------------copySpec from ${dir}")
from ("${dir}"){ from ("${dir}"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object }
def resourceDirs = [
"${srcDir}/fine-antlr4/src",
"${srcDir}/fine-antlr-old/src/main/java",
"${srcDir}/fine-asm/src",
"${srcDir}/fine-aspectj/src",
"${srcDir}/fine-bouncycastle/src",
"${srcDir}/fine-classmate/src",
"${srcDir}/fine-commons-codec/src",
"${srcDir}/fine-commons-collections4/src",
"${srcDir}/fine-commons-io/src",
"${srcDir}/fine-commons-lang3/src",
"${srcDir}/fine-commons-logging/src/main/java",
"${srcDir}/fine-commons-math3/src",
"${srcDir}/fine-commons-math3/resources",
"${srcDir}/fine-commons-pool/src/main/java",
"${srcDir}/fine-cssparser/src",
"${srcDir}/fine-freehep/src/main/java",
"${srcDir}/fine-guava/src",
"${srcDir}/fine-hsqldb/src/main/java",
"${srcDir}/fine-icu4j/src",
"${srcDir}/fine-imageJ/src/main/java",
"${srcDir}/fine-j2v8/src",
"${srcDir}/fine-jackson/src",
// "${srcDir}/fine-jai/src/main/java",
"${srcDir}/fine-jboss-transaction-api/src",
"${srcDir}/fine-jetbrains/src",
"${srcDir}/fine-jgit/src",
"${srcDir}/fine-jna/jna/src/main/resources",
"${srcDir}/fine-jna/jna/src/main/java",
"${srcDir}/fine-jna/jna-platform/src/main/java",
"${srcDir}/fine-joda/src",
"${srcDir}/fine-jodd/src",
"${srcDir}/fine-jpa/src",
// "${srcDir}/fine-lookandfeel/src",
"${srcDir}/fine-lucene/src",
"${srcDir}/fine-lz4/src",
"${srcDir}/fine-objenesis/src/main/java",
"${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",
"${srcDir}/fine-third-default/fine-sun-misc/src/main/java",
"${srcDir}/fine-third-default/fine-javax-inject/src/main/java",
"${srcDir}/fine-third-default/fine-javax-interceptor/src/main/java",
"${srcDir}/fine-third-default/fine-zip-tools/src/main/java",
"${srcDir}/fine-third-default/fine-javax-transaction/src/main/java",
"${srcDir}/fine-third-default/fine-slf4j-api/src/main/java",
"${srcDir}/fine-third-default/fine-sjsxp/src/main/java",
"${srcDir}/fine-third-default/fine-stax/src/main/java",
"${srcDir}/fine-third-default/fine-sun-jpeg/src/main/java",
"${srcDir}/fine-third-jdk11/fine-activation/src/main/java",
"${srcDir}/fine-third-jdk11/fine-javax-annotation/src/main/java",
"${srcDir}/fine-third-jdk11/fine-javax-jws/src/main/java",
"${srcDir}/fine-third-jdk11/fine-javax-xml-soap/src/main/java",
"${srcDir}/fine-third-jdk11/fine-jaxb/src/main/java",
"${srcDir}/fine-third-jdk11/fine-jaxws/src/main/java"
]
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ resourceDirs.each {
println("------------------------------------------------copyfiles into ${classesDir}") String resourceDir ->
with dataContent.call("${srcDir}/fine-antlr4/src") if(file(resourceDir).exists()){
with dataContent.call("${srcDir}/fine-antlr-old/src/main/java") copy {
with dataContent.call("${srcDir}/fine-asm/src") println("----复制资源：从" + resourceDir + "到${classesDir}" )
with dataContent.call("${srcDir}/fine-aspectj/src") with dataContent.call(resourceDir)
with dataContent.call("${srcDir}/fine-bouncycastle/src")
with dataContent.call("${srcDir}/fine-classmate/src")
with dataContent.call("${srcDir}/fine-commons-codec/src")
with dataContent.call("${srcDir}/fine-commons-collections4/src")
with dataContent.call("${srcDir}/fine-commons-io/src")
with dataContent.call("${srcDir}/fine-commons-lang3/src")
with dataContent.call("${srcDir}/fine-commons-logging/src/main/java")
with dataContent.call("${srcDir}/fine-commons-math3/src")
with dataContent.call("${srcDir}/fine-commons-math3/resources")
with dataContent.call("${srcDir}/fine-commons-pool/src/main/java")
with dataContent.call("${srcDir}/fine-cssparser/src")
with dataContent.call("${srcDir}/fine-freehep/src/main/java")
with dataContent.call("${srcDir}/fine-guava/src")
with dataContent.call("${srcDir}/fine-hsqldb/src/main/java")
with dataContent.call("${srcDir}/fine-icu4j/src")
with dataContent.call("${srcDir}/fine-imageJ/src/main/java")
with dataContent.call("${srcDir}/fine-j2v8/src")
with dataContent.call("${srcDir}/fine-jackson/src")
// with dataContent.call("${srcDir}/fine-jai/src/main/java")
with dataContent.call("${srcDir}/fine-jboss-transaction-api/src")
with dataContent.call("${srcDir}/fine-jetbrains/src")
with dataContent.call("${srcDir}/fine-jgit/src")
with dataContent.call("${srcDir}/fine-jna/jna/src/main/resources")
with dataContent.call("${srcDir}/fine-jna/jna/src/main/java")
with dataContent.call("${srcDir}/fine-jna/jna-platform/src/main/java")
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")
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-javax-cdi/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-javax-jms/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-sun-misc/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-javax-inject/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-javax-interceptor/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-zip-tools/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-javax-transaction/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-slf4j-api/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-sjsxp/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-stax/src/main/java")
with dataContent.call("${srcDir}/fine-third-default/fine-sun-jpeg/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-activation/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-javax-annotation/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-javax-jws/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-javax-xml-soap/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-jaxb/src/main/java")
with dataContent.call("${srcDir}/fine-third-jdk11/fine-jaxws/src/main/java")
into "${classesDir}" into "${classesDir}"
} }
}
}
} }
jar.dependsOn copyFiles jar.dependsOn copyFiles

67
build.third_step2-jdk11.gradle
Unescape View File

@ -96,39 +96,48 @@ def dataContent = { def dir ->
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object }
def resourceDirs = [
"${srcDir}/fine-bcprov-old/src/main/java",
"${srcDir}/fine-byte-buddy/src",
"${srcDir}/fine-cglib/src",
"${srcDir}/fine-cglib/resources",
"${srcDir}/fine-commons-fileupload/src",
"${srcDir}/fine-httpcomponents/http-client/fluent-hc/src/main/java",
"${srcDir}/fine-httpcomponents/http-client/httpclient/src/main/java",
"${srcDir}/fine-httpcomponents/http-client/httpclient/src/main/java-deprecated",
"${srcDir}/fine-httpcomponents/http-client/httpclient-win/src/main/java",
"${srcDir}/fine-httpcomponents/http-client/httpmime/src/main/java",
"${srcDir}/fine-httpcomponents/http-client/httpmime/src/main/java-deprecated",
"${srcDir}/fine-httpcomponents/http-core/httpcore/src/main/java",
"${srcDir}/fine-httpcomponents/http-core/httpcore/src/main/java-deprecated",
"${srcDir}/fine-httpcomponents/http-core/httpcore-ab/src/main/java",
"${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java",
"${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java-deprecated",
"${srcDir}/fine-jai/src/main/java",
"${srcDir}/fine-kryo/src",
"${srcDir}/fine-log4j/src",
"${srcDir}/fine-log4j/resources",
"${srcDir}/fine-poi/src",
"${srcDir}/fine-poi-old/src",
"${srcDir}/fine-redisson/src",
"${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/java",
"${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/resources",
"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java"
]
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ resourceDirs.each {
println "------------------------------------------------copyfiles" String resourceDir ->
with dataContent.call("${srcDir}/fine-bcprov-old/src/main/java") if(file(resourceDir).exists()){
with dataContent.call("${srcDir}/fine-byte-buddy/src") copy {
with dataContent.call("${srcDir}/fine-cglib/src") println("----复制资源：从" + resourceDir + "到${classesDir}" )
with dataContent.call("${srcDir}/fine-cglib/resources") with dataContent.call(resourceDir)
with dataContent.call("${srcDir}/fine-commons-fileupload/src")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/fluent-hc/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/httpclient/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/httpclient/src/main/java-deprecated")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/httpclient-win/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/httpmime/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-client/httpmime/src/main/java-deprecated")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore/src/main/java-deprecated")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-ab/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java")
with dataContent.call("${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java-deprecated")
with dataContent.call("${srcDir}/fine-jai/src/main/java")
with dataContent.call("${srcDir}/fine-kryo/src")
with dataContent.call("${srcDir}/fine-log4j/src")
with dataContent.call("${srcDir}/fine-log4j/resources")
with dataContent.call("${srcDir}/fine-poi/src")
with dataContent.call("${srcDir}/fine-poi-old/src")
with dataContent.call("${srcDir}/fine-redisson/src")
with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/java")
with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-batik/src/main/resources")
with dataContent.call("${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java")
into "${classesDir}" into "${classesDir}"
} }
}
}
} }
jar.dependsOn copyFiles jar.dependsOn copyFiles

23
build.third_step3-jdk11.gradle
Unescape View File

@ -68,17 +68,26 @@ def dataContent = { def dir ->
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object }
def resourceDirs = [
"${srcDir}/fine-itext/src",
"${srcDir}/fine-javassist/src/main/java",
"${srcDir}/fine-jedis/src",
"${srcDir}/fine-jboss-logging/src")
]
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ resourceDirs.each {
println "------------------------------------------------copyfiles" String resourceDir ->
with dataContent.call("${srcDir}/fine-itext/src") if(file(resourceDir).exists()){
with dataContent.call("${srcDir}/fine-javassist/src/main/java") copy {
with dataContent.call("${srcDir}/fine-jedis/src") println("----复制资源：从" + resourceDir + "到${classesDir}" )
with dataContent.call("${srcDir}/fine-jboss-logging/src") with dataContent.call(resourceDir)
into "${classesDir}" into "${classesDir}"
} }
}
}
} }
jar.dependsOn copyFiles jar.dependsOn copyFiles

25
build.third_step4-jdk11.gradle
Unescape View File

@ -71,18 +71,27 @@ def dataContent = { def dir ->
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object }
def resourceDirs = [
"${srcDir}/fine-itext-old/src",
"${srcDir}/fine-spring/src",
// "${srcDir}/fine-hibernate/src",
// "${srcDir}/fine-hibernate/resources",
"${srcDir}/fine-spring/resources"
]
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ resourceDirs.each {
println "------------------------------------------------copyfiles" String resourceDir ->
with dataContent.call("${srcDir}/fine-itext-old/src") if(file(resourceDir).exists()){
// with dataContent.call("${srcDir}/fine-hibernate/src") copy {
// with dataContent.call("${srcDir}/fine-hibernate/resources") println("----复制资源：从" + resourceDir + "到${classesDir}" )
with dataContent.call("${srcDir}/fine-spring/src") with dataContent.call(resourceDir)
with dataContent.call("${srcDir}/fine-spring/resources")
into "${classesDir}" into "${classesDir}"
} }
}
}
} }
jar.dependsOn copyFiles jar.dependsOn copyFiles

25
build.third_step5-jdk11.gradle
Unescape View File

@ -64,18 +64,27 @@ def dataContent = { def dir ->
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object }
def resourceDirs = [
// "${srcDir}/fine-itext-old/src",
// "${srcDir}/fine-spring/src",
// "${srcDir}/fine-spring/resources",
"${srcDir}/fine-hibernate/src",
"${srcDir}/fine-hibernate/resources"
]
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ resourceDirs.each {
println "------------------------------------------------copyfiles" String resourceDir ->
// with dataContent.call("${srcDir}/fine-itext-old/src") if(file(resourceDir).exists()){
with dataContent.call("${srcDir}/fine-hibernate/src") copy {
with dataContent.call("${srcDir}/fine-hibernate/resources") println("----复制资源：从" + resourceDir + "到${classesDir}" )
// with dataContent.call("${srcDir}/fine-spring/src") with dataContent.call(resourceDir)
// with dataContent.call("${srcDir}/fine-spring/resources")
into "${classesDir}" into "${classesDir}"
} }
}
}
} }
jar.dependsOn copyFiles jar.dependsOn copyFiles

19
build.third_step6-jdk11.gradle
Unescape View File

@ -62,15 +62,24 @@ def dataContent = { def dir ->
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object }
def resourceDirs = [
"${srcDir}/fine-druid/src",
"${srcDir}/fine-socketio/src"
]
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ resourceDirs.each {
println "------------------------------------------------copyfiles" String resourceDir ->
with dataContent.call("${srcDir}/fine-druid/src") if(file(resourceDir).exists()){
with dataContent.call("${srcDir}/fine-socketio/src") copy {
println("----复制资源：从" + resourceDir + "到${classesDir}" )
with dataContent.call(resourceDir)
into "${classesDir}" into "${classesDir}"
} }
}
}
} }
jar.dependsOn copyFiles jar.dependsOn copyFiles

17
build.third_step7-jdk11.gradle
Unescape View File

@ -60,14 +60,23 @@ def dataContent = { def dir ->
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object }
def resourceDirs = [
"${srcDir}/fine-quartz/src"
]
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ resourceDirs.each {
println "------------------------------------------------copyfiles" String resourceDir ->
with dataContent.call("${srcDir}/fine-quartz/src") if(file(resourceDir).exists()){
copy {
println("----复制资源：从" + resourceDir + "到${classesDir}" )
with dataContent.call(resourceDir)
into "${classesDir}" into "${classesDir}"
} }
}
}
} }
jar.dependsOn copyFiles jar.dependsOn copyFiles

19
build.third_step8-jdk11.gradle
Unescape View File

@ -60,15 +60,24 @@ def dataContent = { def dir ->
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object }
def resourceDirs = [
"${srcDir}/fine-ehcache/src",
"${srcDir}/fine-ehcache/recources"
]
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ resourceDirs.each {
println "------------------------------------------------copyfiles" String resourceDir ->
with dataContent.call("${srcDir}/fine-ehcache/src") if(file(resourceDir).exists()){
with dataContent.call("${srcDir}/fine-ehcache/recources") copy {
println("----复制资源：从" + resourceDir + "到${classesDir}" )
with dataContent.call(resourceDir)
into "${classesDir}" into "${classesDir}"
} }
}
}
} }
jar.dependsOn copyFiles jar.dependsOn copyFiles

Write Preview
Loading…
Cancel
Save