Fixes merge errors

Author: spencergibb

spring-cloud-gateway-proxyexchange-webmvc/pom.xml

@@ -63,10 +63,5 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>

spring-cloud-gateway-server-webmvc/pom.xml

@@ -174,6 +174,11 @@
 			<artifactId>testcontainers-rabbitmq</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 
 	<profiles>