From c1e75fb609972ecb52a4273a08eb9e5d5907bdc9 Mon Sep 17 00:00:00 2001 From: zhouping Date: Mon, 30 Dec 2019 17:59:38 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-1335=20fine-third=E6=94=AF=E6=8C=81JDK11?= =?UTF-8?q?=EF=BC=8C=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step1.gradle | 5 ++--- build.third_step2.gradle | 4 +--- build.third_step3.gradle | 4 +--- build.third_step4.gradle | 4 +--- build.third_step5.gradle | 4 +--- build.third_step6.gradle | 4 +--- build.third_step7.gradle | 3 +-- 7 files changed, 8 insertions(+), 20 deletions(-) diff --git a/build.third_step1.gradle b/build.third_step1.gradle index 454669d7d..b5af74328 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -112,9 +112,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-org-dom4j/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - // @branch - 分支信息 - // compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" - // compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') + compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" testCompile 'junit:junit:4.12' } @@ -165,6 +163,7 @@ task copyFiles(type:Copy,dependsOn:'compileJava'){ 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") diff --git a/build.third_step2.gradle b/build.third_step2.gradle index fba4e0a2e..13ae212a4 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -76,9 +76,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-batik/lib",include: '**/*.jar') compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/lib",include: '**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - // @branch - 分支信息 - // compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" - // compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') + compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" testCompile 'junit:junit:4.12' } diff --git a/build.third_step3.gradle b/build.third_step3.gradle index 078f0af23..95daa54a7 100644 --- a/build.third_step3.gradle +++ b/build.third_step3.gradle @@ -50,9 +50,7 @@ def MVN_BRANCH = branchVariable.toUpperCase() dependencies{ compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - // @branch - 分支信息 - // compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" - // compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') + compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" testCompile 'junit:junit:4.12' } diff --git a/build.third_step4.gradle b/build.third_step4.gradle index dd8aa6541..ccafa5b45 100644 --- a/build.third_step4.gradle +++ b/build.third_step4.gradle @@ -51,9 +51,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - // @branch - 分支信息 - // compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" - // compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') + compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" testCompile 'junit:junit:4.12' } diff --git a/build.third_step5.gradle b/build.third_step5.gradle index 5525e82c8..bf7ce1e97 100644 --- a/build.third_step5.gradle +++ b/build.third_step5.gradle @@ -50,9 +50,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - // @branch - 分支信息 - // compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" - // compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') + compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" testCompile 'junit:junit:4.12' } diff --git a/build.third_step6.gradle b/build.third_step6.gradle index ce1f815dd..691cccc8d 100644 --- a/build.third_step6.gradle +++ b/build.third_step6.gradle @@ -47,9 +47,7 @@ def MVN_BRANCH = branchVariable.toUpperCase() //指定依赖 dependencies{ compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar') - // @branch - 分支信息 - // compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" - // compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') + compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" testCompile 'junit:junit:4.12' } diff --git a/build.third_step7.gradle b/build.third_step7.gradle index 0282e2a96..dff4a9ddb 100644 --- a/build.third_step7.gradle +++ b/build.third_step7.gradle @@ -48,8 +48,7 @@ def MVN_BRANCH = branchVariable.toUpperCase() dependencies{ compile fileTree(dir:"${srcDir}/fine-ehcache/lib",include:'**/*.jar') // @branch - 分支信息 - // compile "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" - // compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') + compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" testCompile 'junit:junit:4.12' }