mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '1.1.x'
Conflicts: spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
This commit is contained in:
commit
9cc893cd35
@ -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;
|
||||
|
@ -173,4 +173,5 @@ public class RelaxedPropertyResolverTests {
|
||||
assertThat(subProperties.get("a.c"), equalTo((Object) "2"));
|
||||
assertThat(subProperties.get("a.d"), equalTo((Object) "3"));
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user