From bb08c9be10029200a9a2515c4ad59b2e5694d53e Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 8 Nov 2022 11:03:45 +0300
Subject: [PATCH 1/2] Bump grgit to 4.1.1

---
 build.gradle.kts                                   | 1 +
 checksum.xml                                       | 1 +
 plugins/stage-vote-release-plugin/build.gradle.kts | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b8b93df1..59137bd3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -41,6 +41,7 @@ buildscript {
             val version = findProperty("released.version")
             classpath("com.github.vlsi.stage-vote-release:com.github.vlsi.stage-vote-release.gradle.plugin:$version")
         }
+        classpath("org.ajoberstar.grgit:grgit-gradle:4.1.1")
     }
 }
 
diff --git a/checksum.xml b/checksum.xml
index 25878a81..9745835c 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -40,6 +40,7 @@
     <trusted-key id='efe8086f9e93774e' group='junit' />
     <trusted-key id='098a31f381819057' group='net.sourceforge.nekohtml' />
     <trusted-key id='c84125c13bf6f2f2' group='org.ajoberstar.grgit' />
+    <trusted-key id='ee8ecbbbc188fd5d' group='org.ajoberstar.grgit' />
     <trusted-key id='6b1b008864323b92' group='org.antlr' />
     <trusted-key id='9daadc1c9fcc82d0' group='org.apache.commons' />
     <trusted-key id='7c25280eae63ebe5' group='org.apache.httpcomponents' />
diff --git a/plugins/stage-vote-release-plugin/build.gradle.kts b/plugins/stage-vote-release-plugin/build.gradle.kts
index e284f96b..5a35fd02 100644
--- a/plugins/stage-vote-release-plugin/build.gradle.kts
+++ b/plugins/stage-vote-release-plugin/build.gradle.kts
@@ -20,8 +20,8 @@ dependencies {
     implementation(project(":plugins:license-gather-plugin"))
     implementation(project(":plugins:gradle-extensions-plugin"))
     implementation("org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r")
-    implementation("org.ajoberstar.grgit:grgit-gradle:4.0.1")
-    implementation("org.ajoberstar.grgit:grgit-core:4.0.1")
+    implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
+    implementation("org.ajoberstar.grgit:grgit-core:4.1.1")
     implementation("de.marcphilipp.gradle:nexus-publish-plugin:0.4.0")
     implementation("io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.2")
 }

From 6a4c92ee90a6d123adca42b0073c6f625cef07a0 Mon Sep 17 00:00:00 2001
From: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date: Tue, 8 Nov 2022 12:39:09 +0300
Subject: [PATCH 2/2] test: use release version Gradle 7.5.1 for tests

---
 .../src/test/kotlin/com/github/vlsi/jandex/JandexPluginTest.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jandex-plugin/src/test/kotlin/com/github/vlsi/jandex/JandexPluginTest.kt b/plugins/jandex-plugin/src/test/kotlin/com/github/vlsi/jandex/JandexPluginTest.kt
index 63798793..5121a283 100644
--- a/plugins/jandex-plugin/src/test/kotlin/com/github/vlsi/jandex/JandexPluginTest.kt
+++ b/plugins/jandex-plugin/src/test/kotlin/com/github/vlsi/jandex/JandexPluginTest.kt
@@ -44,7 +44,7 @@ class JandexPluginTest : BaseGradleTest() {
                 add(arguments("7.0", ConfigurationCache.ON))
                 add(arguments("7.4.2", ConfigurationCache.ON))
                 // Configuration cache supports custom caches since 7.5 only: https://github.com/gradle/gradle/issues/14874
-                add(arguments("7.5-20220421031748+0000", ConfigurationCache.ON))
+                add(arguments("7.5.1", ConfigurationCache.ON))
             }
         }
     }