From fe5a6a1ac35aac5839212934a7c791ebdc94c562 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Tue, 22 Nov 2022 11:38:17 +0100
Subject: [PATCH 1/3] Unified jgit versions; fixed gh-1822

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 013dd69a93..643b0ee915 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
 		<hoverfly-junit.version>0.2.2</hoverfly-junit.version>
 		<commons-text.version>1.10.0</commons-text.version>
 		<handlebars.version>4.3.0</handlebars.version>
-		<jgit.version>5.12.0.202106070339-r</jgit.version>
+		<jgit.version>5.13.1.202206130422-r</jgit.version>
 		<javax-inject.version>1</javax-inject.version>
 		<json-unit-assertj.version>2.27.0</json-unit-assertj.version>
 

From 9e536c827341e024a4c55e5311ee35b95ab160de Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Tue, 22 Nov 2022 11:56:04 +0100
Subject: [PATCH 2/3] Fixed NPE when contract dir missing; fixes gh-1830

---
 .../cloud/contract/verifier/plugin/ContractsCopyTask.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.java b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.java
index 289dcd1b24..d9daf1962b 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.java
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.java
@@ -249,8 +249,8 @@ class ContractsCopyTask extends DefaultTask {
 			}
 			return;
 		}
-		if (failOnNoContracts.get() && (!file.exists() || file.listFiles().length == 0)) {
-			String path = file.getAbsolutePath();
+		if (failOnNoContracts.get() && (file == null || !file.exists() || file.listFiles().length == 0)) {
+			String path = file != null file.getAbsolutePath() : "";
 			throw new GradleException("Contracts could not be found: [" + path
 					+ "]\nPlease make sure that the contracts were defined, or set the [failOnNoContracts] flag to [false]");
 		}
@@ -541,4 +541,4 @@ class ContractsCopyTask extends DefaultTask {
 		return str;
 	}
 
-}
\ No newline at end of file
+}

From 9b9514d64b895b5ee4a49b500a261ca79c1dfa99 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Tue, 22 Nov 2022 11:57:24 +0100
Subject: [PATCH 3/3] Fixed missing ?

---
 .../cloud/contract/verifier/plugin/ContractsCopyTask.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.java b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.java
index d9daf1962b..4d24486a0e 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.java
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.java
@@ -250,7 +250,7 @@ class ContractsCopyTask extends DefaultTask {
 			return;
 		}
 		if (failOnNoContracts.get() && (file == null || !file.exists() || file.listFiles().length == 0)) {
-			String path = file != null file.getAbsolutePath() : "";
+			String path = file != null ? file.getAbsolutePath() : "";
 			throw new GradleException("Contracts could not be found: [" + path
 					+ "]\nPlease make sure that the contracts were defined, or set the [failOnNoContracts] flag to [false]");
 		}