update dependencies

7 files changed, 16 insertions, 14 deletions

diff --git a/build.gradle b/build.gradle
index a159a5b8..1fd4d036 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ allprojects {
 project.ext {
     springFrameworkVersion = '4.3.5.RELEASE'
     springSecurityVersion = '4.2.1.RELEASE'
-    jacksonVersion = '2.8.5'
+    jacksonVersion = '2.8.6'
     slf4jVersion = '1.7.22'
     logbackVersion = '1.1.8'
     junitVersion = "4.12"
diff --git a/juick-rss/build.gradle b/juick-rss/build.gradle
index 0d9cc4c4..3ec17d11 100644
--- a/juick-rss/build.gradle
+++ b/juick-rss/build.gradle
@@ -6,8 +6,8 @@ apply plugin: 'com.github.ben-manes.versions'
 dependencies {
     compile project(':juick-server')
     compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}"
-    compile 'com.rometools:rome:1.7.0'
-    compile 'com.rometools:rome-modules:1.7.0'
+    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'
 
diff --git a/juick-server/build.gradle b/juick-server/build.gradle
index 2c140b12..0931ce2b 100644
--- a/juick-server/build.gradle
+++ b/juick-server/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     compile "commons-io:commons-io:2.5"
     compile "commons-codec:commons-codec:1.10"
 
-    compile "com.google.guava:guava:20.0"
+    compile "com.google.guava:guava:21.0"
 
     compile "org.springframework:spring-context:${rootProject.springFrameworkVersion}"
     compile "org.springframework:spring-jdbc:${rootProject.springFrameworkVersion}"
@@ -53,7 +53,7 @@ dependencies {
     testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}"
     testCompile "org.springframework.security:spring-security-test:${rootProject.springSecurityVersion}"
 
-    testRuntime "org.thymeleaf:thymeleaf-testing:3.0.1.RELEASE"
+    testRuntime "org.thymeleaf:thymeleaf-testing:3.0.2.RELEASE"
     testRuntime "mysql:mysql-connector-java:5.1.40"
 }
 
diff --git a/juick-spring-www/build.gradle b/juick-spring-www/build.gradle
index 83430eb0..5644c0b5 100644
--- a/juick-spring-www/build.gradle
+++ b/juick-spring-www/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 }
 
 plugins {
-    id "com.moowork.node" version "1.0.0"
+    id "com.moowork.node" version "1.1.0"
 }
 
 task compileFrontend(type: NpmTask) {
@@ -18,7 +18,7 @@ apply plugin: 'war'
 apply plugin: 'org.akhikhl.gretty'
 apply plugin: 'com.github.ben-manes.versions'
 
-def thymeleafVersion = "3.0.2.RELEASE"
+def thymeleafVersion = "3.0.3.RELEASE"
 
 dependencies {
     compile project(':juick-server')
@@ -40,7 +40,7 @@ dependencies {
     testCompile "org.springframework:spring-test:${rootProject.springFrameworkVersion}"
     testCompile "ch.vorburger.mariaDB4j:mariaDB4j:2.2.2"
 
-    testCompile "org.thymeleaf:thymeleaf-testing:3.0.1.RELEASE"
+    testCompile "org.thymeleaf:thymeleaf-testing:3.0.2.RELEASE"
     testCompile "org.springframework.security:spring-security-test:${rootProject.springSecurityVersion}"
 
     providedCompile "javax.servlet:javax.servlet-api:3.1.0"
diff --git a/juick-www/build.gradle b/juick-www/build.gradle
index 26cf61da..ae9815d5 100644
--- a/juick-www/build.gradle
+++ b/juick-www/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 }
 
 plugins {
-    id "com.moowork.node" version "1.0.0"
+    id "com.moowork.node" version "1.1.0"
 }
 
 task compileFrontend(type: NpmTask) {
@@ -20,7 +20,7 @@ apply plugin: 'com.github.ben-manes.versions'
 
 dependencies {
     compile project(':juick-server')
-    compile 'com.github.scribejava:scribejava-apis:3.4.1'
+    compile 'com.github.scribejava:scribejava-apis:4.0.0'
     compile 'net.coobird:thumbnailator:0.4.8'
     compile 'com.github.ooxi:serialized-php-parser:0.5.0'
     compile 'com.mitchellbosecke:pebble:2.3.0'
diff --git a/juick-www/src/main/java/com/juick/www/controllers/TwitterAuth.java b/juick-www/src/main/java/com/juick/www/controllers/TwitterAuth.java
index 901a8362..9b09539e 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/TwitterAuth.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/TwitterAuth.java
@@ -21,6 +21,7 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.concurrent.ExecutionException;
 
 /**
  * Created by vt on 01.12.2015.
@@ -49,7 +50,7 @@ public class TwitterAuth {
 
     @RequestMapping(value = "/_twitter", method = RequestMethod.GET)
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
-            throws IOException {
+            throws IOException, ExecutionException, InterruptedException {
         String hash = StringUtils.EMPTY, request_token = StringUtils.EMPTY, request_token_secret = StringUtils.EMPTY;
         String verifier = request.getParameter("oauth_verifier");
         Cookie[] cookies = request.getCookies();
@@ -87,9 +88,10 @@ public class TwitterAuth {
             if (verifier != null && verifier.length() > 0) {
                 OAuth1RequestToken requestToken = new OAuth1RequestToken(request_token, request_token_secret);
                 OAuth1AccessToken accessToken = oAuthService.getAccessToken(requestToken, verifier);
-                OAuthRequest oAuthRequest = new OAuthRequest(Verb.GET, VERIFY_URL, oAuthService.getConfig());
+                OAuthRequest oAuthRequest = new OAuthRequest(Verb.GET, VERIFY_URL);
                 oAuthService.signRequest(accessToken, oAuthRequest);
-                com.juick.www.twitter.User twitterUser = mapper.readValue(oAuthRequest.send().getBody(), com.juick.www.twitter.User.class);
+                com.juick.www.twitter.User twitterUser = mapper.readValue(oAuthService.execute(oAuthRequest).getBody(),
+                        com.juick.www.twitter.User.class);
                 if (userService.linkTwitterAccount(user, accessToken.getToken(), accessToken.getTokenSecret(),
                         twitterUser.getScreenName())) {
                     response.setStatus(HttpServletResponse.SC_FOUND);
diff --git a/juick-xmpp/build.gradle b/juick-xmpp/build.gradle
index 142f05cc..55370c27 100644
--- a/juick-xmpp/build.gradle
+++ b/juick-xmpp/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     compile 'javax.inject:javax.inject:1'
     compile 'org.apache.httpcomponents:httpclient:4.5.2'
     compile 'org.apache.commons:commons-dbcp2:2.1.1'
-    compile 'net.jodah:failsafe:1.0.0'
+    compile 'net.jodah:failsafe:1.0.1'
     providedRuntime 'mysql:mysql-connector-java:5.1.40'
 
     testCompile "junit:junit:${rootProject.junitVersion}"