aboutsummaryrefslogtreecommitdiff
path: root/juick-server
diff options
context:
space:
mode:
Diffstat (limited to 'juick-server')
-rw-r--r--juick-server/build.gradle16
-rw-r--r--juick-server/src/main/java/com/juick/server/EmailManager.java1
-rw-r--r--juick-server/src/main/java/com/juick/server/XMPPConnection.java1
-rw-r--r--juick-server/src/main/java/com/juick/server/api/Messages.java3
-rw-r--r--juick-server/src/test/java/com/juick/server/tests/ServerTests.java7
5 files changed, 5 insertions, 23 deletions
diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index 3a60aad7..b0165fdc 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -1,16 +1,13 @@
-buildscript {
- repositories {
- mavenCentral()
- }
-}
-
apply plugin: 'war'
+apply plugin: 'org.springframework.boot'
dependencies {
compile project(':juick-server-jdbc')
- compile project(':juick-server-web')
compile ('org.springframework.boot:spring-boot-starter-security')
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
+ providedRuntime 'com.h2database:h2:1.4.196'
+
+ runtime "commons-fileupload:commons-fileupload:1.3.3"
compile 'io.springfox:springfox-swagger2:2.8.0'
compile 'io.springfox:springfox-swagger-ui:2.8.0'
@@ -25,10 +22,7 @@ dependencies {
compile 'com.rometools:rome-modules:1.9.0'
testCompile("org.springframework.boot:spring-boot-starter-test")
- // https://mvnrepository.com/artifact/org.springframework.security/spring-security-test
- testCompile group: 'org.springframework.security', name: 'spring-security-test', version: '5.0.3.RELEASE'
-
-
+ testCompile("org.springframework.security:spring-security-test")
testRuntime 'com.jayway.jsonpath:json-path:2.4.0'
}
diff --git a/juick-server/src/main/java/com/juick/server/EmailManager.java b/juick-server/src/main/java/com/juick/server/EmailManager.java
index 4c9bf3da..8dd7e06e 100644
--- a/juick-server/src/main/java/com/juick/server/EmailManager.java
+++ b/juick-server/src/main/java/com/juick/server/EmailManager.java
@@ -7,7 +7,6 @@ import com.juick.service.MessagesService;
import com.juick.service.SubscriptionService;
import com.juick.service.UserService;
import com.juick.util.MessageUtils;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationListener;
diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
index 50c84bd6..91f66365 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
@@ -17,7 +17,6 @@
package com.juick.server;
-import com.juick.Attachment;
import com.juick.User;
import com.juick.server.xmpp.s2s.BasicXmppSession;
import com.juick.server.helpers.UserInfo;
diff --git a/juick-server/src/main/java/com/juick/server/api/Messages.java b/juick-server/src/main/java/com/juick/server/api/Messages.java
index 769d1474..86426bf6 100644
--- a/juick-server/src/main/java/com/juick/server/api/Messages.java
+++ b/juick-server/src/main/java/com/juick/server/api/Messages.java
@@ -34,9 +34,6 @@ import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.inject.Inject;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
import java.util.Collections;
import java.util.List;
diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index cd1af5a4..7d25a8ae 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -27,11 +27,8 @@ import com.juick.User;
import com.juick.server.EmailManager;
import com.juick.server.XMPPBot;
import com.juick.server.XMPPServer;
-import com.juick.server.configuration.ApiAppConfiguration;
-import com.juick.server.configuration.ApiSecurityConfig;
import com.juick.server.helpers.TagStats;
import com.juick.service.*;
-import com.juick.service.security.NotAuthorizedAuthenticationEntryPoint;
import com.juick.util.DateFormattersHolder;
import org.junit.Before;
import org.junit.Test;
@@ -41,15 +38,11 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.MediaType;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers;
-import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.util.UriComponents;
import org.springframework.web.util.UriComponentsBuilder;