Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source 
Conflicts:
	spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
This commit is contained in:
Phillip Webb 2014-09-04 09:41:58 -07:00
commit 9cc893cd35
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,14 +115,15 @@ class ProjectLibraries implements Libraries {
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 @@ class ProjectLibraries implements Libraries {
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 @@ 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;

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

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