diff --git a/build.third_step0.gradle b/build.third_step0.gradle index e3d6c5831..65a8c6bcf 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -75,7 +75,9 @@ configurations { String essentialBranch = branchNameUpperCase == 'FEATURE' ? 'RELEASE' : 'MASTER' dependencies { 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" // sigar "com.fr.third:sigar:1.6.0" testCompile 'junit:junit:4.12' diff --git a/build.third_step1.gradle b/build.third_step1.gradle index 80ee3df96..852b4591b 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -98,7 +98,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-sense4/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.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' } diff --git a/build.third_step2.gradle b/build.third_step2.gradle index 3900f253a..74bf1ef0a 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -88,7 +88,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-xmlgraphics/xmlgraphics-commons/lib",include: '**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.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' } diff --git a/build.third_step3.gradle b/build.third_step3.gradle index 14e299f78..d69a858a3 100644 --- a/build.third_step3.gradle +++ b/build.third_step3.gradle @@ -64,7 +64,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-jboss-logging/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.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' } diff --git a/build.third_step4.gradle b/build.third_step4.gradle index dff001ca4..81dba0ad0 100644 --- a/build.third_step4.gradle +++ b/build.third_step4.gradle @@ -64,7 +64,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.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' } diff --git a/build.third_step5.gradle b/build.third_step5.gradle index 5035d84ec..be61f1dd6 100644 --- a/build.third_step5.gradle +++ b/build.third_step5.gradle @@ -64,7 +64,7 @@ dependencies{ // compile fileTree(dir:"${srcDir}/fine-spring/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.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' } diff --git a/build.third_step6.gradle b/build.third_step6.gradle index b4bdb299b..cfe7d8b1d 100644 --- a/build.third_step6.gradle +++ b/build.third_step6.gradle @@ -63,7 +63,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-socketio/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.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' } diff --git a/build.third_step7.gradle b/build.third_step7.gradle index cf816c134..2727121f0 100644 --- a/build.third_step7.gradle +++ b/build.third_step7.gradle @@ -60,7 +60,7 @@ dependencies{ compileOnly "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT" compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.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' } diff --git a/build.third_step8.gradle b/build.third_step8.gradle index cb619bb62..0ec4baad6 100644 --- a/build.third_step8.gradle +++ b/build.third_step8.gradle @@ -61,7 +61,7 @@ dependencies{ compile fileTree(dir:"${srcDir}/fine-ehcache/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/build/libs/",include:'**/*.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' }