From 86357f3450ee830cea71cca121dbeac4a4ae2612 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 29 Jan 2020 11:32:15 +0300
Subject: Update deps and Gradle wrapper

---
 build.gradle                             |  12 ++++++------
 gradle/wrapper/gradle-wrapper.jar        | Bin 58702 -> 58695 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 package.json                             |   2 +-
 yarn.lock                                |   8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index a4008834..01c7c4e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -122,7 +122,7 @@ dependencies {
     compile ("org.springframework.boot:spring-boot-starter-json")
     compile ('org.springframework.boot:spring-boot-devtools')
 
-    compile 'org.flywaydb:flyway-core:6.1.4'
+    compile 'org.flywaydb:flyway-core:6.2.0'
     compile 'com.github.ben-manes.caffeine:caffeine:2.8.1'
 
     compile "javax.inject:javax.inject:1"
@@ -137,7 +137,7 @@ dependencies {
     compile "commons-codec:commons-codec:1.14"
     compile "commons-io:commons-io:2.6"
     
-    compile 'org.ocpsoft.prettytime:prettytime:4.0.2.Final'
+    compile 'org.ocpsoft.prettytime:prettytime:4.0.3.Final'
     compile 'com.twelvemonkeys.imageio:imageio-jpeg:3.5'
     compile 'org.imgscalr:imgscalr-lib:4.2'
 
@@ -148,7 +148,7 @@ dependencies {
 
     compile 'org.apache.commons:commons-email:1.5'
     compile 'com.github.scribejava:scribejava-apis:6.9.0'
-    compile 'com.github.pengrad:java-telegram-bot-api:4.5.0'
+    compile 'com.github.pengrad:java-telegram-bot-api:4.6.0'
     compile 'org.imgscalr:imgscalr-lib:4.2'
     compile 'org.twitter4j:twitter4j-core:4.0.7'
 
@@ -158,7 +158,7 @@ dependencies {
     compile 'com.rometools:rome:1.12.2'
     compile 'com.rometools:rome-modules:1.12.2'
 
-    runtime 'org.mariadb.jdbc:mariadb-java-client:2.5.3'
+    runtime 'org.mariadb.jdbc:mariadb-java-client:2.5.4'
     runtime 'net.java.dev.jna:jna:5.5.0'
     runtime 'net.java.dev.jna:jna-platform:5.5.0'
     runtime 'com.h2database:h2:1.4.200'
@@ -174,10 +174,10 @@ dependencies {
     compile 'io.jsonwebtoken:jjwt-api:0.10.7'
     runtime 'io.jsonwebtoken:jjwt-jackson:0.10.7'
     runtime 'io.jsonwebtoken:jjwt-impl:0.10.7'
-    compile 'com.nimbusds:nimbus-jose-jwt:8.4'
+    compile 'com.nimbusds:nimbus-jose-jwt:8.5'
 
     testCompile("org.springframework.boot:spring-boot-starter-test")
-    testCompile('net.sourceforge.htmlunit:htmlunit:2.36.0')
+    testCompile('net.sourceforge.htmlunit:htmlunit:2.37.0')
     testCompile('org.springframework.security:spring-security-test')
     testCompile("ch.vorburger.mariaDB4j:mariaDB4j:2.4.0")
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index cc4fdc29..f3d88b1c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 31a0802f..4e1cc9db 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/package.json b/package.json
index 0bee135a..0320150c 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "evil-icons": "^1.10.1",
     "formdata-polyfill": "^3.0.19",
     "svg4everybody": "^2.1.9",
-    "url-polyfill": "^1.1.7",
+    "url-polyfill": "^1.1.8",
     "whatwg-fetch": "^3.0.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 1d749b8e..d231d687 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6929,10 +6929,10 @@ url-loader@^3.0.0:
     mime "^2.4.4"
     schema-utils "^2.5.0"
 
-url-polyfill@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.7.tgz#402ee84360eb549bbeb585f4c7971e79a31de9e3"
-  integrity sha512-ZrAxYWCREjmMtL8gSbSiKKLZZticgihCvVBtrFbUVpyoETt8GQJeG2okMWA8XryDAaHMjJfhnc+rnhXRbI4DXA==
+url-polyfill@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/url-polyfill/-/url-polyfill-1.1.8.tgz#21eb58ad61192f52b77dcac8ab5293ae7bc67060"
+  integrity sha512-Ey61F4FEqhcu1vHSOMmjl0Vd/RPRLEjMj402qszD/dhMBrVfoUsnIj8KSZo2yj+eIlxJGKFdnm6ES+7UzMgZ3Q==
 
 url@^0.11.0:
   version "0.11.0"
-- 
cgit v1.2.3