From 77bf3ad90ee2a96f1601dff922fa047bdc364a40 Mon Sep 17 00:00:00 2001
From: John Tims <john.k.tims@gmail.com>
Date: Sun, 28 Sep 2014 09:52:48 -0400
Subject: [PATCH 1/2] Fix typo in javadoc

(Cherry picked from commit bebbe92)
Fixes gh-1633
---
 .../main/java/org/springframework/boot/SpringApplication.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
index 147239f69dc..532b53b5ad4 100644
--- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@@ -192,7 +192,7 @@ public class SpringApplication {
 	private Set<String> profiles = new HashSet<String>();
 
 	/**
-	 * Crate a new {@link SpringApplication} instance. The application context will load
+	 * Create a new {@link SpringApplication} instance. The application context will load
 	 * beans from the specified sources (see {@link SpringApplication class-level}
 	 * documentation for details. The instance can be customized before calling
 	 * {@link #run(String...)}.
@@ -205,7 +205,7 @@ public class SpringApplication {
 	}
 
 	/**
-	 * Crate a new {@link SpringApplication} instance. The application context will load
+	 * Create a new {@link SpringApplication} instance. The application context will load
 	 * beans from the specified sources (see {@link SpringApplication class-level}
 	 * documentation for details. The instance can be customized before calling
 	 * {@link #run(String...)}.

From de11e0550707985f063377006acdc8bb54c0eb96 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 8 Oct 2014 14:16:41 +0100
Subject: [PATCH 2/2] Exclude log4j:log4j in favor of
 org.slf4j:log4j-over-slf4j

Closes gh-1660
---
 spring-boot-starters/spring-boot-starter-data-solr/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-boot-starters/spring-boot-starter-data-solr/pom.xml b/spring-boot-starters/spring-boot-starter-data-solr/pom.xml
index 72b9fee3fba..a5d5c854599 100644
--- a/spring-boot-starters/spring-boot-starter-data-solr/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-data-solr/pom.xml
@@ -25,6 +25,12 @@
 		<dependency>
 			<groupId>org.apache.solr</groupId>
 			<artifactId>solr-solrj</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>