From d85e522a849cd9fab9b7d73bb19713c68f4cf205 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Mon, 26 Jun 2023 08:51:27 +0200
Subject: [PATCH 1/3] Fixing the build

---
 .../spring-cloud-contract-stub-runner-docker/pom.xml  | 11 +++++++++++
 pom.xml                                               |  1 +
 spring-cloud-contract-stub-runner-boot/pom.xml        |  3 ---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docker/spring-cloud-contract-stub-runner-docker/pom.xml b/docker/spring-cloud-contract-stub-runner-docker/pom.xml
index 23fbe741ed..e50f524076 100644
--- a/docker/spring-cloud-contract-stub-runner-docker/pom.xml
+++ b/docker/spring-cloud-contract-stub-runner-docker/pom.xml
@@ -95,6 +95,17 @@
 			<version>${spring-cloud-build.version}</version>
 			<type>pom</type>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot.experimental</groupId>
+			<artifactId>spring-boot-thin-layout</artifactId>
+			<version>${thin-jar.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot.experimental</groupId>
+			<artifactId>spring-boot-thin-launcher</artifactId>
+			<version>${thin-jar.version}</version>
+			<classifier>exec</classifier>
+		</dependency>
 
 
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 03c3099be9..818c7b8a88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
 		<jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 		<InMemoryJavaCompiler.version>1.3.0</InMemoryJavaCompiler.version>
+		<thin-jar.version>1.0.27.RELEASE</thin-jar.version>
 
 		<contract.kotlin.version>1.5.20</contract.kotlin.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
diff --git a/spring-cloud-contract-stub-runner-boot/pom.xml b/spring-cloud-contract-stub-runner-boot/pom.xml
index 84d517d579..2cc938a36f 100644
--- a/spring-cloud-contract-stub-runner-boot/pom.xml
+++ b/spring-cloud-contract-stub-runner-boot/pom.xml
@@ -13,9 +13,6 @@
 	<packaging>jar</packaging>
 	<name>Spring Cloud Contract Stub Runner Boot</name>
 	<description>Spring Cloud Contract Stub Runner Boot</description>
-	<properties>
-		<thin-jar.version>1.0.27.RELEASE</thin-jar.version>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>

From c975bbaf5052dacf8345a899036e2170462932b8 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Mon, 26 Jun 2023 09:02:42 +0200
Subject: [PATCH 2/3] Fixed slf4j version; fixes gh-1909

---
 .../org/springframework/cloud/contract/spec/Contract.java   | 3 +--
 .../spring-cloud-contract-maven-plugin/pom.xml              | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/Contract.java b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/Contract.java
index 4a195fbbc3..86a398268f 100644
--- a/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/Contract.java
+++ b/specs/spring-cloud-contract-spec-java/src/main/java/org/springframework/cloud/contract/spec/Contract.java
@@ -150,8 +150,7 @@ public class Contract {
 	public static void assertContract(Contract dsl) {
 		if (dsl.getRequest() != null) {
 			if (dsl.request.getUrl() == null && dsl.request.getUrlPath() == null) {
-				throw new IllegalStateException(
-						"URL is missing for HTTP contract");
+				throw new IllegalStateException("URL is missing for HTTP contract");
 			}
 			if (dsl.request.getMethod() == null) {
 				throw new IllegalStateException("Method is missing for HTTP contract");
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
index 6300e53605..116081116a 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
@@ -41,6 +41,7 @@
 		<plexus-component-metadata.version>2.0.0</plexus-component-metadata.version>
 		<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
 		<maven-shared-incremental.version>1.1</maven-shared-incremental.version>
+		<slf4j-api.version>2.0.5</slf4j-api.version>
 	</properties>
 
 	<inceptionYear>2016</inceptionYear>
@@ -271,6 +272,11 @@
 	</reporting>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j-api.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-contract-verifier</artifactId>

From ce3f5956abad1c444c4a9b7dc425ac04af2562a8 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Mon, 26 Jun 2023 09:04:22 +0200
Subject: [PATCH 3/3] Changed slf4j version to 1.x; fixes gh-1909

---
 .../spring-cloud-contract-maven-plugin/pom.xml                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
index 116081116a..2b71dca5ef 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
@@ -41,7 +41,7 @@
 		<plexus-component-metadata.version>2.0.0</plexus-component-metadata.version>
 		<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
 		<maven-shared-incremental.version>1.1</maven-shared-incremental.version>
-		<slf4j-api.version>2.0.5</slf4j-api.version>
+		<slf4j-api.version>1.7.36</slf4j-api.version>
 	</properties>
 
 	<inceptionYear>2016</inceptionYear>