From fa85c4750e5bdb532723e52ae5d775af67028e73 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 15 Jan 2017 19:34:00 +0300
Subject: update and fix test dependencies

---
 build.gradle                     | 2 +-
 juick-api/build.gradle           | 2 ++
 juick-notifications/build.gradle | 2 +-
 juick-rss/build.gradle           | 3 +--
 juick-server/build.gradle        | 2 +-
 juick-spring-www/build.gradle    | 2 +-
 juick-xmpp/build.gradle          | 4 ----
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1fd4d036..d3e3af0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     testCompile "org.slf4j:slf4j-api:${slf4jVersion}"
     testCompile "junit:junit:${junitVersion}"
     testCompile "org.hamcrest:hamcrest-all:${hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:1.+"
+    testCompile "org.mockito:mockito-core:2.6.2"
     testRuntime "mysql:mysql-connector-java:5.1.40"
 }
 
diff --git a/juick-api/build.gradle b/juick-api/build.gradle
index ee94a4e6..2e4dd858 100644
--- a/juick-api/build.gradle
+++ b/juick-api/build.gradle
@@ -20,6 +20,8 @@ dependencies {
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
 
     testCompile project(path: ':juick-server', configuration: 'testArtifacts')
+
+    testRuntime 'org.apache.tomcat:tomcat-websocket:8.0.39'
     testRuntime 'com.jayway.jsonpath:json-path:2.2.0'
 }
 
diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle
index e7806c00..6d4cb952 100644
--- a/juick-notifications/build.gradle
+++ b/juick-notifications/build.gradle
@@ -28,7 +28,7 @@ dependencies {
 
     testCompile "junit:junit:${rootProject.junitVersion}"
     testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:1.+"
+    testCompile "org.mockito:mockito-core:2.6.2"
 }
 
 compileJava.options.encoding = 'UTF-8'
diff --git a/juick-rss/build.gradle b/juick-rss/build.gradle
index 3ec17d11..0632efb0 100644
--- a/juick-rss/build.gradle
+++ b/juick-rss/build.gradle
@@ -8,12 +8,11 @@ dependencies {
     compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}"
     compile 'com.rometools:rome:1.7.1'
     compile 'com.rometools:rome-modules:1.7.1'
-    providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
 
     testCompile "junit:junit:${rootProject.junitVersion}"
     testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:1.+"
+    testCompile "org.mockito:mockito-core:2.6.2"
     testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}"
 }
 
diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index 0931ce2b..bb962d4b 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     testCompile "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2"
     testCompile "junit:junit:${rootProject.junitVersion}"
     testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:1.+"
+    testCompile "org.mockito:mockito-core:2.6.2"
     testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}"
     testCompile "org.springframework.security:spring-security-test:${rootProject.springSecurityVersion}"
 
diff --git a/juick-spring-www/build.gradle b/juick-spring-www/build.gradle
index 5644c0b5..8a8ce6ab 100644
--- a/juick-spring-www/build.gradle
+++ b/juick-spring-www/build.gradle
@@ -36,7 +36,7 @@ dependencies {
 
     testCompile "junit:junit:${rootProject.junitVersion}"
     testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:1.+"
+    testCompile "org.mockito:mockito-core:2.6.2"
     testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}"
     testCompile "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2"
 
diff --git a/juick-xmpp/build.gradle b/juick-xmpp/build.gradle
index 55370c27..268c5e7b 100644
--- a/juick-xmpp/build.gradle
+++ b/juick-xmpp/build.gradle
@@ -16,10 +16,6 @@ dependencies {
     compile 'org.apache.commons:commons-dbcp2:2.1.1'
     compile 'net.jodah:failsafe:1.0.1'
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
-
-    testCompile "junit:junit:${rootProject.junitVersion}"
-    testCompile "org.hamcrest:hamcrest-all:${rootProject.hamcrestVersion}"
-    testCompile "org.mockito:mockito-core:1.+"
 }
 
 compileJava.options.encoding = 'UTF-8'
-- 
cgit v1.2.3