Merge branch 'master' into apache-sshd-170

This commit is contained in:
Naoki Takezoe
2018-10-03 23:39:41 +09:00
committed by GitHub

View File

@@ -40,16 +40,16 @@ libraryDependencies ++= Seq(
"commons-io" % "commons-io" % "2.6",
"io.github.gitbucket" % "solidbase" % "1.0.2",
"io.github.gitbucket" % "markedj" % "1.0.15",
"org.apache.commons" % "commons-compress" % "1.15",
"org.apache.commons" % "commons-compress" % "1.18",
"org.apache.commons" % "commons-email" % "1.5",
"org.apache.httpcomponents" % "httpclient" % "4.5.4",
"org.apache.httpcomponents" % "httpclient" % "4.5.6",
"org.apache.sshd" % "apache-sshd" % "1.7.0" exclude ("org.slf4j", "slf4j-jdk14"),
"org.apache.tika" % "tika-core" % "1.17",
"org.apache.tika" % "tika-core" % "1.19",
"com.github.takezoe" %% "blocking-slick-32" % "0.0.10",
"com.novell.ldap" % "jldap" % "2009-10-07",
"com.h2database" % "h2" % "1.4.196",
"org.mariadb.jdbc" % "mariadb-java-client" % "2.2.6",
"org.postgresql" % "postgresql" % "42.2.4",
"org.mariadb.jdbc" % "mariadb-java-client" % "2.3.0",
"org.postgresql" % "postgresql" % "42.2.5",
"ch.qos.logback" % "logback-classic" % "1.2.3",
"com.zaxxer" % "HikariCP" % "2.7.4",
"com.typesafe" % "config" % "1.3.2",