diff --git a/ci/scripts/stage.sh b/ci/scripts/stage.sh index 9212314e28..61318c959e 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 a2e6045349..f1921f2388 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() {