Browse Source

Merge pull request #382 in CORE/base-third from release/10.0 to feature/10.0

* commit 'ecfd40e0badbf1be52010aa6593d480ad8d7649b':
  无jira任务 打包遗漏resources
research/11.0
ju.ju 5 years ago
parent
commit
21cb37d4e9
  1. 1
      build.third_step1-jdk11.gradle
  2. 1
      build.third_step1.gradle

1
build.third_step1-jdk11.gradle

@ -129,6 +129,7 @@ def resourceDirs = [
"${srcDir}/fine-jpa/src", "${srcDir}/fine-jpa/src",
// "${srcDir}/fine-lookandfeel/src", // "${srcDir}/fine-lookandfeel/src",
"${srcDir}/fine-lucene/src", "${srcDir}/fine-lucene/src",
"${srcDir}/fine-lucene/resources",
"${srcDir}/fine-lz4/src", "${srcDir}/fine-lz4/src",
"${srcDir}/fine-objenesis/src/main/java", "${srcDir}/fine-objenesis/src/main/java",
"${srcDir}/fine-org-dom4j/src/main/java", "${srcDir}/fine-org-dom4j/src/main/java",

1
build.third_step1.gradle

@ -170,6 +170,7 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){
with dataContent.call("${srcDir}/fine-jpa/src") with dataContent.call("${srcDir}/fine-jpa/src")
// with dataContent.call("${srcDir}/fine-lookandfeel/src") // with dataContent.call("${srcDir}/fine-lookandfeel/src")
with dataContent.call("${srcDir}/fine-lucene/src") with dataContent.call("${srcDir}/fine-lucene/src")
with dataContent.call("${srcDir}/fine-lucene/resources")
with dataContent.call("${srcDir}/fine-lz4/src") with dataContent.call("${srcDir}/fine-lz4/src")
with dataContent.call("${srcDir}/fine-objenesis/src/main/java") with dataContent.call("${srcDir}/fine-objenesis/src/main/java")
with dataContent.call("${srcDir}/fine-org-dom4j/src/main/java") with dataContent.call("${srcDir}/fine-org-dom4j/src/main/java")

Loading…
Cancel
Save