From 4a385bab72f486a6eae9e034df47f0afb9d65fa2 Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Fri, 21 May 2021 09:18:29 -0700
Subject: [PATCH 1/2] Upgrade jgit to 5.11.1.202105131744-r

---
 pom.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 416129dd342..b191a59f5b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,8 +58,7 @@
         <version.lib.asm>6.0</version.lib.asm>
         <version.lib.checkstyle>8.29</version.lib.checkstyle>
         <version.lib.groovy-all>2.4.14</version.lib.groovy-all>
-        <version.lib.jgit>4.9.9.201903122025-r</version.lib.jgit>
-        <version.lib.jsch>0.1.55</version.lib.jsch>
+        <version.lib.jgit>5.11.1.202105131744-r</version.lib.jgit>
         <version.lib.kafka-junit5>3.2.1</version.lib.kafka-junit5>
         <version.lib.netty.tcnative>2.0.36.Final</version.lib.netty.tcnative>
         <version.lib.restito>0.9.1</version.lib.restito>
@@ -880,12 +879,6 @@
                 <artifactId>org.eclipse.jgit</artifactId>
                 <version>${version.lib.jgit}</version>
             </dependency>
-            <!-- Used to update version used by jgit -->
-            <dependency>
-                <groupId>com.jcraft</groupId>
-                <artifactId>jsch</artifactId>
-                <version>${version.lib.jsch}</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.jgit</groupId>
                 <artifactId>org.eclipse.jgit.junit</artifactId>

From 82d9e143306a736e4946d0aa1084513b4b086af3 Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Fri, 21 May 2021 13:41:08 -0700
Subject: [PATCH 2/2] Move org.eclipse.jgit dependency management to
 dependencies/pom.xml

---
 dependencies/pom.xml | 6 ++++++
 pom.xml              | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 6cc999d36c7..3f6ba3fb2e4 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -80,6 +80,7 @@
         <version.lib.jaxb-runtime>2.3.3</version.lib.jaxb-runtime>
         <version.lib.jedis>3.1.0</version.lib.jedis>
         <version.lib.jersey>2.34</version.lib.jersey>
+        <version.lib.jgit>5.11.1.202105131744-r</version.lib.jgit>
         <version.lib.jms-api>2.0</version.lib.jms-api>
         <version.lib.jsonb-api>1.0.2</version.lib.jsonb-api>
         <version.lib.jsonp-api>1.1.6</version.lib.jsonp-api>
@@ -305,6 +306,11 @@
                 <artifactId>jakarta.activation-api</artifactId>
                 <version>${version.lib.activation-api}</version>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.jgit</groupId>
+                <artifactId>org.eclipse.jgit</artifactId>
+                <version>${version.lib.jgit}</version>
+            </dependency>
             <dependency>
                 <groupId>javax.jms</groupId>
                 <artifactId>javax.jms-api</artifactId>
diff --git a/pom.xml b/pom.xml
index b191a59f5b4..44b61737a38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,6 @@
         <version.lib.asm>6.0</version.lib.asm>
         <version.lib.checkstyle>8.29</version.lib.checkstyle>
         <version.lib.groovy-all>2.4.14</version.lib.groovy-all>
-        <version.lib.jgit>5.11.1.202105131744-r</version.lib.jgit>
         <version.lib.kafka-junit5>3.2.1</version.lib.kafka-junit5>
         <version.lib.netty.tcnative>2.0.36.Final</version.lib.netty.tcnative>
         <version.lib.restito>0.9.1</version.lib.restito>
@@ -874,11 +873,6 @@
                 <artifactId>netty-tcnative-boringssl-static</artifactId>
                 <version>${version.lib.netty.tcnative}</version>
             </dependency>
-            <dependency>
-                <groupId>org.eclipse.jgit</groupId>
-                <artifactId>org.eclipse.jgit</artifactId>
-                <version>${version.lib.jgit}</version>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.jgit</groupId>
                 <artifactId>org.eclipse.jgit.junit</artifactId>