Merge pull request #171 in CORE/base-third from ~DANIEL/base-third:persist/10.0 to persist/10.0

* commit 'ac2e571a57d2ec1274331dbfc3ee7db3ebdaae8a':
  build.third_step0.gradle edited online with Bitbucket
  build.third_step0.gradle edited online with Bitbucket

build.third_step0.gradle

@@ -14,7 +14,7 @@ sourceCompatibility=1.5
 
 
 //解压lib下的jar到classes文件夹
-version='10.0'
+
 jar{
 	baseName="fine-third"
 }
@@ -43,8 +43,17 @@ def date = new Date()
 def formattedDate = date.format('yyyy.MM.dd')
 
 def srcDir="."
+def maven_version_build = ""
+def indexV = branchName.indexOf( "%2F");
+if(indexV != -1){
+    version= branchName.substring(indexV+3, branchName.length()).toUpperCase()
+	maven_version_build = project.version +"-" + branchName.substring(0, indexV).toUpperCase() +"-SNAPSHOT"
+} else {
+    version= branchName
+	maven_version_build =  project.version +"-SNAPSHOT"
+}
+
 def maven_version="${version}.${formattedDate}"
-def maven_version_build ="${version}-SNAPSHOT"
 def jar_version = version
 
 configurations {
@@ -138,4 +147,4 @@ task unpack(type:Copy) {
 	
 }
 
-jar.dependsOn unpack
+jar.dependsOn unpack