diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java
index eaf0eb237c..b857e6df44 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java
@@ -32,7 +32,7 @@ import com.google.gson.Gson;
 /**
  * Configuration for HTTP Message converters that use Gson
  *
- * @author awilkinson
+ * @author Andy Wilkinson
  * @since 1.2.2
  */
 @Configuration
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java
index 239cddb0b9..4a8902915b 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
index 45a4120608..897a7551c0 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -252,7 +252,7 @@ public class JacksonAutoConfigurationTests {
 	public void disableDeserializationFeature() throws Exception {
 		this.context.register(JacksonAutoConfiguration.class);
 		EnvironmentTestUtils.addEnvironment(this.context,
-				"spring.jackson.deserialization.fail_on_unknown_properties:false");
+				"spring.jackson.deserialization.fail-on-unknown-properties:false");
 		this.context.refresh();
 		ObjectMapper mapper = this.context.getBean(ObjectMapper.class);
 		assertTrue(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES.enabledByDefault());
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java
index 30f70fc429..17b5a9a226 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/JndiPropertiesHidingClassLoader.java
@@ -38,9 +38,7 @@ public class JndiPropertiesHidingClassLoader extends ClassLoader {
 		if ("jndi.properties".equals(name)) {
 			return Collections.enumeration(Collections.<URL> emptyList());
 		}
-		else {
-			return super.getResources(name);
-		}
+		return super.getResources(name);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java
index c16844a229..50f018abdc 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java
@@ -91,5 +91,7 @@ public class TestableInitialContextFactory implements InitialContextFactory {
 		public void clearAll() {
 			this.bindings.clear();
 		}
+
 	}
-}
\ No newline at end of file
+
+}
diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
index 840dda6e90..6c46cacc54 100644
--- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@@ -274,7 +274,6 @@ a specific command line switch (e.g. `java -jar app.jar --name="Spring"`).
 
 [[boot-features-external-config-random-values]]
 === Configuring random values
-
 The `RandomValuePropertySource` is useful for injecting random values (e.g. into secrets
 or test cases). It can produce integers, longs or strings, e.g.
 
diff --git a/spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java b/spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java
index 8410897f8f..1a640c586b 100644
--- a/spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java
+++ b/spring-boot-integration-tests/src/test/resources/boot-run-resources/src/main/java/BootRunResourcesApplication.java
@@ -15,9 +15,9 @@
  */
 
 public class BootRunResourcesApplication {
-	
+
 	public static void main(String[] args) {
-		ClassLoader classLoader = BootRunResourcesApplication.class.getClassLoader(); 
+		ClassLoader classLoader = BootRunResourcesApplication.class.getClassLoader();
 		System.out.println(classLoader.getResource("test.txt"));
 	}
 
diff --git a/spring-boot-samples/spring-boot-sample-data-redis/src/test/java/sample/data/redis/SampleRedisApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-redis/src/test/java/sample/data/redis/SampleRedisApplicationTests.java
index ab246ea316..64a7739903 100644
--- a/spring-boot-samples/spring-boot-sample-data-redis/src/test/java/sample/data/redis/SampleRedisApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-data-redis/src/test/java/sample/data/redis/SampleRedisApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,4 +55,5 @@ public class SampleRedisApplicationTests {
 		}
 		return (ex.getCause() == null || redisServerRunning(ex.getCause()));
 	}
+
 }
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/BootRunTask.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/BootRunTask.java
index 76950525a3..c8b242f7a8 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/BootRunTask.java
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/run/BootRunTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.