MINOR: Bump version of grgit to 4.1.1 (#11561)

grgit 4.1.0 caused unsupported version error during gradle builds.
The reason was that grgit 4.1.0 uses always the latest JGit version
internally. Unfortunately, the latest JGit version was compiled with
a Java version later than Java 8 which caused the unsupported version
error during gradle builds for Java 8.

grgit 4.1.1 fixed this issue by upper bounding the version of JGrit
to a version that is still compiled with Java 8. Consequently, we can
remove the hotfix we merged in commit d1e0d2b474
and instead bump the grgit version from 4.1.0 to 4.1.1.

Reviewer: John Roesler <vvcephei@apache.org>
This commit is contained in:
Bruno Cadonna 2021-12-07 18:24:43 +01:00
parent ac923b0611
commit d2440e94bf
2 changed files with 1 additions and 6 deletions

View File

@ -26,10 +26,6 @@ buildscript {
dependencies { dependencies {
// For Apache Rat plugin to ignore non-Git files // For Apache Rat plugin to ignore non-Git files
classpath "org.ajoberstar.grgit:grgit-core:$versions.grgit" 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 }
} }
} }

View File

@ -63,7 +63,7 @@ versions += [
commonsCli: "1.4", commonsCli: "1.4",
dropwizardMetrics: "4.1.12.1", dropwizardMetrics: "4.1.12.1",
gradle: "7.1.1", gradle: "7.1.1",
grgit: "4.1.0", grgit: "4.1.1",
httpclient: "4.5.13", httpclient: "4.5.13",
easymock: "4.3", easymock: "4.3",
jackson: "2.12.3", jackson: "2.12.3",
@ -71,7 +71,6 @@ versions += [
javassist: "3.27.0-GA", javassist: "3.27.0-GA",
jetty: "9.4.43.v20210629", jetty: "9.4.43.v20210629",
jersey: "2.34", jersey: "2.34",
jgit: "5.12.0.202106070339-r",
jline: "3.12.1", jline: "3.12.1",
jmh: "1.32", jmh: "1.32",
hamcrest: "2.2", hamcrest: "2.2",