From 2b2903c91dec4bbdbc3c118b8467551605f86904 Mon Sep 17 00:00:00 2001
From: spencergibb <spencer@gibb.us>
Date: Tue, 9 Mar 2021 14:45:22 -0500
Subject: [PATCH] Makes junit:junit optional.

This means modules using spring-cloud-test-support must have the
junit-vintage-engine dependency so tests will run properly.
---
 spring-cloud-context-integration-tests/pom.xml         |  5 +++++
 spring-cloud-context-webflux-integration-tests/pom.xml |  5 +++++
 spring-cloud-loadbalancer/pom.xml                      |  5 +++++
 ...OAuth2LoadBalancerClientAutoConfigurationTests.java | 10 ++++++++++
 spring-cloud-test-support/pom.xml                      |  1 +
 5 files changed, 26 insertions(+)

diff --git a/spring-cloud-context-integration-tests/pom.xml b/spring-cloud-context-integration-tests/pom.xml
index e3756823..d09fd989 100644
--- a/spring-cloud-context-integration-tests/pom.xml
+++ b/spring-cloud-context-integration-tests/pom.xml
@@ -60,6 +60,11 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/spring-cloud-context-webflux-integration-tests/pom.xml b/spring-cloud-context-webflux-integration-tests/pom.xml
index 09d452b6..b2d80655 100644
--- a/spring-cloud-context-webflux-integration-tests/pom.xml
+++ b/spring-cloud-context-webflux-integration-tests/pom.xml
@@ -42,6 +42,11 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
diff --git a/spring-cloud-loadbalancer/pom.xml b/spring-cloud-loadbalancer/pom.xml
index 266af417..5dc462e9 100644
--- a/spring-cloud-loadbalancer/pom.xml
+++ b/spring-cloud-loadbalancer/pom.xml
@@ -117,5 +117,10 @@
 			<artifactId>awaitility</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.junit.vintage</groupId>
+			<artifactId>junit-vintage-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/security/OAuth2LoadBalancerClientAutoConfigurationTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/security/OAuth2LoadBalancerClientAutoConfigurationTests.java
index 9bcb0e99..89d0f979 100644
--- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/security/OAuth2LoadBalancerClientAutoConfigurationTests.java
+++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/security/OAuth2LoadBalancerClientAutoConfigurationTests.java
@@ -18,7 +18,9 @@ package org.springframework.cloud.loadbalancer.security;
 
 import java.net.URI;
 
+import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
 import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -51,6 +53,14 @@ public class OAuth2LoadBalancerClientAutoConfigurationTests {
 	@Rule
 	public ExpectedException expected = ExpectedException.none();
 
+	@Before
+	public void before() {
+		// FIXME: why do I need to do this? (fails in maven build without it.
+		// https://stackoverflow.com/questions/28911560/tomcat-8-embedded-error-org-apache-catalina-core-containerbase-a-child-con
+		// https://github.com/spring-projects/spring-boot/issues/21535
+		TomcatURLStreamHandlerFactory.disable();
+	}
+
 	@After
 	public void close() {
 		if (this.context != null) {
diff --git a/spring-cloud-test-support/pom.xml b/spring-cloud-test-support/pom.xml
index b3f6c08b..4a5e2f46 100644
--- a/spring-cloud-test-support/pom.xml
+++ b/spring-cloud-test-support/pom.xml
@@ -54,6 +54,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>