From 2c487f7cb89b39cb62db8d5c8ca27b05fc02ab92 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 6 Oct 2020 18:50:03 -0700 Subject: [PATCH] Polish --- ci/scripts/stage.sh | 2 +- .../boot/autoconfigure/rsocket/RSocketProperties.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/scripts/stage.sh b/ci/scripts/stage.sh index 9212314e286..61318c959e3 100755 --- a/ci/scripts/stage.sh +++ b/ci/scripts/stage.sh @@ -43,7 +43,7 @@ if [[ $nextVersion != $snapshotVersion ]]; then sed -i "s/version=$snapshotVersion/version=$nextVersion/" gradle.properties git add gradle.properties > /dev/null git commit -m"Next development version (v$nextVersion)" > /dev/null -fi; +fi echo "DONE" diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketProperties.java index a2e6045349f..f1921f23885 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketProperties.java @@ -34,6 +34,7 @@ import org.springframework.util.unit.DataSize; @ConfigurationProperties("spring.rsocket") public class RSocketProperties { + @NestedConfigurationProperty private final Server server = new Server(); public Server getServer() {