From 3a83f25cb30f34ef2c69c2ecdec372b83f04d8c5 Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Sun, 11 Dec 2016 20:23:54 +0700
Subject: guava and commons-fileupload dependencies moved to juick-server build
 file

---
 juick-api/build.gradle        |  1 -
 juick-server/build.gradle     | 28 +++++++++++++++++-----------
 juick-spring-www/build.gradle |  1 -
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/juick-api/build.gradle b/juick-api/build.gradle
index cbce7f43..c160da96 100644
--- a/juick-api/build.gradle
+++ b/juick-api/build.gradle
@@ -13,7 +13,6 @@ dependencies {
     compile project(':juick-server')
 
     compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}"
-    runtime "commons-fileupload:commons-fileupload:1.3.2"
 
     compile 'com.github.pengrad:java-telegram-bot-api:2.3.0'
     compile 'com.neovisionaries:nv-websocket-client:1.30'
diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index b9637080..ee77b572 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -6,6 +6,7 @@ sourceCompatibility = 1.8
 
 dependencies {
     compile project(':juick-core')
+
     compile "com.fasterxml.jackson.core:jackson-core:${rootProject.jacksonVersion}"
     compile "com.fasterxml.jackson.core:jackson-databind:${rootProject.jacksonVersion}"
     compile "com.fasterxml.jackson.core:jackson-annotations:${rootProject.jacksonVersion}"
@@ -20,25 +21,30 @@ dependencies {
     compile "org.slf4j:log4j-over-slf4j:${rootProject.slf4jVersion}"
     compile "org.slf4j:jul-to-slf4j:${rootProject.slf4jVersion}"
 
-    compile 'org.apache.httpcomponents:httpclient:4.5.2'
-    compile 'org.apache.commons:commons-lang3:3.5'
-    compile 'org.apache.commons:commons-collections4:4.1'
-    compile 'commons-io:commons-io:2.5'
+    compile "org.apache.httpcomponents:httpclient:4.5.2"
+    compile "org.apache.commons:commons-lang3:3.5"
+    compile "org.apache.commons:commons-collections4:4.1"
+    compile "commons-io:commons-io:2.5"
+    compile "commons-codec:commons-codec:1.10"
+
+    compile "com.google.guava:guava:20.0"
 
     compile "org.springframework:spring-context:${rootProject.springFrameworkVersion}"
     compile "org.springframework:spring-jdbc:${rootProject.springFrameworkVersion}"
 
-    providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
-
     compile "org.springframework.security:spring-security-web:${rootProject.springSecurityVersion}"
     compile "org.springframework.security:spring-security-config:${rootProject.springSecurityVersion}"
 
-    compile 'org.apache.commons:commons-dbcp2:2.1.1'
-    compile 'com.googlecode.log4jdbc:log4jdbc:1.2'
-    compile 'javax.inject:javax.inject:1'
+    compile "org.apache.commons:commons-dbcp2:2.1.1"
+    compile "com.googlecode.log4jdbc:log4jdbc:1.2"
+    compile "javax.inject:javax.inject:1"
+
+    compile "org.bitbucket.sco0ter.babbler:xmpp-core-client:0ba6c0e2f9"
+    compile "org.bitbucket.sco0ter.babbler:xmpp-extensions-client:0ba6c0e2f9"
+
+    providedCompile "javax.servlet:javax.servlet-api:3.1.0"
 
-    compile 'org.bitbucket.sco0ter.babbler:xmpp-core-client:0ba6c0e2f9'
-    compile 'org.bitbucket.sco0ter.babbler:xmpp-extensions-client:0ba6c0e2f9'
+    runtime "commons-fileupload:commons-fileupload:1.3.2"
 
     testCompile "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2"
     testCompile "junit:junit:${rootProject.junitVersion}"
diff --git a/juick-spring-www/build.gradle b/juick-spring-www/build.gradle
index c0706c6d..56042c5a 100644
--- a/juick-spring-www/build.gradle
+++ b/juick-spring-www/build.gradle
@@ -31,7 +31,6 @@ dependencies {
     compile "org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.0.RELEASE"
     compile "org.thymeleaf.extras:thymeleaf-extras-springsecurity4:3.0.1.RELEASE"
     compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.1.2"
-    compile "com.google.guava:guava:20.0"
 
     testCompile "junit:junit:${rootProject.junitVersion}"
     testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
-- 
cgit v1.2.3