diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java
index fb0345f03a..4a0f3121c7 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java
@@ -45,6 +45,7 @@ import org.springframework.security.config.annotation.authentication.configurers
  * Configuration for a Spring Security in-memory {@link AuthenticationManager}.
  * 
  * @author Dave Syer
+ * @author Rob Winch
  */
 @Configuration
 @ConditionalOnBean(ObjectPostProcessor.class)
@@ -107,8 +108,6 @@ public class AuthenticationManagerConfiguration extends
 	 * allowed in the configure stage. It is not allowed because we guarantee all init
 	 * methods are invoked before configure, which cannot be guaranteed at this point.</li>
 	 * </ul>
-	 * 
-	 * @author Rob Winch
 	 */
 	private class BootDefaultingAuthenticationConfigurerAdapter extends
 			GlobalAuthenticationConfigurerAdapter {
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java
index 3f5e22b8f7..1e75c595db 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java
@@ -113,8 +113,8 @@ public class AutoConfigurationReportLoggingInitializerTests {
 
 			ReflectionUtils.setField(this.logFactoryField, null, new MockLogFactory());
 		}
-		catch (Exception e) {
-			throw new IllegalStateException("Failed to set logFactory", e);
+		catch (Exception ex) {
+			throw new IllegalStateException("Failed to set logFactory", ex);
 		}
 
 		this.initializer = new AutoConfigurationReportLoggingInitializer();
diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml
index 95bc808612..cc14ef193e 100644
--- a/spring-boot-cli/pom.xml
+++ b/spring-boot-cli/pom.xml
@@ -130,7 +130,7 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>provided</scope>
-		</dependency>		
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>