aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-12-26 14:21:32 +0300
committerGravatar Vitaly Takmazov2016-12-26 14:21:32 +0300
commit76fd9227e138afdbbce57bf0845f7f90fe127edc (patch)
treea9a978e94e562f0148b21aee783db6505a13f47f
parent4364ebfa18586686f4230de2fb350777f05e42fa (diff)
dependency updates
-rw-r--r--build.gradle6
-rw-r--r--juick-api/build.gradle2
-rw-r--r--juick-www/build.gradle2
-rw-r--r--juick-www/src/main/java/com/juick/www/TwitterAuth.java2
4 files changed, 6 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index 0b4e3ca4..a159a5b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,10 +6,10 @@ allprojects {
}
project.ext {
- springFrameworkVersion = '4.3.4.RELEASE'
- springSecurityVersion = '4.2.0.RELEASE'
+ springFrameworkVersion = '4.3.5.RELEASE'
+ springSecurityVersion = '4.2.1.RELEASE'
jacksonVersion = '2.8.5'
- slf4jVersion = '1.7.21'
+ slf4jVersion = '1.7.22'
logbackVersion = '1.1.8'
junitVersion = "4.12"
hamcrestVersion= "1.3"
diff --git a/juick-api/build.gradle b/juick-api/build.gradle
index 39fe4076..5202789a 100644
--- a/juick-api/build.gradle
+++ b/juick-api/build.gradle
@@ -15,7 +15,7 @@ dependencies {
compile "org.springframework:spring-webmvc:${rootProject.springFrameworkVersion}"
compile 'com.github.pengrad:java-telegram-bot-api:2.3.1'
- compile 'com.neovisionaries:nv-websocket-client:1.30'
+ compile 'com.neovisionaries:nv-websocket-client:1.31'
compile 'net.coobird:thumbnailator:0.4.8'
providedRuntime 'mysql:mysql-connector-java:5.1.40'
diff --git a/juick-www/build.gradle b/juick-www/build.gradle
index d6a8f4b2..d3a6beba 100644
--- a/juick-www/build.gradle
+++ b/juick-www/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'com.github.ben-manes.versions'
dependencies {
compile project(':juick-server')
- compile 'com.github.scribejava:scribejava-apis:3.4.0'
+ compile 'com.github.scribejava:scribejava-apis:3.4.1'
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/TwitterAuth.java b/juick-www/src/main/java/com/juick/www/TwitterAuth.java
index a0c1d9b0..35e00efc 100644
--- a/juick-www/src/main/java/com/juick/www/TwitterAuth.java
+++ b/juick-www/src/main/java/com/juick/www/TwitterAuth.java
@@ -78,7 +78,7 @@ 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);
+ OAuthRequest oAuthRequest = new OAuthRequest(Verb.GET, VERIFY_URL, oAuthService.getConfig());
oAuthService.signRequest(accessToken, oAuthRequest);
com.juick.www.twitter.User twitterUser = mapper.readValue(oAuthRequest.send().getBody(), com.juick.www.twitter.User.class);
if (UserQueries.linkTwitterAccount(sql, user, accessToken.getToken(), accessToken.getTokenSecret(),