dependency updates and minor project layout update

2 files changed, 0 insertions, 40 deletions

diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle
index 96919cd2..17ca88a9 100644
--- a/juick-server-jdbc/build.gradle
+++ b/juick-server-jdbc/build.gradle
@@ -27,14 +27,9 @@ dependencies {
     providedCompile "commons-io:commons-io:2.5"
     providedCompile "commons-codec:commons-codec:1.10"
 
-    compile 'com.github.ben-manes.caffeine:caffeine:2.5.2'
-
     compile "org.springframework:spring-context:${rootProject.springFrameworkVersion}"
     compile "org.springframework:spring-jdbc:${rootProject.springFrameworkVersion}"
 
-    compile "org.springframework.security:spring-security-web:${rootProject.springSecurityVersion}"
-    compile "org.springframework.security:spring-security-config:${rootProject.springSecurityVersion}"
-
     providedCompile "org.apache.commons:commons-dbcp2:2.1.1"
     compile "com.googlecode.log4jdbc:log4jdbc:1.2"
     compile "javax.inject:javax.inject:1"
@@ -51,7 +46,6 @@ dependencies {
     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}"
 
     testRuntime "mysql:mysql-connector-java:5.1.40"
 }
diff --git a/juick-server-jdbc/src/test/java/com/juick/tests/util/MockUtils.java b/juick-server-jdbc/src/test/java/com/juick/tests/util/MockUtils.java
deleted file mode 100644
index 5344dd23..00000000
--- a/juick-server-jdbc/src/test/java/com/juick/tests/util/MockUtils.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.juick.tests.util;
-
-import com.juick.Message;
-import com.juick.User;
-import org.apache.commons.text.RandomStringGenerator;
-
-import java.util.Date;
-
-/**
- * Created by vitalyster on 12.01.2017.
- */
-public class MockUtils {
-    final static RandomStringGenerator generator = new RandomStringGenerator.Builder().withinRange('a', 'z').build();
-    public static Message mockMessage(Integer mid, final User user, final String messageText) {
-        Message msg = new Message();
-
-        msg.setMid(mid);
-        msg.setUser(user);
-        msg.setText(messageText == null ? generator.generate(24) : messageText);
-        msg.setDate(new Date());
-        return msg;
-    }
-
-    public static User mockUser(final int uid, final String name, final String password) {
-        User user = new User();
-
-        user.setName(name);
-        user.setUid(uid);
-        user.setCredentials(password);
-        user.setBanned(false);
-
-        return user;
-    }
-}