Browse Source

Merge pull request #200 in CORE/base-third from ~NEIL/base-third:release/10.0 to release/10.0

* commit '1232e835836de87ad63308cd8cb20749001e831a':
  .
  .
  无JIRA任务,build failed
bugfix/10.0
neil 6 years ago
parent
commit
4de2e10c18
  1. 1
      build.third_step0.gradle
  2. 9
      build.third_step6.gradle

1
build.third_step0.gradle

@ -17,6 +17,7 @@ sourceCompatibility=1.5
version='10.0'
jar{
baseName="fine-third"
zip64 true
}
repositories {

9
build.third_step6.gradle

@ -43,7 +43,9 @@ sourceSets{
"${srcDir}/fine-socketio/src",
"${srcDir}/fine-itext/src",
"${srcDir}/fine-kryo/src",
"${srcDir}/fine-lz4/src"
"${srcDir}/fine-lz4/src",
"${srcDir}/fine-log4j/src",
"${srcDir}/fine-jgit/src"
]
}
}
@ -71,6 +73,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-byte-buddy/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-redisson/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-jgit/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
@ -111,6 +114,10 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
with dataContent.call("${srcDir}/fine-kryo/src")
with dataContent.call("${srcDir}/fine-lz4/src")
with dataContent.call("${srcDir}/fine-lz4/resources")
with dataContent.call("${srcDir}/fine-log4j/src")
with dataContent.call("${srcDir}/fine-log4j/resources")
with dataContent.call("${srcDir}/fine-jgit/src")
with dataContent.call("${srcDir}/fine-jgit/resources")
into "${classesDir}"
}
}

Loading…
Cancel
Save