diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/ProjectLibraries.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/ProjectLibraries.java index dc74f3ed30..90e673df63 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/ProjectLibraries.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/repackage/ProjectLibraries.java @@ -115,14 +115,15 @@ class ProjectLibraries implements Libraries { return libraries; } - private Set getLibrariesForFileDependencies(Configuration configuration, - LibraryScope scope) { + private Set getLibrariesForFileDependencies( + Configuration configuration, LibraryScope scope) { Set libraries = new LinkedHashSet(); 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 @@ class ProjectLibraries implements Libraries { return libraries; } - private Set minus(Set source, Set toRemove) { + private Set minus(Set source, + Set toRemove) { if (source == null || toRemove == null) { return source; } @@ -191,7 +193,7 @@ class ProjectLibraries implements Libraries { @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; diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java index dbd1ac4020..38053f9195 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java @@ -173,4 +173,5 @@ public class RelaxedPropertyResolverTests { assertThat(subProperties.get("a.c"), equalTo((Object) "2")); assertThat(subProperties.get("a.d"), equalTo((Object) "3")); } + }