aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2015-11-27 16:52:28 +0300
committerGravatar Vitaly Takmazov2015-11-27 16:52:28 +0300
commit03f9e91ff8d61e63c6b4a49a5a15af52e87fd63a (patch)
tree99f25940e6c2ccea490f8c9734527d77ee29a748
parentfe8b6a40491129461cd3fb5ccc793a3f6f2d8f34 (diff)
update deps
-rw-r--r--build.gradle2
m---------deps/com.juick.json10
2 files changed, 6 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index 4a98c4d2..14e74f02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,7 +49,6 @@ project(':deps:com.juick.json') {
}
dependencies {
- compile 'org.json:json:20140107'
compile core
compile server
compile xmpp
@@ -60,6 +59,7 @@ dependencies {
"org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
"org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
testCompile 'junit:junit:4.12'
+ runtime 'mysql:mysql-connector-java:5.1.37'
}
compileJava.options.encoding = 'UTF-8'
diff --git a/deps/com.juick.json b/deps/com.juick.json
-Subproject 655b821e274ca4be078389475a8bb33139c55a4
+Subproject d4cbeb802cba9fb3bd0885c31807bdff7b3f6b2