Pull request #2051: 无JIRA任务 chore: 同步fine-third的feature/10.0到research/10.0

Merge in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0

* commit '1db2fd489450dbafae7f9007a353d46a806cf48f':
  无JIRA任务 chore: 同步fine-third的feature/10.0到research/10.0

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) {

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"

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){

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){

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){

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){

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){

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){

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){

fine-hibernate/pom.xml

@@ -15,12 +15,6 @@
     <version>${revision}</version>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fr.essential</groupId>
-            <artifactId>fine-antlr-old</artifactId>
-            <version>${essential-version}</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fr.third</groupId>
             <artifactId>fine-jboss-logging</artifactId>