From 2ee2cca6aaa2a4d049ef2bb8ceb9d13e8ed82de0 Mon Sep 17 00:00:00 2001 From: zhouping Date: Thu, 9 Jan 2020 17:23:49 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-1298=20=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step1-jdk11.gradle | 83 +++++++++++++--------------------- build.third_step2-jdk11.gradle | 83 +++++++++++++--------------------- build.third_step3-jdk11.gradle | 41 +++++------------ build.third_step4-jdk11.gradle | 34 +++++--------- build.third_step5-jdk11.gradle | 43 +++++------------- build.third_step6-jdk11.gradle | 37 ++++----------- build.third_step7-jdk11.gradle | 26 ++++------- build.third_step8-jdk11.gradle | 38 ++++------------ 8 files changed, 122 insertions(+), 263 deletions(-) diff --git a/build.third_step1-jdk11.gradle b/build.third_step1-jdk11.gradle index bc6a39341..3fcf401e9 100644 --- a/build.third_step1-jdk11.gradle +++ b/build.third_step1-jdk11.gradle @@ -26,7 +26,6 @@ task unJar{ } } - //设置源码路径 sourceSets{ main{ @@ -94,45 +93,6 @@ sourceSets{ } -sourceSets.main.java.outputDir = file('build/classes/1') -repositories{ - mavenCentral() - maven { url "http://mvn.finedevelop.com/repository/maven-public/" } -} - -//获取什么分支名 -FileTree files =fileTree(dir:'./',include:'build.*.gradle') -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator)) -def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) -def MVN_BRANCH = branchVariable.toUpperCase() - -//指定依赖 -dependencies{ - 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-cssparser/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}/fine-third-default/fine-slf4j-api/lib",include:'**/*.jar') - compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') - compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") - compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" - testCompile 'junit:junit:4.12' -} - -//指明无法编译文件所在路径 -def dataContent = { def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } -} - def resourceDirs = [ "${srcDir}/fine-antlr4/src", "${srcDir}/fine-antlr-old/src/main/java", @@ -194,17 +154,36 @@ def resourceDirs = [ "${srcDir}/fine-third-jdk11/fine-jaxws/src/main/java" ] -task copyFiles(type:Copy,dependsOn:'compileJava'){ - resourceDirs.each { - String resourceDir -> - if(file(resourceDir).exists()){ - copy { - println("----复制资源：从" + resourceDir + "到${classesDir}" ) - with dataContent.call(resourceDir) - into "${classesDir}" - } - } - } +sourceSets.main.java.outputDir = file('build/classes/1') +sourceSets.main.resources.srcDirs = resourceDirs +sourceSets.main.resources.excludes = ['**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'] +sourceSets.main.output.resourcesDir = file('build/resource/1') + +repositories{ + mavenCentral() + maven { url "http://mvn.finedevelop.com/repository/maven-public/" } } -jar.dependsOn copyFiles +//获取什么分支名 +FileTree files =fileTree(dir:'./',include:'build.*.gradle') +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator)) +def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) +def MVN_BRANCH = branchVariable.toUpperCase() + +//指定依赖 +dependencies{ + 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-cssparser/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}/fine-third-default/fine-slf4j-api/lib",include:'**/*.jar') + compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') + compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") + compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" + testCompile 'junit:junit:4.12' +} diff --git a/build.third_step2-jdk11.gradle b/build.third_step2-jdk11.gradle index a5e9328ab..b7e7c1092 100644 --- a/build.third_step2-jdk11.gradle +++ b/build.third_step2-jdk11.gradle @@ -57,45 +57,6 @@ sourceSets{ ] } } - -} - -sourceSets.main.java.outputDir = file('build/classes/2') -repositories{ - mavenCentral() - maven { url "http://mvn.finedevelop.com/repository/maven-public/" } -} - -//获取什么分支名 -FileTree files =fileTree(dir:'./',include:'build.*.gradle') -def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator)) -def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) -def MVN_BRANCH = branchVariable.toUpperCase() - -//指定依赖 -dependencies{ - 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') - compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") - compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" - testCompile 'junit:junit:4.12' -} - -//指明无法编译文件所在路径 -def dataContent = { def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } } def resourceDirs = [ @@ -127,17 +88,37 @@ def resourceDirs = [ "${srcDir}/fine-xmlgraphics/xmlgraphics-commons/src/main/java" ] -task copyFiles(type:Copy,dependsOn:'compileJava'){ - resourceDirs.each { - String resourceDir -> - if(file(resourceDir).exists()){ - copy { - println("----复制资源：从" + resourceDir + "到${classesDir}" ) - with dataContent.call(resourceDir) - into "${classesDir}" - } - } - } +sourceSets.main.java.outputDir = file('build/classes/2') +sourceSets.main.resources.srcDirs = resourceDirs +sourceSets.main.resources.excludes = ['**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'] +sourceSets.main.output.resourcesDir = file('build/resource/2') + +repositories{ + mavenCentral() + maven { url "http://mvn.finedevelop.com/repository/maven-public/" } +} + +//获取什么分支名 +FileTree files =fileTree(dir:'./',include:'build.*.gradle') +def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.separator)) +def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) +def MVN_BRANCH = branchVariable.toUpperCase() + +//指定依赖 +dependencies{ + 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') + compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") + compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" + testCompile 'junit:junit:4.12' } -jar.dependsOn copyFiles + diff --git a/build.third_step3-jdk11.gradle b/build.third_step3-jdk11.gradle index e33e8de0a..b931156c0 100644 --- a/build.third_step3-jdk11.gradle +++ b/build.third_step3-jdk11.gradle @@ -39,7 +39,18 @@ sourceSets{ } } + +def resourceDirs = [ + "${srcDir}/fine-itext/src", + "${srcDir}/fine-javassist/src/main/java", + "${srcDir}/fine-jedis/src", + "${srcDir}/fine-jboss-logging/src" +] + sourceSets.main.java.outputDir = file('build/classes/3') +sourceSets.main.resources.srcDirs = resourceDirs +sourceSets.main.resources.excludes = ['**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'] +sourceSets.main.output.resourcesDir = file('build/resource/3') repositories{ mavenCentral() @@ -61,33 +72,3 @@ dependencies{ testCompile 'junit:junit:4.12' } -//指明无法编译文件所在路径 -def dataContent = { def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } -} - -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'){ - resourceDirs.each { - String resourceDir -> - if(file(resourceDir).exists()){ - copy { - println("----复制资源：从" + resourceDir + "到${classesDir}" ) - with dataContent.call(resourceDir) - into "${classesDir}" - } - } - } -} - -jar.dependsOn copyFiles diff --git a/build.third_step4-jdk11.gradle b/build.third_step4-jdk11.gradle index 1f7d72cc6..0bb2732f0 100644 --- a/build.third_step4-jdk11.gradle +++ b/build.third_step4-jdk11.gradle @@ -40,7 +40,18 @@ sourceSets{ } +def resourceDirs = [ + "${srcDir}/fine-itext-old/src", + "${srcDir}/fine-spring/src", + // "${srcDir}/fine-hibernate/src", + // "${srcDir}/fine-hibernate/resources", + "${srcDir}/fine-spring/resources" +] + sourceSets.main.java.outputDir = file('build/classes/4') +sourceSets.main.resources.srcDirs = resourceDirs +sourceSets.main.resources.excludes = ['**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'] +sourceSets.main.output.resourcesDir = file('build/resource/4') repositories{ mavenCentral() @@ -72,26 +83,3 @@ def dataContent = { def dir -> } } } - -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'){ - resourceDirs.each { - String resourceDir -> - if(file(resourceDir).exists()){ - copy { - println("----复制资源：从" + resourceDir + "到${classesDir}" ) - with dataContent.call(resourceDir) - into "${classesDir}" - } - } - } -} - -jar.dependsOn copyFiles diff --git a/build.third_step5-jdk11.gradle b/build.third_step5-jdk11.gradle index 9aef96736..9c7d271ba 100644 --- a/build.third_step5-jdk11.gradle +++ b/build.third_step5-jdk11.gradle @@ -33,7 +33,18 @@ sourceSets{ } +def resourceDirs = [ + // "${srcDir}/fine-itext-old/src", + // "${srcDir}/fine-spring/src", + // "${srcDir}/fine-spring/resources", + "${srcDir}/fine-hibernate/src", + "${srcDir}/fine-hibernate/resources" +] + sourceSets.main.java.outputDir = file('build/classes/5') +sourceSets.main.resources.srcDirs = resourceDirs +sourceSets.main.resources.excludes = ['**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'] +sourceSets.main.output.resourcesDir = file('build/resource/5') repositories{ mavenCentral() @@ -56,35 +67,3 @@ dependencies{ testCompile 'junit:junit:4.12' } - -//指明无法编译文件所在路径 -def dataContent = { def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } -} - -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'){ - resourceDirs.each { - String resourceDir -> - if(file(resourceDir).exists()){ - copy { - println("----复制资源：从" + resourceDir + "到${classesDir}" ) - with dataContent.call(resourceDir) - into "${classesDir}" - } - } - } -} - -jar.dependsOn copyFiles diff --git a/build.third_step6-jdk11.gradle b/build.third_step6-jdk11.gradle index fd7aaee04..def7ef570 100644 --- a/build.third_step6-jdk11.gradle +++ b/build.third_step6-jdk11.gradle @@ -31,7 +31,16 @@ sourceSets{ } } + +def resourceDirs = [ + "${srcDir}/fine-druid/src", + "${srcDir}/fine-socketio/src" +] + sourceSets.main.java.outputDir = file('build/classes/6') +sourceSets.main.resources.srcDirs = resourceDirs +sourceSets.main.resources.excludes = ['**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'] +sourceSets.main.output.resourcesDir = file('build/resource/6') repositories{ mavenCentral() @@ -55,31 +64,3 @@ dependencies{ testCompile 'junit:junit:4.12' } -//指明无法编译文件所在路径 -def dataContent = { def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } -} - -def resourceDirs = [ - "${srcDir}/fine-druid/src", - "${srcDir}/fine-socketio/src" -] - -task copyFiles(type:Copy,dependsOn:'compileJava'){ - resourceDirs.each { - String resourceDir -> - if(file(resourceDir).exists()){ - copy { - println("----复制资源：从" + resourceDir + "到${classesDir}" ) - with dataContent.call(resourceDir) - into "${classesDir}" - } - } - } -} - -jar.dependsOn copyFiles diff --git a/build.third_step7-jdk11.gradle b/build.third_step7-jdk11.gradle index 790a04bb4..7be34ab11 100644 --- a/build.third_step7-jdk11.gradle +++ b/build.third_step7-jdk11.gradle @@ -31,7 +31,15 @@ sourceSets{ } } + +def resourceDirs = [ + "${srcDir}/fine-quartz/src" +] + sourceSets.main.java.outputDir = file('build/classes/7') +sourceSets.main.resources.srcDirs = resourceDirs +sourceSets.main.resources.excludes = ['**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'] +sourceSets.main.output.resourcesDir = file('build/resource/7') repositories{ mavenCentral() @@ -62,21 +70,3 @@ def dataContent = { def dir -> } } -def resourceDirs = [ - "${srcDir}/fine-quartz/src" -] - -task copyFiles(type:Copy,dependsOn:'compileJava'){ - resourceDirs.each { - String resourceDir -> - if(file(resourceDir).exists()){ - copy { - println("----复制资源：从" + resourceDir + "到${classesDir}" ) - with dataContent.call(resourceDir) - into "${classesDir}" - } - } - } -} - -jar.dependsOn copyFiles diff --git a/build.third_step8-jdk11.gradle b/build.third_step8-jdk11.gradle index 3feca4a18..8b5bde084 100644 --- a/build.third_step8-jdk11.gradle +++ b/build.third_step8-jdk11.gradle @@ -29,9 +29,17 @@ sourceSets{ ] } } - } + +def resourceDirs = [ + "${srcDir}/fine-ehcache/src", + "${srcDir}/fine-ehcache/recources" +] + sourceSets.main.java.outputDir = file('build/classes/8') +sourceSets.main.resources.srcDirs = resourceDirs +sourceSets.main.resources.excludes = ['**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'] +sourceSets.main.output.resourcesDir = file('build/resource/8') repositories{ mavenCentral() @@ -53,31 +61,3 @@ dependencies{ testCompile 'junit:junit:4.12' } -//指明无法编译文件所在路径 -def dataContent = { def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } -} - -def resourceDirs = [ - "${srcDir}/fine-ehcache/src", - "${srcDir}/fine-ehcache/recources" -] - -task copyFiles(type:Copy,dependsOn:'compileJava'){ - resourceDirs.each { - String resourceDir -> - if(file(resourceDir).exists()){ - copy { - println("----复制资源：从" + resourceDir + "到${classesDir}" ) - with dataContent.call(resourceDir) - into "${classesDir}" - } - } - } -} - -jar.dependsOn copyFiles