From 1db2fd489450dbafae7f9007a353d46a806cf48f Mon Sep 17 00:00:00 2001 From: "Cloud.Liu" Date: Thu, 1 Apr 2021 16:44:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20chore:=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5fine-third=E7=9A=84feature/10.0=E5=88=B0resea?= =?UTF-8?q?rch/10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step0.gradle | 2 ++ build.third_step1.gradle | 6 ++++-- 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 | 4 ++-- build.third_step8.gradle | 4 ++-- fine-hibernate/pom.xml | 6 ------ 10 files changed, 20 insertions(+), 22 deletions(-) diff --git a/build.third_step0.gradle b/build.third_step0.gradle index b12832cfd..b847efe06 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -96,6 +96,7 @@ dependencies { testCompile 'junit:junit:4.12' } + publishing { publications { third(MavenPublication) { @@ -137,6 +138,7 @@ publishing { } } + afterEvaluate { tasks.withType(PublishToMavenRepository) { task -> if (task.publication.hasProperty('repo') && task.publication.repo != task.repository.name) { diff --git a/build.third_step1.gradle b/build.third_step1.gradle index d60bfeb43..852b4591b 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -74,7 +74,7 @@ sourceSets{ } -sourceSets.main.java.outputDir = file('build/classes/1') +sourceSets.main.output.classesDir = file('build/classes/1') repositories{ mavenCentral() maven { url "http://mvn.finedevelop.com/repository/maven-public/" } @@ -84,7 +84,7 @@ repositories{ 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() +def MVN_BRANCH = branchVariable.toUpperCase() //指定依赖 dependencies{ @@ -112,6 +112,8 @@ def dataContent ={def dir -> } + + task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ println "------------------------------------------------copyfiles" diff --git a/build.third_step2.gradle b/build.third_step2.gradle index 788da5885..eedad3992 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -51,7 +51,7 @@ sourceSets{ } -sourceSets.main.java.outputDir = file('build/classes/2') +sourceSets.main.output.classesDir = file('build/classes/2') repositories{ mavenCentral() maven { url "http://mvn.finedevelop.com/repository/maven-public/" } @@ -61,7 +61,7 @@ repositories{ 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() +def MVN_BRANCH = branchVariable.toUpperCase() def indexV = branchName.indexOf( "%2F"); if(indexV != -1){ diff --git a/build.third_step3.gradle b/build.third_step3.gradle index 3061fed98..c8d5fd0f3 100644 --- a/build.third_step3.gradle +++ b/build.third_step3.gradle @@ -33,7 +33,7 @@ sourceSets{ } } -sourceSets.main.java.outputDir = file('build/classes/3') +sourceSets.main.output.classesDir = file('build/classes/3') repositories{ mavenCentral() @@ -44,7 +44,7 @@ repositories{ 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() +def MVN_BRANCH = branchVariable.toUpperCase() def indexV = branchName.indexOf( "%2F"); if(indexV != -1){ diff --git a/build.third_step4.gradle b/build.third_step4.gradle index 777aaa1a6..121b687ca 100644 --- a/build.third_step4.gradle +++ b/build.third_step4.gradle @@ -33,7 +33,7 @@ sourceSets{ } -sourceSets.main.java.outputDir = file('build/classes/4') +sourceSets.main.output.classesDir = file('build/classes/4') repositories{ mavenCentral() @@ -44,7 +44,7 @@ repositories{ 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() +def MVN_BRANCH = branchVariable.toUpperCase() def indexV = branchName.indexOf( "%2F"); if(indexV != -1){ diff --git a/build.third_step5.gradle b/build.third_step5.gradle index 68ed38bc0..454eb20bb 100644 --- a/build.third_step5.gradle +++ b/build.third_step5.gradle @@ -33,7 +33,7 @@ sourceSets{ } -sourceSets.main.java.outputDir = file('build/classes/5') +sourceSets.main.output.classesDir = file('build/classes/5') repositories{ mavenCentral() @@ -44,7 +44,7 @@ repositories{ 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() +def MVN_BRANCH = branchVariable.toUpperCase() def indexV = branchName.indexOf( "%2F"); if(indexV != -1){ diff --git a/build.third_step6.gradle b/build.third_step6.gradle index 5af23fcd9..335bfa469 100644 --- a/build.third_step6.gradle +++ b/build.third_step6.gradle @@ -31,7 +31,7 @@ sourceSets{ } } -sourceSets.main.java.outputDir = file('build/classes/6') +sourceSets.main.output.classesDir = file('build/classes/6') repositories{ mavenCentral() @@ -42,7 +42,7 @@ repositories{ 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() +def MVN_BRANCH = branchVariable.toUpperCase() def indexV = branchName.indexOf( "%2F"); if(indexV != -1){ diff --git a/build.third_step7.gradle b/build.third_step7.gradle index 33c709568..004bfe121 100644 --- a/build.third_step7.gradle +++ b/build.third_step7.gradle @@ -31,7 +31,7 @@ sourceSets{ } } -sourceSets.main.java.outputDir = file('build/classes/7') +sourceSets.main.output.classesDir = file('build/classes/7') repositories{ mavenCentral() @@ -42,7 +42,7 @@ repositories{ 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() +def MVN_BRANCH = branchVariable.toUpperCase() def indexV = branchName.indexOf( "%2F"); if(indexV != -1){ diff --git a/build.third_step8.gradle b/build.third_step8.gradle index a0aae2640..04ba9ee7e 100644 --- a/build.third_step8.gradle +++ b/build.third_step8.gradle @@ -32,7 +32,7 @@ sourceSets{ } } -sourceSets.main.java.outputDir = file('build/classes/8') +sourceSets.main.output.classesDir = file('build/classes/8') repositories{ mavenCentral() @@ -43,7 +43,7 @@ repositories{ 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() +def MVN_BRANCH = branchVariable.toUpperCase() def indexV = branchName.indexOf( "%2F"); if(indexV != -1){ diff --git a/fine-hibernate/pom.xml b/fine-hibernate/pom.xml index a9a1ceee5..76ceb0b1f 100644 --- a/fine-hibernate/pom.xml +++ b/fine-hibernate/pom.xml @@ -15,12 +15,6 @@ ${revision} - - com.fr.essential - fine-antlr-old - ${essential-version} - provided - com.fr.third fine-jboss-logging