server core module

2 files changed, 4 insertions, 5 deletions

diff --git a/juick-www/build.gradle b/juick-www/build.gradle
index 36eae244..1bed582b 100644
--- a/juick-www/build.gradle
+++ b/juick-www/build.gradle
@@ -26,18 +26,19 @@ repositories {
     mavenCentral()
 }
 
-def slf4jVersion = '1.7.21'
+def springFrameworkVersion = '4.3.4.RELEASE'
 
 dependencies {
-    compile project(':juick-core')
+    compile project(':server-core')
     compile project(':deps:com.juick.xmpp')
     compile 'com.github.scribejava:scribejava-apis:3.2.0'
-    compile 'commons-io:commons-io:2.5'
     compile 'net.coobird:thumbnailator:0.4.8'
     compile 'com.github.ooxi:serialized-php-parser:0.5.0'
     compile 'net.jodah:failsafe:0.9.5'
     compile 'com.mitchellbosecke:pebble:2.2.3'
     compile 'com.sun.mail:javax.mail:1.5.6'
+    compile "org.springframework:spring-webmvc:${springFrameworkVersion}"
+    compile 'com.mitchellbosecke:pebble-spring4:2.2.3'
     providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
 }
diff --git a/juick-www/src/main/java/com/juick/www/Settings.java b/juick-www/src/main/java/com/juick/www/Settings.java
index 0d427efe..8fe14615 100644
--- a/juick-www/src/main/java/com/juick/www/Settings.java
+++ b/juick-www/src/main/java/com/juick/www/Settings.java
@@ -43,8 +43,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
-import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.file.Files;