root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

This commit is contained in:
Stephane Nicoll 2019-04-17 11:57:32 +02:00
parent b710dc71fe caed8e86cc
commit a79e49f1dd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-name.apt.vm
View File

@ -6,7 +6,7 @@
2019-03-29
-----
If you need the repackage jar to have a different local name than the one defined by
If you need the repackaged jar to have a different local name than the one defined by
the <<<artifactId>>> attribute of the project, simply use the standard <<<finalName>>>
as shown in the following example:

7
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/NoUnboundElementsBindHandler.java
View File

@ -116,10 +116,9 @@ public class NoUnboundElementsBindHandler extends AbstractBindHandler {
}
private boolean isOverriddenCollectionElement(ConfigurationPropertyName candidate) {
int length = candidate.getNumberOfElements();
if (candidate.isNumericIndex(length - 1)) {
ConfigurationPropertyName propertyName = candidate
.chop(candidate.getNumberOfElements() - 1);
int lastIndex = candidate.getNumberOfElements() - 1;
if (candidate.isNumericIndex(lastIndex)) {
ConfigurationPropertyName propertyName = candidate.chop(lastIndex);
return this.boundNames.contains(propertyName);
}
return false;