From 9902baf9f1e830049b9fe461dceb1ef03f5fb45a Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 24 Nov 2016 23:59:06 +0300 Subject: update dependencies --- juick-api/build.gradle | 2 +- juick-api/src/main/java/com/juick/api/TGBot.java | 6 +++++- juick-core/build.gradle | 2 +- juick-crosspost/build.gradle | 2 +- juick-notifications/build.gradle | 2 +- juick-server/build.gradle | 2 +- juick-ws/build.gradle | 2 +- juick-www/build.gradle | 4 ++-- juick-xmpp-bot/build.gradle | 2 +- juick-xmpp-ft/build.gradle | 2 +- juick-xmpp/build.gradle | 6 +++--- 11 files changed, 18 insertions(+), 14 deletions(-) diff --git a/juick-api/build.gradle b/juick-api/build.gradle index 08991eed..382ea8bd 100644 --- a/juick-api/build.gradle +++ b/juick-api/build.gradle @@ -25,7 +25,7 @@ dependencies { compile "org.springframework.security:spring-security-config:${springSecurityVersion}" providedCompile 'javax.servlet:javax.servlet-api:3.1.0' - compile 'com.github.pengrad:java-telegram-bot-api:2.1.4' + compile 'com.github.pengrad:java-telegram-bot-api:2.3.0' compile 'org.msbotframework4j:msbotframework4j-builder:0.1.4' compile 'com.neovisionaries:nv-websocket-client:1.30' compile 'net.coobird:thumbnailator:0.4.8' diff --git a/juick-api/src/main/java/com/juick/api/TGBot.java b/juick-api/src/main/java/com/juick/api/TGBot.java index 73aaa2b9..ae3c6b74 100644 --- a/juick-api/src/main/java/com/juick/api/TGBot.java +++ b/juick-api/src/main/java/com/juick/api/TGBot.java @@ -13,6 +13,7 @@ import com.pengrad.telegrambot.TelegramBotAdapter; import com.pengrad.telegrambot.model.request.InlineKeyboardButton; import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup; import com.pengrad.telegrambot.request.SendMessage; +import com.pengrad.telegrambot.request.SetWebhook; import com.pengrad.telegrambot.response.SendResponse; import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; @@ -49,7 +50,10 @@ public class TGBot implements AutoCloseable { } bot = TelegramBotAdapter.build(token); try { - bot.setWebhook("https://api.juick.com/tlgmbtwbhk"); + SetWebhook webhook = new SetWebhook().url("https://api.juick.com/tlgmbtwbhk"); + if (!bot.execute(webhook).isOk()) { + logger.error("error setting webhook"); + } ws = new WebSocketFactory().createSocket("wss://ws.juick.com/"); ws.setPingInterval(60 * 1000); ws.addListener(new WebSocketAdapter() { diff --git a/juick-core/build.gradle b/juick-core/build.gradle index 29b65347..134156b2 100644 --- a/juick-core/build.gradle +++ b/juick-core/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java' apply plugin: 'com.github.ben-manes.versions' def slf4jVersion = '1.7.21' -def jacksonVersion = '2.8.4' +def jacksonVersion = '2.8.5' dependencies { compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" diff --git a/juick-crosspost/build.gradle b/juick-crosspost/build.gradle index ad393469..11b47f84 100644 --- a/juick-crosspost/build.gradle +++ b/juick-crosspost/build.gradle @@ -8,7 +8,7 @@ def springFrameworkVersion = '4.3.4.RELEASE' dependencies { compile project(':juick-server') compile "org.springframework:spring-webmvc:${springFrameworkVersion}" - compile 'com.mitchellbosecke:pebble-spring4:2.2.3' + compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/juick-notifications/build.gradle b/juick-notifications/build.gradle index 3dc52132..c66fbd86 100644 --- a/juick-notifications/build.gradle +++ b/juick-notifications/build.gradle @@ -10,7 +10,7 @@ dependencies { compile 'com.ganyo:gcm-server:1.1.0' compile 'com.notnoop.apns:apns:1.0.0.Beta6' compile "org.springframework:spring-webmvc:${springFrameworkVersion}" - compile 'com.mitchellbosecke:pebble-spring4:2.2.3' + compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' testCompile 'junit:junit:4.12' testCompile "org.mockito:mockito-core:1.+" diff --git a/juick-server/build.gradle b/juick-server/build.gradle index c74dc892..0c753397 100644 --- a/juick-server/build.gradle +++ b/juick-server/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.github.ben-manes.versions' sourceCompatibility = 1.8 -def jacksonVersion = '2.8.4' +def jacksonVersion = '2.8.5' def logbackVersion = '1.1.7' def slf4jVersion = '1.7.21' def springFrameworkVersion = '4.3.4.RELEASE' diff --git a/juick-ws/build.gradle b/juick-ws/build.gradle index cad49312..b235a2c1 100644 --- a/juick-ws/build.gradle +++ b/juick-ws/build.gradle @@ -17,7 +17,7 @@ dependencies { compile project(':juick-server') compile "org.springframework:spring-webmvc:${springFrameworkVersion}" compile "org.springframework:spring-websocket:${springFrameworkVersion}" - compile 'com.mitchellbosecke:pebble-spring4:2.2.3' + compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/juick-www/build.gradle b/juick-www/build.gradle index fb436a8b..6ed95125 100644 --- a/juick-www/build.gradle +++ b/juick-www/build.gradle @@ -22,13 +22,13 @@ def springFrameworkVersion = '4.3.4.RELEASE' dependencies { compile project(':juick-server') - compile 'com.github.scribejava:scribejava-apis:3.2.0' + compile 'com.github.scribejava:scribejava-apis:3.3.0' compile 'net.coobird:thumbnailator:0.4.8' compile 'com.github.ooxi:serialized-php-parser:0.5.0' compile 'com.mitchellbosecke:pebble:2.2.3' compile 'com.sun.mail:javax.mail:1.5.6' compile "org.springframework:spring-webmvc:${springFrameworkVersion}" - compile 'com.mitchellbosecke:pebble-spring4:2.2.3' + compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedCompile 'javax.servlet:javax.servlet-api:3.1.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/juick-xmpp-bot/build.gradle b/juick-xmpp-bot/build.gradle index dd1f2a9b..b7635da8 100644 --- a/juick-xmpp-bot/build.gradle +++ b/juick-xmpp-bot/build.gradle @@ -8,7 +8,7 @@ def springFrameworkVersion = '4.3.4.RELEASE' dependencies { compile project(':juick-server') compile "org.springframework:spring-webmvc:${springFrameworkVersion}" - compile 'com.mitchellbosecke:pebble-spring4:2.2.3' + compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/juick-xmpp-ft/build.gradle b/juick-xmpp-ft/build.gradle index dd1f2a9b..b7635da8 100644 --- a/juick-xmpp-ft/build.gradle +++ b/juick-xmpp-ft/build.gradle @@ -8,7 +8,7 @@ def springFrameworkVersion = '4.3.4.RELEASE' dependencies { compile project(':juick-server') compile "org.springframework:spring-webmvc:${springFrameworkVersion}" - compile 'com.mitchellbosecke:pebble-spring4:2.2.3' + compile 'com.mitchellbosecke:pebble-spring4:2.3.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } diff --git a/juick-xmpp/build.gradle b/juick-xmpp/build.gradle index 65a523c3..5462a879 100644 --- a/juick-xmpp/build.gradle +++ b/juick-xmpp/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'org.akhikhl.gretty' apply plugin: 'com.github.ben-manes.versions' def springFrameworkVersion = '4.3.4.RELEASE' -def jacksonVersion = '2.8.4' +def jacksonVersion = '2.8.5' def slf4jVersion = '1.7.21' dependencies { @@ -18,8 +18,8 @@ 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 'com.mitchellbosecke:pebble-spring4:2.2.3' - compile 'net.jodah:failsafe:0.9.5' + compile 'com.mitchellbosecke:pebble-spring4:2.3.0' + compile 'net.jodah:failsafe:1.0.0' providedRuntime 'mysql:mysql-connector-java:5.1.40' } -- cgit v1.2.3