From 89433dc4d71291d0c7a6a2ae92aeb7cff5e04456 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Thu, 10 Dec 2020 19:16:56 +0100
Subject: [PATCH] Added test framework as part of the BOM

---
 spring-cloud-sleuth-dependencies/pom.xml   |  6 ++++++
 src/checkstyle/checkstyle-suppressions.xml |  1 +
 tests/common/pom.xml                       |  4 ----
 tests/pom.xml                              | 14 --------------
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index fb7325a7e..764df4f03 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -73,6 +73,12 @@
 				<artifactId>spring-cloud-starter-sleuth</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<!-- Test framework -->
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-sleuth-tests-common</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<!-- BRAVE -->
 			<dependency>
 				<groupId>io.zipkin.brave</groupId>
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index 0b83bfb26..5aa8a82b3 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -4,6 +4,7 @@
 		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
 	<suppress files=".*/test/.*" checks="JavadocVariable"/>
+	<suppress files=".*/tests/common/.*" checks="JavadocVariable"/>
 	<suppress files=".*ReactorSleuth\.java" checks="InnerAssignment"/>
 	<suppress files=".*SpanHandlerTests.*" checks="LineLengthCheck"/>
 	<suppress files=".*GrpcTracingIntegrationTests.*" checks="LineLengthCheck"/>
diff --git a/tests/common/pom.xml b/tests/common/pom.xml
index 3ee08d7da..8a3a872de 100644
--- a/tests/common/pom.xml
+++ b/tests/common/pom.xml
@@ -34,10 +34,6 @@
 		<relativePath>..</relativePath>
 	</parent>
 
-	<properties>
-		<maven.javadoc.skip>true</maven.javadoc.skip>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/tests/pom.xml b/tests/pom.xml
index bfd0d6904..c86151dca 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -40,18 +40,4 @@
 		<module>otel</module>
 	</modules>
 
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<!--skip deploy (this is just a test module) -->
-					<artifactId>maven-deploy-plugin</artifactId>
-					<configuration>
-						<skip>true</skip>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-
 </project>