Merge branch '1.1.x'

Conflicts:
	spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java

Author: philwebb

spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/ProjectLibraries.java

@@ -115,14 +115,15 @@ private Set<GradleLibrary> getLibraries(String configurationName, LibraryScope s
 		return libraries;
 	}
 
-	private Set<GradleLibrary> getLibrariesForFileDependencies(Configuration configuration,
-			LibraryScope scope) {
+	private Set<GradleLibrary> getLibrariesForFileDependencies(
+			Configuration configuration, LibraryScope scope) {
 		Set<GradleLibrary> libraries = new LinkedHashSet<GradleLibrary>();
 		for (Dependency dependency : configuration.getIncoming().getDependencies()) {
 			if (dependency instanceof FileCollectionDependency) {
 				FileCollectionDependency fileDependency = (FileCollectionDependency) dependency;
 				for (File file : fileDependency.resolve()) {
-					libraries.add(new GradleLibrary(fileDependency.getGroup(), file, scope));
+					libraries.add(new GradleLibrary(fileDependency.getGroup(), file,
+							scope));
 				}
 			}
 			else if (dependency instanceof ProjectDependency) {
@@ -134,7 +135,8 @@ else if (dependency instanceof ProjectDependency) {
 		return libraries;
 	}
 
-	private Set<GradleLibrary> minus(Set<GradleLibrary> source, Set<GradleLibrary> toRemove) {
+	private Set<GradleLibrary> minus(Set<GradleLibrary> source,
+			Set<GradleLibrary> toRemove) {
 		if (source == null || toRemove == null) {
 			return source;
 		}
@@ -191,7 +193,7 @@ public void setIncludeGroupName(boolean includeGroupName) {
 		@Override
 		public String getName() {
 			String name = super.getName();
-			if(this.includeGroupName && this.group != null) {
+			if (this.includeGroupName && this.group != null) {
 				name = this.group + "-" + name;
 			}
 			return name;

spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java

@@ -173,4 +173,5 @@ public void subProperties() throws Exception {
 		assertThat(subProperties.get("a.c"), equalTo((Object) "2"));
 		assertThat(subProperties.get("a.d"), equalTo((Object) "3"));
 	}
+
 }