From d403cefa293fb9d8227e1330a5f7c460e44e2bab Mon Sep 17 00:00:00 2001
From: Owain van Brakel <owain.vanbrakel@gmail.com>
Date: Thu, 9 Jan 2020 22:09:12 +0100
Subject: [PATCH] project: Update deps

---
 build.gradle.kts                         |  3 ---
 buildSrc/src/main/kotlin/Dependencies.kt | 34 ++++++++++++------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d2c29e1231..b0aa552d11 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -49,7 +49,6 @@ plugins {
 
 val grgit = Grgit.open(mapOf("dir" to rootProject.projectDir.absolutePath))
 val localGitCommit = grgit.head().id
-val localGitCommitShort = grgit.head().getAbbreviatedId(7)
 
 fun isNonStable(version: String): Boolean {
     return listOf("ALPHA", "BETA", "RC").any {
@@ -77,8 +76,6 @@ subprojects {
     apply(plugin = Plugins.testLogger.first)
 
     project.extra["gitCommit"] = localGitCommit
-    project.extra["gitCommitShort"] = localGitCommitShort
-
     project.extra["rootPath"] = rootDir.toString().replace("\\", "/")
 
     if (this.name != "runescape-client") {
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index 39cf465eeb..8c54a0be05 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -34,13 +34,13 @@ object ProjectVersions {
 }
 
 object Plugins {
-    val grgitPlugin = "org.ajoberstar:grgit:2.3.0"
+    val grgitPlugin = "org.ajoberstar.grgit:grgit-core:4.0.1"
     val versionsPlugin = "com.github.ben-manes:gradle-versions-plugin:0.27.0"
     val injectorPlugin = "com.openosrs:injector-plugin:1.0.3.0"
     val testLogger = Pair("com.adarshr.test-logger", "2.0.0")
     val versions = Pair("com.github.ben-manes.versions", "0.27.0")
     val latestVersion = Pair("se.patrikerdes.use-latest-versions", "0.2.13")
-    val grgit = Pair("org.ajoberstar.grgit", "4.0.0-rc.1")
+    val grgit = Pair("org.ajoberstar.grgit", "4.0.1")
     val jarTest = Pair("com.github.hauner.jarTest", "1.0.1")
     val shadow = Pair("com.github.johnrengelman.shadow", "5.2.0")
 }
@@ -58,43 +58,43 @@ object Libraries {
         const val fernflower = "07082019"
         const val findbugs = "3.0.2"
         const val gson = "2.8.6"
-        const val guava = "28.1-jre"
+        const val guava = "28.2-jre"
         const val guice = "4.2.2"
         const val h2 = "1.4.200"
         const val hamcrest = "2.2"
         const val javax = "1.3.2"
         const val javaxInject = "1"
-        const val jedis = "3.1.0"
+        const val jedis = "3.2.0"
         const val jna = "5.5.0"
         const val jogamp = "2.3.2"
         const val jopt = "5.0.4"
         const val jooq = "3.12.3"
-        const val junit = "4.12"
+        const val junit = "4.13"
         const val jupiter = "5.6.0-M1"
         const val logback = "1.2.3"
         const val lombok = "1.18.10"
         const val mapstruct = "1.3.1.Final"
-        const val mariadbJdbc = "2.5.1"
+        const val mariadbJdbc = "2.5.2"
         const val mavenPluginAnnotations = "3.6.0"
-        const val mavenPluginApi = "3.6.2"
+        const val mavenPluginApi = "3.6.3"
         const val minio = "6.0.11"
-        const val mockito = "3.1.0"
-        const val mongodbDriverSync = "3.11.2"
+        const val mockito = "3.2.4"
+        const val mongodbDriverSync = "3.12.0"
         const val mysqlConnectorJava = "8.0.18"
         const val naturalMouse = "2.0.2"
-        const val netty = "4.1.43.Final"
-        const val okhttp3 = "4.2.2"
+        const val netty = "4.1.44.Final"
+        const val okhttp3 = "4.3.0"
         const val orangeExtensions = "1.0"
-        const val petitparser = "2.2.0"
+        const val petitparser = "2.3.1"
         const val plexus = "3.3.0"
-        const val rxjava = "2.2.14"
+        const val rxjava = "2.2.16"
         const val rxrelay = "2.1.1"
         const val scribejava = "6.9.0"
         const val sisu = "0.3.4"
-        const val sentry = "1.7.28"
-        const val slf4j = "1.7.29"
-        const val springJdbc = "5.2.1.RELEASE"
-        const val springboot = "2.2.1.RELEASE"
+        const val sentry = "1.7.29"
+        const val slf4j = "1.7.30"
+        const val springJdbc = "5.2.2.RELEASE"
+        const val springboot = "2.2.2.RELEASE"
         const val sql2o = "1.6.0"
         const val substance = "8.0.02"
         const val trident = "1.5.00"