From bebe7c159f00e6d5a83bb786824d5f32e4de9270 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 24 Feb 2018 16:54:28 +0300
Subject: spring boot wip

---
 juick-server-web/build.gradle | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'juick-server-web/build.gradle')

diff --git a/juick-server-web/build.gradle b/juick-server-web/build.gradle
index 9a5e97a9..0cf63313 100644
--- a/juick-server-web/build.gradle
+++ b/juick-server-web/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'java'
-apply plugin: 'war'
+apply plugin: 'io.spring.dependency-management'
 
 sourceCompatibility = 1.8
 
@@ -11,38 +11,41 @@ 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}"
 
     compile 'com.github.ben-manes.caffeine:caffeine:2.6.2'
-
-    compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}"
-    compile "org.springframework:spring-context-support:${rootProject.springFrameworkVersion}"
-    compile "org.springframework:spring-websocket:${rootProject.springFrameworkVersion}"
-
-    compile "org.springframework.security:spring-security-web:${rootProject.springSecurityVersion}"
-    compile "org.springframework.security:spring-security-config:${rootProject.springSecurityVersion}"
+    compile("org.springframework.boot:spring-boot-starter-cache")
+    compile("org.springframework.boot:spring-boot-starter-web")
+    compile("org.springframework.boot:spring-boot-starter-websocket")
+    compile("org.springframework.boot:spring-boot-starter-security")
 
     compile "javax.inject:javax.inject:1"
 
     compile 'org.imgscalr:imgscalr-lib:4.2'
     compile "org.apache.commons:commons-imaging:1.0-SNAPSHOT"
 
-    providedCompile "javax.servlet:javax.servlet-api:3.1.0"
+    runtime "commons-fileupload:commons-fileupload:1.3.3"
 
-    providedRuntime "commons-fileupload:commons-fileupload:1.3.3"
+    compile ('com.github.juick:com.juick.xmpp:658f8cf751') {
+        exclude group: 'xmlpull'
+    }
+    compile 'xpp3:xpp3:1.1.4c'
 
     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.security:spring-security-test:${rootProject.springSecurityVersion}"
+    testCompile "org.springframework.boot:spring-boot-starter-test"
+    testCompile "org.springframework.security:spring-security-test"
+}
+dependencyManagement {
+    imports { mavenBom("org.springframework.boot:spring-boot-dependencies:${rootProject.springBootVersion}") }
 }
 
 compileJava.options.encoding = 'UTF-8'
-- 
cgit v1.2.3