diff --git a/build.gradle b/build.gradle index 17811e0986f..7627dc13ae6 100644 --- a/build.gradle +++ b/build.gradle @@ -26,10 +26,6 @@ buildscript { dependencies { // For Apache Rat plugin to ignore non-Git files classpath "org.ajoberstar.grgit:grgit-core:$versions.grgit" - // Override jgit dependency used by grgit and spotless as we appear to auto resolve to - // 5.13.0.202109080827-r and the latest version requires java 9. - // Requires force=true to be used in spotless as reported by ./gradlew buildEnvironment. - classpath("org.eclipse.jgit:org.eclipse.jgit:$versions.jgit") { force = true } } } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index d6360aab8bf..bd26bdf10f5 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -63,7 +63,7 @@ versions += [ commonsCli: "1.4", dropwizardMetrics: "4.1.12.1", gradle: "7.1.1", - grgit: "4.1.0", + grgit: "4.1.1", httpclient: "4.5.13", easymock: "4.3", jackson: "2.12.3", @@ -71,7 +71,6 @@ versions += [ javassist: "3.27.0-GA", jetty: "9.4.43.v20210629", jersey: "2.34", - jgit: "5.12.0.202106070339-r", jline: "3.12.1", jmh: "1.32", hamcrest: "2.2",