Browse Source

Pull request #1788: DEC-17219 feat: 转SQL合并到release third

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

* commit '97012294847194f1a1f100c4b03b8762904c36f2':
  DEC-17219 feat: 转SQL合并到release third
feature/10.0
ju|剧浩宇 4 years ago
parent
commit
df1a815455
  1. 4
      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
  8. 2
      build.third_step7.gradle
  9. 2
      build.third_step8.gradle

4
build.third_step0.gradle

@ -75,7 +75,9 @@ configurations {
String essentialBranch = branchNameUpperCase == 'FEATURE' ? 'RELEASE' : 'MASTER' String essentialBranch = branchNameUpperCase == 'FEATURE' ? 'RELEASE' : 'MASTER'
dependencies { dependencies {
essential "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT" essential "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
essential "com.fr.cbb:fine-universal-skeleton:1.0-${essentialBranch}-SNAPSHOT" essential "com.fr.cbb:fine-scheduler:1.0-${essentialBranch}-SNAPSHOT"
essential "com.fr.cbb:fine-function:1.0-${essentialBranch}-SNAPSHOT"
essential "com.fr.cbb:fine-sql:1.0-${essentialBranch}-SNAPSHOT"
// thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" // thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT"
// sigar "com.fr.third:sigar:1.6.0" // sigar "com.fr.third:sigar:1.6.0"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'

2
build.third_step1.gradle

@ -98,7 +98,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
build.third_step2.gradle

@ -88,7 +88,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/lib",include: '**/*.jar') compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/lib",include: '**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
build.third_step3.gradle

@ -64,7 +64,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
build.third_step4.gradle

@ -64,7 +64,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
build.third_step5.gradle

@ -64,7 +64,7 @@ dependencies{
// compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar') // compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
build.third_step6.gradle

@ -63,7 +63,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
build.third_step7.gradle

@ -60,7 +60,7 @@ dependencies{
compileOnly "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT" compileOnly "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

2
build.third_step8.gradle

@ -61,7 +61,7 @@ dependencies{
compile fileTree(dir:"${srcDir}/fine-ehcache/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-ehcache/lib",include:'**/*.jar')
compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.jar')
compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar") compile fileTree(dir:System.getenv("JAVA_HOME"),include:"lib/tools.jar")
compile group: "com.fr.third.server", name: "servlet-api", version: "3.0" compile group: "javax.servlet", name: "javax.servlet-api", version: "3.0.1"
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

Loading…
Cancel
Save