Browse Source

Merge pull request #301 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0

* commit '609d081291589266848843bf4541541621530634':
  无 jira 任务, 处理分支信息。 和 bijiekai 沟通, 换一个变量名字。
research/11.0
Harrison 5 years ago
parent
commit
18741f944a
  1. 2
      build.third_step0.gradle
  2. 2
      build.third_step1.gradle
  3. 2
      build.third_step2.gradle
  4. 2
      build.third_step3.gradle
  5. 2
      build.third_step4.gradle
  6. 2
      build.third_step5.gradle
  7. 2
      build.third_step6.gradle

2
build.third_step0.gradle

@ -43,7 +43,7 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.s
def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1)
def srcDir="."
def MVN_BRANCH = branchName.toUpperCase()
def MVN_BRANCH = branchVariable.toUpperCase()
// @branch -
def maven_version="${version}-${MVN_BRANCH}-SNAPSHOT"

2
build.third_step1.gradle

@ -58,7 +58,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 = branchName.toUpperCase()
def MVN_BRANCH = branchVariable.toUpperCase()
//
dependencies{

2
build.third_step2.gradle

@ -46,7 +46,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 = branchName.toUpperCase()
def MVN_BRANCH = branchVariable.toUpperCase()
//
dependencies{

2
build.third_step3.gradle

@ -45,7 +45,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 = branchName.toUpperCase()
def MVN_BRANCH = branchVariable.toUpperCase()
//
dependencies{

2
build.third_step4.gradle

@ -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 = branchName.toUpperCase()
def MVN_BRANCH = branchVariable.toUpperCase()
//
dependencies{

2
build.third_step5.gradle

@ -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 = branchName.toUpperCase()
def MVN_BRANCH = branchVariable.toUpperCase()
//
dependencies{

2
build.third_step6.gradle

@ -68,7 +68,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 = branchName.toUpperCase()
def MVN_BRANCH = branchVariable.toUpperCase()
//
dependencies{

Loading…
Cancel
Save