merge common projects

1 files changed, 5 insertions, 11 deletions

diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index 3a60aad7..b0165fdc 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -1,16 +1,13 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-}
-
 apply plugin: 'war'
+apply plugin: 'org.springframework.boot'
 
 dependencies {
     compile project(':juick-server-jdbc')
-    compile project(':juick-server-web')
     compile ('org.springframework.boot:spring-boot-starter-security')
     providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
+    providedRuntime 'com.h2database:h2:1.4.196'
+
+    runtime "commons-fileupload:commons-fileupload:1.3.3"
 
     compile 'io.springfox:springfox-swagger2:2.8.0'
     compile 'io.springfox:springfox-swagger-ui:2.8.0'
@@ -25,10 +22,7 @@ dependencies {
     compile 'com.rometools:rome-modules:1.9.0'
 
     testCompile("org.springframework.boot:spring-boot-starter-test")
-    // https://mvnrepository.com/artifact/org.springframework.security/spring-security-test
-    testCompile group: 'org.springframework.security', name: 'spring-security-test', version: '5.0.3.RELEASE'
-
-
+    testCompile("org.springframework.security:spring-security-test")
     testRuntime 'com.jayway.jsonpath:json-path:2.4.0'
 }