spring boot wip

1 files changed, 6 insertions, 10 deletions

diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index 06d28474..bcad2f41 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -6,11 +6,13 @@ buildscript {
 
 apply plugin: 'java'
 apply plugin: 'war'
-apply plugin: 'org.akhikhl.gretty'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
 
 dependencies {
     compile project(':juick-server-jdbc')
     compile project(':juick-server-web')
+    providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
 
     compile 'io.springfox:springfox-swagger2:2.8.0'
     compile 'io.springfox:springfox-swagger-ui:2.8.0'
@@ -20,10 +22,7 @@ dependencies {
     compile 'org.springframework.social:spring-social-twitter:1.1.2.RELEASE'
     compile 'org.apache.commons:commons-email:1.5'
     compile 'org.imgscalr:imgscalr-lib:4.2'
-    compile ('com.github.juick:com.juick.xmpp:658f8cf751') {
-        exclude group: 'xmlpull'
-    }
-    providedCompile 'xpp3:xpp3:1.1.4c'
+
     compile 'com.rometools:rome:1.9.0'
     compile 'com.rometools:rome-modules:1.9.0'
 
@@ -31,16 +30,13 @@ dependencies {
     testCompile project(path: ':juick-server-web', configuration: 'testArtifacts')
     testCompile project(path: ':juick-server-jdbc', configuration: 'testArtifacts')
 
-    testRuntime 'org.apache.tomcat.embed:tomcat-embed-websocket:9.0.5'
     testRuntime 'com.jayway.jsonpath:json-path:2.4.0'
 }
 
 compileJava.options.encoding = 'UTF-8'
 
-gretty {
-    httpPort = 8080
-    contextPath = '/'
-    servletContainer = 'tomcat8'
+bootJar {
+    launchScript()
 }
 
 configurations {