Commit Graph

23209 Commits (b9bb84236b39d25957694ecbed44116e9878bf39)
 

Author SHA1 Message Date
Andy Wilkinson b9bb84236b Restore compatibility with Flyway 5.2
Previously, the upgrade to Flyway 6 broke compatibility with Flyway
5.2 due to the use of method references that refer to two methods
that do not exist in Flyway 5.2.

This commit replaces the method references with lambdas that are only
called if the user sets the related property. Unless a new-in-Flyway-6
property is set, the auto-configuration will work as before. When such
a property is set the auto-configuration will fail with a
NoSuchMethodError. This approach was chosen to make the
incompatibility clear.

We have also introduced support for passing any JavaMigration beans
in the context into Flyway. This too relies on API that is new in
Flyway 6. It is possible (although unlikely) that users had
JavaMigration beans in Spring Boot 2.1 that were being ignored. This
commit restores this behaviour when using Flyway 5.2.

Closes gh-18193
5 years ago
Stephane Nicoll b5589f8abe Merge branch '2.1.x'
Closes gh-18222
5 years ago
Stephane Nicoll 8aa7e24981 Merge pull request #18216 from ptrsauer
* pr/18216:
  Fix minor typo

Closes gh-18216
5 years ago
Peter Sauer dba18ce778 Fix minor typo
The phrase `We have you covered.` is a sentence and so it should start
with a capital `W`.

See gh-18216
5 years ago
Phillip Webb 8e398e164c Fix checkstyle violations 5 years ago
Phillip Webb eea5d15412 Merge branch '2.1.x'
Closes gh-18219
5 years ago
Phillip Webb 23174eb484 Remember annotations when using withExistingValue
Update `Bindable` builder methods so that existing annotations are
retained.

Closes gh-18218
5 years ago
Stephane Nicoll c2023a8c90 Merge pull request #18206 from izeye
* pr/18206:
  Polish "Use Duration for ServerProperties.Jetty.idleTimeout"
  Use Duration for ServerProperties.Jetty.idleTimeout

Closes gh-18206
5 years ago
Stephane Nicoll 70f7e47002 Polish "Use Duration for ServerProperties.Jetty.idleTimeout"
See gh-18206
5 years ago
Johnny Lim 96019362f7 Use Duration for ServerProperties.Jetty.idleTimeout
See gh-18206
5 years ago
Stephane Nicoll d86c72bf73 Merge pull request #18192 from izeye
* pr/18192:
  Polish

Closes gh-18192
5 years ago
Johnny Lim 5b41c3b608 Polish
See gh-18192
5 years ago
Stephane Nicoll 99960b0c26 Upgrade Java 13 version in CI image
Closes gh-18209
5 years ago
Brian Clozel 219bafaba1 Apply RSocket server customizers to netty web server
This commit applies `ServerRSocketFactoryCustomizer` beans to RSocket
setups when the RSocket server is being plugged into an existing Reactor
Netty web server.

Fixes gh-18208
5 years ago
Stephane Nicoll 1f280e394b Merge pull request #18196 from vpavic
* pr/18196:
  Update Quartz smoke test to use JDBC job store

Closes gh-18196
5 years ago
Vedran Pavic 479b4be5f5 Update Quartz smoke test to use JDBC job store
See gh-18196
5 years ago
Andy Wilkinson f033016364 Allow @Component on mutable @ConfigurationProperties
Update configuration properties support to allow the `@Component`
annotation to be used on `@ConfigurationProperties` beans as long
as they are mutable.

This restores the behavior of Spring Boot 2.1 for mutable beans whilst
still allowing us to enforce the stricter rules for immutable value
object configuration properties.

Closes gh-18138
5 years ago
Stephane Nicoll 4c0cf8f878 Merge pull request #18187 from wonwoo
* pr/18187:
  Fix typo in javadoc

Closes gh-18187
5 years ago
wonwoo b321dacc1c Fix typo in javadoc
See gh-18187
5 years ago
Andy Wilkinson 0074a7c662 Merge branch '2.1.x' 5 years ago
Andy Wilkinson 4f21b51a2b Polish one sentence per line in the reference docs 5 years ago
Stephane Nicoll a56eb4b974 Fix typo 5 years ago
Stephane Nicoll 691cb9aff2 Merge pull request #18170 from dreis2211
* pr/18170:
  Polish "Remove management.health.status.order from docs"
  Fix link formatting in custom HealthIndicator section
  Remove management.health.status.order from docs

Closes gh-18170
5 years ago
Stephane Nicoll ae34ae78dc Polish "Remove management.health.status.order from docs"
See gh-18170
5 years ago
dreis2211 0975b5b220 Fix link formatting in custom HealthIndicator section
See gh-18170
5 years ago
dreis2211 7a49651e09 Remove management.health.status.order from docs
See gh-18170
5 years ago
Stephane Nicoll 14a676052f Polish
This commit moves `@ConfigurationProperties` to the `@Bean` factory
method as this is unusual to put it at class level if it's exposed
that way.

As HealthIndicatorProperties has a constructor, this makes sure that
the annotation processor enables JavaBean binding mode.
5 years ago
Stephane Nicoll 39fed4a9d9 Fix binding detection of ConfigurationProperties contributed by @Bean
This commit makes sure that a ConfigurationProperties type contributed
by a `@Bean` factory method uses properties binding regardless of the
presence of a matching constructor.

`@Bean` method makes sure the user is in control and will be responsible
of creating the instance. As a result, binding of properties will not
happen there and therefore can only happen with regular JavaBean
accessors.

Closes gh-18184
5 years ago
Andy Wilkinson 0c0e2dd54b Merge branch '2.1.x'
Closes gh-18186
5 years ago
Andy Wilkinson 674d3dd262 Polish health endpoint documentation for groups and nesting
Closes gh-14022
5 years ago
Andy Wilkinson 7b1e10ed00 Use one sentence per line in Actuator and Gradle plugin doc source
Closes gh-18185
5 years ago
Stephane Nicoll cd8fab8442 Merge pull request #18175 from gaohanghang
* pr/18175:
  Simplify code

Closes gh-18175
5 years ago
gaohanghang 74d2fe472a Simplify code
See gh-18175
5 years ago
Andy Wilkinson 41111ac96f Upgrade to Junit Jupiter 5.5.2
Closes gh-18182
5 years ago
Andy Wilkinson ba6bd12898 Upgrade to Glassfish El 3.0.3
Closes gh-18181
5 years ago
Andy Wilkinson 35c01e3f08 Upgrade to Micrometer 1.2.1
Closes gh-18180
5 years ago
Stephane Nicoll 83ec35d829 Merge pull request #18172 from dreis2211
* pr/18172:
  Fix broken links for master snapshot builds

Closes gh-18172
5 years ago
dreis2211 09e991ca1c Fix broken links for master snapshot builds
See gh-18172
5 years ago
Andy Wilkinson 2472836c48 Upgrade to Spring Session Bom Corn-M4
Closes gh-17903
5 years ago
Andy Wilkinson 9b6a425f91 Upgrade to Spring Batch 4.2.0.RC1
Closes gh-17899
5 years ago
Andy Wilkinson 9262a55892 Upgrade to Spring Kafka 2.3.0.RC1
Closes gh-17902
5 years ago
Andy Wilkinson 57d2c38dee Upgrade to Spring AMQP 2.2.0.RC1
Closes gh-17898
5 years ago
Andy Wilkinson c4e2784ac2 Upgrade to Spring Integration 5.2.0.RC1
Closes gh-17901
5 years ago
Andy Wilkinson 87c7307d28 Upgrade to Spring Security 5.2.0.RC1
Closes gh-17897
5 years ago
Andy Wilkinson 80b8f19961 Tune @ConditionalOnMissingBean for interface-based back off
Previously, a number of usages of @ConditionalOnMissingBean prevented
a bean that implements an auto-configured bean's "main" interface from
causing the auto-configuration of the bean to back off. This would
happen when @ConditionalOnMissingBean did not specify a type, the
@Bean method returned the bean's concrete type, and that concreate
type implements a "main" interface.

This commit updates such usages of @ConditionalOnMissingBean to
specify the "main" interface as the type of the bean that must be
missing. This will allow, for example, the auto-configured
MongoTemplate bean to back off when a MongoOperations bean is defined.
5 years ago
Andy Wilkinson ff1983c9ae Merge branch '2.1.x'
Closes gh-18168
5 years ago
Andy Wilkinson 795c2f225f Support getComment() on a nested JarFile
Previously, calling getComment() on a nested jar file would result
in the outer jar file's comment being returned.

This commit updates the loader's JarFile to read the file's comment
from the central directory end record and return it from getComment().

Fixes gh-18128
5 years ago
Andy Wilkinson fc1889ee72 Merge branch '2.1.x'
Closes gh-18167
5 years ago
Andy Wilkinson 5d346410fa Merge pull request #18164 from dreis2211
* gh-18164:
  Test the Gradle Plugin against Gradle 5.6.2

Closes gh-18164
5 years ago
dreis2211 ae30515e5e Test the Gradle Plugin against Gradle 5.6.2
See gh-18164
5 years ago