Merge remote-tracking branch 'upstream/master' into breaking

build.gradle

@@ -8,20 +8,19 @@ buildscript {
 
     configurations.all {
         resolutionStrategy {
-            force 'com.google.guava:guava:21.0'
-            force 'org.ow2.asm:asm:6.0_BETA'
+            force 'commons-io:commons-io:2.4'
         }
     }
 
     dependencies {
         classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
-        classpath 'org.ajoberstar:gradle-git:1.7.2'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.8.1'
     }
 }
 
 plugins {
     id 'net.minecrell.licenser' version '0.4.1' apply false
+    id "org.ajoberstar.grgit" version "2.3.0"
 }
 
 apply plugin: 'java'