You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ca...@apache.org on 2021/12/09 12:51:15 UTC

[kafka] branch 3.0 updated: MINOR: Bump version of grgit to 4.1.1 (#11561)

This is an automated email from the ASF dual-hosted git repository.

cadonna pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new d2440e9  MINOR: Bump version of grgit to 4.1.1 (#11561)
d2440e9 is described below

commit d2440e94bf1cd673f323fe2a76abf1e5acf55b4e
Author: Bruno Cadonna <br...@confluent.io>
AuthorDate: Tue Dec 7 18:24:43 2021 +0100

    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 d1e0d2b474b0bdb0b0141b6d341ce77dd331a8d4
    and instead bump the grgit version from 4.1.0 to 4.1.1.
    
    Reviewer: John Roesler <vv...@apache.org>
---
 build.gradle               | 4 ----
 gradle/dependencies.gradle | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 17811e0..7627dc1 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 d6360aa..bd26bdf 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",