From 06e5429f08a21b3ab8648f7b54ab8494b555fe41 Mon Sep 17 00:00:00 2001 From: zhouping Date: Sun, 29 Dec 2019 23:08:25 +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 | 112 ++++++++++++++++++++++++++++++++------- build.third_step2.gradle | 51 ++++++++++++------ 2 files changed, 126 insertions(+), 37 deletions(-) diff --git a/build.third_step1.gradle b/build.third_step1.gradle index d035fd18d..739e02787 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -32,18 +32,56 @@ sourceSets{ main{ java{ srcDirs=[ - "${srcDir}/fine-third-jdk11/src", - "${srcDir}/fine-objenesis/src", - "${srcDir}/fine-jetbrains/src", - "${srcDir}/fine-poi/src", - "${srcDir}/fine-quartz/src", + "${srcDir}/fine-asm/src", + "${srcDir}/fine-antlr4/src", + "${srcDir}/fine-aspectj/src", + "${srcDir}/fine-antlr-old/src/main/java", + "${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-fileupload/src", "${srcDir}/fine-commons-lang3/src", - "${srcDir}/fine-commons-collections4/src", + "${srcDir}/fine-commons-logging/src", "${srcDir}/fine-commons-math3/src", + "${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/java", + "${srcDir}/fine-jna/jna-platform/src/main/java", "${srcDir}/fine-joda/src", - "${srcDir}/fine-j2v8/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-default/fine-javax-el/src/main/java", + "${srcDir}/fine-default/fine-mail/src/main/java", + "${srcDir}/fine-default/fine-javax-cdi/src/main/java", + "${srcDir}/fine-default/fine-javax-jms/src/main/java", + "${srcDir}/fine-default/fine-sun-misc/src/main/java", + "${srcDir}/fine-default/fine-javax-inject/src/main/java", + "${srcDir}/fine-default/fine-javax-interceptor/src/main/java", + "${srcDir}/fine-default/fine-zip-tools/src/main/java", + "${srcDir}/fine-default/fine-javax-transaction/src/main/java", + "${srcDir}/fine-default/fine-slf4j-api/src/main/java", + "${srcDir}/fine-default/fine-sjsxp/src/main/java", + "${srcDir}/fine-default/fine-stax/src/main/java", + "${srcDir}/fine-third-jdk8/xml-apis/src/main/java" ] } } @@ -64,12 +102,19 @@ def MVN_BRANCH = branchVariable.toUpperCase() //指定依赖 dependencies{ - compile fileTree(dir:"${srcDir}/fine-poi/lib",include:'**/*.jar') - compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-antlr4/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-aspectj/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-commons-logging/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-css-parser/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-freehep/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-hsqldb/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-jgit/lib",include:'**/*.jar') + 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 "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" + // compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' } @@ -88,18 +133,45 @@ def dataContent ={def dir -> task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ println "------------------------------------------------copyfiles" - with dataContent.call("${srcDir}/fine-third-jdk11/src") - with dataContent.call("${srcDir}/fine-objenesis/src") - with dataContent.call("${srcDir}/fine-jetbrains/src") - with dataContent.call("${srcDir}/fine-poi/src") - with dataContent.call("${srcDir}/fine-quartz/src") + with dataContent.call("${srcDir}/fine-antlr4/src") + with dataContent.call("${srcDir}/fine-antlr-old/src/main/java") + with dataContent.call("${srcDir}/fine-asm/src") + with dataContent.call("${srcDir}/fine-aspectj/src") + 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-fileupload/src") with dataContent.call("${srcDir}/fine-commons-lang3/src") - with dataContent.call("${srcDir}/fine-commons-collections4/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")//.so + with dataContent.call("${srcDir}/fine-jai/src/main/java") + with dataContent.call("${srcDir}/fine-jboss-transaction-api/src") + with dataContent.call("${srcDir}/fine-jedis/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-j2v8/src") + with dataContent.call("${srcDir}/fine-jodd/src") + with dataContent.call("${srcDir}/fine-jpa/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")//.h + with dataContent.call("${srcDir}/fine-third-fault/src") into "${classesDir}" } } diff --git a/build.third_step2.gradle b/build.third_step2.gradle index d65d684a4..2a4e8a32d 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -24,12 +24,24 @@ sourceSets{ main{ java{ srcDirs=[ - "${srcDir}/fine-aspectj/src", - "${srcDir}/fine-spring/src", - "${srcDir}/fine-antlr4/src", - "${srcDir}/fine-sense4/src", - "${srcDir}/fine-bouncycastle/src", - "${srcDir}/fine-spring/resources" + "${srcDir}/fine-bcprov-old/src/main/java", + "${srcDir}/fine-byte-buddy/src", + "${srcDir}/fine-cglib/src", + "${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-win/src/main/java", + "${srcDir}/fine-httpcomponents/http-client/httpmime/src/main/java", + "${srcDir}/fine-httpcomponents/http-core/httpcore/src/main/java", + "${srcDir}/fine-httpcomponents/http-core/httpcore-ab/src/main/java", + "${srcDir}/fine-httpcomponents/http-core/httpcore-nio/src/main/java", + "${srcDir}/fine-kryo/src", + "${srcDir}/fine-log4j/src", + "${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-commons/src/main/java" ] } } @@ -50,14 +62,19 @@ def MVN_BRANCH = branchVariable.toUpperCase() //指定依赖 dependencies{ - compile fileTree(dir:"${srcDir}/fine-aspectj/lib",include:'**/*.jar') - compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar') - compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar') - compile fileTree(dir:"${srcDir}/fine-antlr4/lib",include: '**/*.jar') + compile fileTree(dir:"${srcDir}/fine-byte-buddy/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-commons-fileupload/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-httpcomponents/http-client/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/fine-httpcomponents/http-core/lib",include: '**/*.jar') + compile fileTree(dir:"${srcDir}/fine-poi/lib",include: '**/*.jar') + compile fileTree(dir:"${srcDir}/fine-poi-old/lib",include: '**/*.jar') + compile fileTree(dir:"${srcDir}/fine-redisson/lib",include: '**/*.jar') + 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 "com.fr.third:fine-third:10.0-${MVN_BRANCH}-SNAPSHOT" + // compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar') testCompile 'junit:junit:4.12' } @@ -76,11 +93,11 @@ def dataContent ={def dir -> task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ println "------------------------------------------------copyfiles" - with dataContent.call("${srcDir}/fine-spring/src") - with dataContent.call("${srcDir}/fine-spring/resources") - with dataContent.call("${srcDir}/fine-sense4/src") - with dataContent.call("${srcDir}/fine-bouncycastle/src") - with dataContent.call("${srcDir}/fine-antlr4/src") + // with dataContent.call("${srcDir}/fine-spring/src") + // with dataContent.call("${srcDir}/fine-spring/resources") + // with dataContent.call("${srcDir}/fine-sense4/src") + // with dataContent.call("${srcDir}/fine-bouncycastle/src") + // with dataContent.call("${srcDir}/fine-antlr4/src") into "${classesDir}" } }