From 092b8980af5ebe696a3e37c4850c809a146eb746 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Fri, 30 Dec 2022 09:32:00 -0700
Subject: [PATCH] Use git plugin 5.0.0 and git client plugin 4.0.0 (#1663)

Pins git plugin 4.14.3 for Jenkins 2.346.x and older because git plugin
5.0.0 requires Java 11 and Jenkins 2.361.4 or newer.

Pins git client plugin 3.13.1 for Jenkins 2.346.x and older because git
client plugin 4.0.0 requires Java 11 and Jenkins 2.361.4 or newer.

Previously evaluated in:

* https://github.com/jenkinsci/bom/pull/1619
* https://github.com/jenkinsci/bom/pull/1625

Changelogs for releases:

* https://github.com/jenkinsci/git-client-plugin/releases/tag/git-client-4.0.0
* https://github.com/jenkinsci/git-plugin/releases/tag/git-5.0.0
---
 bom-2.346.x/pom.xml | 17 +++++++++++++++++
 bom-weekly/pom.xml  |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/bom-2.346.x/pom.xml b/bom-2.346.x/pom.xml
index 23be6ceff..ee99048b9 100644
--- a/bom-2.346.x/pom.xml
+++ b/bom-2.346.x/pom.xml
@@ -9,6 +9,7 @@
     <artifactId>bom-2.346.x</artifactId>
     <packaging>pom</packaging>
     <properties>
+        <git-plugin.version>4.14.3</git-plugin.version>
         <workflow-cps-plugin.version>3536.vb_8a_6628079d5</workflow-cps-plugin.version>
     </properties>
     <dependencyManagement>
@@ -50,6 +51,22 @@
                 <artifactId>display-url-api</artifactId>
                 <version>2.3.6</version>
             </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>git</artifactId>
+                <version>${git-plugin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>git</artifactId>
+                <version>${git-plugin.version}</version>
+                <classifier>tests</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>git-client</artifactId>
+                <version>3.13.1</version>
+            </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>git-server</artifactId>
diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml
index 4fc80aa0f..24ea9efb9 100644
--- a/bom-weekly/pom.xml
+++ b/bom-weekly/pom.xml
@@ -13,7 +13,7 @@
         <configuration-as-code-plugin.version>1569.vb_72405b_80249</configuration-as-code-plugin.version>
         <data-tables-api.version>1.12.1-4</data-tables-api.version>
         <forensics-api.version>1.17.0</forensics-api.version>
-        <git-plugin.version>4.14.3</git-plugin.version>
+        <git-plugin.version>5.0.0</git-plugin.version>
         <mina-sshd-api.version>2.9.2-50.va_0e1f42659a_a</mina-sshd-api.version>
         <pipeline-model-definition-plugin.version>2.2118.v31fd5b_9944b_5</pipeline-model-definition-plugin.version>
         <pipeline-stage-view-plugin.version>2.28</pipeline-stage-view-plugin.version>
@@ -343,7 +343,7 @@
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>
                 <artifactId>git-client</artifactId>
-                <version>3.13.1</version>
+                <version>4.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.jenkins-ci.plugins</groupId>