From be578815988335c42672ce1a26d367a92e6d8964 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Mon, 5 Aug 2013 14:25:39 -0700
Subject: [PATCH] Exclude commons-logging from test dependencies

---
 spring-boot-parent/pom.xml                             | 10 ++++++++--
 .../spring-boot-starter-parent/pom.xml                 |  8 +++++++-
 spring-boot-starters/src/main/parent/pom.xml           |  8 +++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 3335ca78a74..94f5ca236ce 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -34,7 +34,7 @@
 	</scm>
 	<dependencyManagement>
 		<dependencies>
-			<!-- Additional Dependencies the consumers of spring-boot-dependencies
+			<!-- Additional Dependencies the consumers of spring-boot-dependencies 
 				will generally not need -->
 			<dependency>
 				<groupId>net.sf.jopt-simple</groupId>
@@ -164,6 +164,12 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 	<repositories>
@@ -288,7 +294,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<!-- Allow snapshots and milestones when building locally, this profile
+			<!-- Allow snapshots and milestones when building locally, this profile 
 				should not be enabled during release. -->
 			<id>spring-snapshot-build</id>
 			<activation>
diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
index 07268739331..ffa5cf4f05f 100644
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -17,7 +17,7 @@
 	<packaging>pom</packaging>
 	<properties>
 		<spring.boot.version>0.5.0.BUILD-SNAPSHOT</spring.boot.version>
-        <java.version>1.6</java.version>
+		<java.version>1.6</java.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -99,6 +99,12 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 	<build>
diff --git a/spring-boot-starters/src/main/parent/pom.xml b/spring-boot-starters/src/main/parent/pom.xml
index ec5153abd7a..b52bd56f0d0 100644
--- a/spring-boot-starters/src/main/parent/pom.xml
+++ b/spring-boot-starters/src/main/parent/pom.xml
@@ -17,7 +17,7 @@
 	<packaging>pom</packaging>
 	<properties>
 		<spring.boot.version>@{project.version}</spring.boot.version>
-        <java.version>1.6</java.version>
+		<java.version>1.6</java.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -99,6 +99,12 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 	<build>