merge common projects

2 files changed, 6 insertions, 2 deletions

diff --git a/juick-xmpp-wip/build.gradle b/juick-xmpp-wip/build.gradle
index 4b63c2f7..aab1b995 100644
--- a/juick-xmpp-wip/build.gradle
+++ b/juick-xmpp-wip/build.gradle
@@ -1,5 +1,10 @@
+apply plugin: 'java'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'war'
+
 dependencies {
     compile project(':juick-server-jdbc')
-    compile project(':juick-server-web')
+    runtime "commons-fileupload:commons-fileupload:1.3.3"
+    providedRuntime 'com.h2database:h2:1.4.196'
     testCompile("org.springframework.boot:spring-boot-starter-test")
 }
diff --git a/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java b/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java
index 72d9dfe9..f39913f8 100644
--- a/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java
+++ b/juick-xmpp-wip/src/test/java/com/juick/xmpp/XMPPTests.java
@@ -23,7 +23,6 @@ import com.juick.configuration.DataConfiguration;
 import com.juick.service.ImagesService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.junit4.SpringRunner;