From 015377f9de8e3597e2edb04337623704f75ce742 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 28 Oct 2014 14:08:15 +0000
Subject: [PATCH] Exclude log4j in a couple of places (see gh-1660)

also rename spring-cloud starter
---
 spring-boot-autoconfigure/pom.xml                |  4 ++++
 spring-boot-dependencies/pom.xml                 | 16 +++++++++++-----
 spring-boot-starters/pom.xml                     |  1 +
 .../pom.xml                                      |  4 ++--
 .../src/main/resources/META-INF/spring.provides  |  0
 5 files changed, 18 insertions(+), 7 deletions(-)
 rename spring-boot-starters/{spring-boot-starter-cloud => spring-boot-starter-cloud-connectors}/pom.xml (92%)
 rename spring-boot-starters/{spring-boot-starter-cloud => spring-boot-starter-cloud-connectors}/src/main/resources/META-INF/spring.provides (100%)

diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
index 36b5faab05..065a1d9072 100644
--- a/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -114,6 +114,10 @@
 					<groupId>org.codehaus.woodstox</groupId>
 					<artifactId>wstx-asl</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>log4j</artifactId>
+					<groupId>log4j</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 5eb0a19925..3b7f66b97e 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.boot</groupId>
 	<artifactId>spring-boot-dependencies</artifactId>
@@ -1155,6 +1157,12 @@
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-spring-service-connector</artifactId>
 				<version>${spring-cloud.version}</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>log4j</artifactId>
+						<groupId>log4j</groupId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
@@ -1451,10 +1459,8 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<repositories>
-				<!--
-					Repositories to allow snapshot and milestone BOM imports during
-					development. This section is stripped out when a full release is prepared.
-				-->
+				<!-- Repositories to allow snapshot and milestone BOM imports during 
+					development. This section is stripped out when a full release is prepared. -->
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 41e08d4122..90c5adabfd 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -24,6 +24,7 @@
 		<module>spring-boot-starter-amqp</module>
 		<module>spring-boot-starter-aop</module>
 		<module>spring-boot-starter-batch</module>
+		<module>spring-boot-starter-cloud-connectors</module>
 		<module>spring-boot-starter-data-elasticsearch</module>
 		<module>spring-boot-starter-data-gemfire</module>
 		<module>spring-boot-starter-data-jpa</module>
diff --git a/spring-boot-starters/spring-boot-starter-cloud/pom.xml b/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml
similarity index 92%
rename from spring-boot-starters/spring-boot-starter-cloud/pom.xml
rename to spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml
index dc751928e6..1cc504e0ee 100644
--- a/spring-boot-starters/spring-boot-starter-cloud/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml
@@ -6,8 +6,8 @@
 		<artifactId>spring-boot-starters</artifactId>
 		<version>1.2.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-starter-cloud</artifactId>
-	<name>Spring Boot Cloud Multiplatform Starter</name>
+	<artifactId>spring-boot-starter-cloud-connectors</artifactId>
+	<name>spring-boot-starter-cloud-connectors</name>
 	<description>Spring Boot Starter for Spring Cloud</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>
diff --git a/spring-boot-starters/spring-boot-starter-cloud/src/main/resources/META-INF/spring.provides b/spring-boot-starters/spring-boot-starter-cloud-connectors/src/main/resources/META-INF/spring.provides
similarity index 100%
rename from spring-boot-starters/spring-boot-starter-cloud/src/main/resources/META-INF/spring.provides
rename to spring-boot-starters/spring-boot-starter-cloud-connectors/src/main/resources/META-INF/spring.provides