spring boot wip

1 files changed, 19 insertions, 18 deletions

diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle
index 76a37e4b..f17398b6 100644
--- a/juick-server-jdbc/build.gradle
+++ b/juick-server-jdbc/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-apply plugin: 'war'
+apply plugin: 'io.spring.dependency-management'
 
 sourceCompatibility = 1.8
 
@@ -12,42 +12,43 @@ dependencies {
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${rootProject.jacksonVersion}"
     compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${rootProject.jacksonVersion}"
 
-    providedCompile "ch.qos.logback:logback-classic:${rootProject.logbackVersion}"
-    providedCompile "ch.qos.logback:logback-core:${rootProject.logbackVersion}"
-    providedCompile "ch.qos.logback:logback-access:${rootProject.logbackVersion}"
+    compile "ch.qos.logback:logback-classic:${rootProject.logbackVersion}"
+    compile "ch.qos.logback:logback-core:${rootProject.logbackVersion}"
+    compile "ch.qos.logback:logback-access:${rootProject.logbackVersion}"
 
-    providedCompile "org.slf4j:slf4j-api:${rootProject.slf4jVersion}"
-    providedCompile "org.slf4j:jcl-over-slf4j:${rootProject.slf4jVersion}"
-    providedCompile "org.slf4j:log4j-over-slf4j:${rootProject.slf4jVersion}"
-    providedCompile "org.slf4j:jul-to-slf4j:${rootProject.slf4jVersion}"
+    compile "org.slf4j:slf4j-api:${rootProject.slf4jVersion}"
+    compile "org.slf4j:jcl-over-slf4j:${rootProject.slf4jVersion}"
+    compile "org.slf4j:log4j-over-slf4j:${rootProject.slf4jVersion}"
+    compile "org.slf4j:jul-to-slf4j:${rootProject.slf4jVersion}"
 
-    providedCompile "org.apache.commons:commons-lang3:3.7"
-    providedCompile "org.apache.commons:commons-collections4:4.1"
+    compile "org.apache.commons:commons-lang3:3.7"
+    compile "org.apache.commons:commons-collections4:4.1"
 
-    compile "org.springframework:spring-context:${rootProject.springFrameworkVersion}"
-    compile "org.springframework:spring-jdbc:${rootProject.springFrameworkVersion}"
+    compile("org.springframework.boot:spring-boot-starter-jdbc")
 
-    providedCompile "org.apache.commons:commons-dbcp2:2.2.0"
+    compile "org.apache.commons:commons-dbcp2:2.2.0"
     compile "com.googlecode.log4jdbc:log4jdbc:1.2"
     compile "javax.inject:javax.inject:1"
 
     compile 'org.imgscalr:imgscalr-lib:4.2'
 
-    providedCompile 'com.h2database:h2:1.4.196'
-    providedCompile "javax.servlet:javax.servlet-api:3.1.0"
-    providedRuntime 'mysql:mysql-connector-java:5.1.40'
+    compile 'com.h2database:h2:1.4.196'
+    runtime 'mysql:mysql-connector-java:5.1.40'
 
-    providedRuntime "commons-fileupload:commons-fileupload:1.3.3"
+    runtime "commons-fileupload:commons-fileupload:1.3.3"
 
     testCompile project(path: ':juick-core', configuration: 'testArtifacts')
     testCompile "junit:junit:${rootProject.junitVersion}"
     testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
     testCompile "org.mockito:mockito-core:${rootProject.mockitoVersion}"
-    testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}"
+    testCompile("org.springframework.boot:spring-boot-starter-test")
 
     testRuntime "mysql:mysql-connector-java:5.1.40"
     testRuntime "org.postgresql:postgresql:42.2.1"
 }
+dependencyManagement {
+    imports { mavenBom("org.springframework.boot:spring-boot-dependencies:${rootProject.springBootVersion}") }
+}
 
 compileJava.options.encoding = 'UTF-8'