From 3a3af768b5f1291bab52ba2b2b53e1bb99142ced Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@vmware.com>
Date: Thu, 8 Sep 2022 15:28:33 -0400
Subject: [PATCH] Use wiremock standalone jar.  Fixes #2142

---
 pom.xml                                                         | 2 +-
 spring-cloud-config-server/pom.xml                              | 2 +-
 .../cloud/config/server/support/HttpClientSupportTest.java      | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2053c87a..031e37ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
       </dependency>
       <dependency>
 				<groupId>com.github.tomakehurst</groupId>
-				<artifactId>wiremock-jre8</artifactId>
+				<artifactId>wiremock-jre8-standalone</artifactId>
 				<version>${wiremock.version}</version>
 			</dependency>
 		</dependencies>
diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
index 6552e99c..dba4ebc4 100644
--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -170,7 +170,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.github.tomakehurst</groupId>
-			<artifactId>wiremock-jre8</artifactId>
+			<artifactId>wiremock-jre8-standalone</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java
index 0f90d840..1050c953 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java
@@ -28,7 +28,6 @@ import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnJre;
 import org.junit.jupiter.api.condition.JRE;
@@ -70,7 +69,6 @@ public class HttpClientSupportTest {
 
 	@Test
 	@EnabledOnJre(JRE.JAVA_8)
-	@Disabled // https://github.com/spring-cloud/spring-cloud-config/issues/2142
 	public void httpsProxy() throws GeneralSecurityException, IOException {
 		WireMockServer wireMockProxyServer = new WireMockServer(
 				options().httpDisabled(true).dynamicHttpsPort().enableBrowserProxying(true).trustAllProxyTargets(true));