Browse Source

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

* commit '62344215b0ec3cf22bfd611655e7edc7e2a7f2a8':
  无 jira 任务, 恢复分支信息
research/11.0
ju 6 years ago
parent
commit
430a8ec7d1
  1. 6
      build.third_step0.gradle
  2. 3
      build.third_step1.gradle
  3. 3
      build.third_step2.gradle
  4. 3
      build.third_step3.gradle
  5. 3
      build.third_step4.gradle
  6. 3
      build.third_step5.gradle
  7. 3
      build.third_step6.gradle

6
build.third_step0.gradle

@ -41,7 +41,8 @@ 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 maven_version="${version}-RELEASE-SNAPSHOT"
// @branch -
def maven_version="${version}-FEATURE-SNAPSHOT"
def jar_version = version
configurations {
@ -50,7 +51,8 @@ configurations {
}
dependencies {
thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// @branch -
thirdjar "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
sigar "com.fr.third:sigar:1.6.0"
testCompile 'junit:junit:4.12'
}

3
build.third_step1.gradle

@ -59,7 +59,8 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-poi/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-quartz/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// @branch -
compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}

3
build.third_step2.gradle

@ -48,7 +48,8 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// @branch -
compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}

3
build.third_step3.gradle

@ -46,7 +46,8 @@ def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+
dependencies{
compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// @branch -
compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}

3
build.third_step4.gradle

@ -45,7 +45,8 @@ def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+
dependencies{
compile fileTree(dir:"${srcDir}/fine-hibernate/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// @branch -
compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}

3
build.third_step5.gradle

@ -44,7 +44,8 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'ojdbc7-12.1.0.jar')
compile fileTree(dir:"${srcDir}/fine-druid/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// @branch -
compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}

3
build.third_step6.gradle

@ -75,7 +75,8 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/fine-jgit/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// @branch -
compile "com.fr.third:fine-third:10.0-FEATURE-SNAPSHOT"
compile fileTree(dir:"../../finereport-lib-other/${branchName}",include:'**/*.jar')
testCompile 'junit:junit:4.12'
}

Loading…
Cancel
Save