Commit Graph

6773 Commits

Author SHA1 Message Date
Stephane Nicoll 81ddebbc27 Merge branch '2.1.x'
Closes gh-18239
2019-09-16 15:12:38 +02:00
Stephane Nicoll 9434cb0e22 Keep a live reference of protocol resolvers rather than copying them
This commit makes sure that any subsequent call on addProtocolResolver
on the context will impact the ResourceLoader implementation that
DevTools sets on the context.

This makes sure that any custom ProtocolResolver that is set later in
the lifecycle is taken into account.

Closes gh-17214
2019-09-16 15:08:40 +02:00
Stephane Nicoll b3b6605713 Merge branch '2.1.x'
Closes gh-18236
2019-09-16 14:23:26 +02:00
Stephane Nicoll a642421661 Force creation of sources jar
Closes gh-18212
2019-09-16 14:22:26 +02:00
Andy Wilkinson 448f5b8650 Simplify error page config by dropping redundant support for Tomcat 7
Closes gh-17937
2019-09-16 11:48:02 +01:00
Andy Wilkinson 84b2438c4c Upgrade to Jersey 2.29.1
Closes gh-17430
2019-09-16 11:32:02 +01:00
Andy Wilkinson cc67213b1f Correct capitalization of GemFire in the reference docs
Closes gh-18001
2019-09-16 11:28:50 +01:00
Andy Wilkinson 6f20ba9550 Remove mention of Spring IO Platform from reference docs
Closes gh-17986
2019-09-16 11:22:36 +01:00
Phillip Webb ad32603635 Restore compatibility with MockRestServiceServer
Closes gh-17885
2019-09-16 10:17:41 +02:00
Stephane Nicoll 3d5530d15d Merge branch '2.1.x'
Closes gh-18234
2019-09-16 10:03:19 +02:00
leoli a0d2721e33 Use custom port for RSocket server over websocket
Prior to this change, the custom port configured for the RSocket
server would not be used if the server factory is using the
websocket transport and is provided with a custom
`ReactorResourceFactory`.

Fixes gh-18200
2019-09-16 09:53:10 +02:00
Stephane Nicoll 9065c4997d Fix rebase from master 2019-09-16 09:52:55 +02:00
Stephane Nicoll e05f42f0f3 Polish Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter"
See gh-18214
2019-09-16 09:44:01 +02:00
Leonard Brünings b9c8d7dd60 Add Testable to CLASS_ANNOTATIONS in TestTypeExcludeFilter
See gh-18214
2019-09-16 09:42:55 +02:00
Stephane Nicoll a0d7d52106 Polish "Add ROLLING_FILE_NAME_PATTERN for File Appender"
See gh-18151
2019-09-16 09:28:15 +02:00
Eddú Meléndez 4a3810a0f1 Add ROLLING_FILE_NAME_PATTERN for File Appender
This new property allows to customize `fileNamePattern` if it is set.
Otherwise, a default pattern remains. Also, new property is supported
`logging.pattern.rolling-file-name`.

See gh-18151
2019-09-16 09:15:59 +02:00
Phillip Webb 06f46baa9d Build against Spring Framework 5.2.0 snapshots
See gh-18232
2019-09-13 16:22:13 -07:00
Andy Wilkinson 2e6f15b6f3 Fix intermittent failure of inMemoryDerbyIsShutdown 2019-09-13 20:50:24 +01:00
Andy Wilkinson 1b237de5f5 Use Awaitility in our own tests
Closes gh-18227
2019-09-13 20:50:14 +01:00
Andy Wilkinson 568caa1206 Add dependency management for Awaitility
Closes gh-18205
2019-09-13 18:02:50 +01:00
Andy Wilkinson 47eee7bec8 Merge branch '2.1.x'
Closes gh-18226
2019-09-13 18:00:25 +01:00
Andy Wilkinson b1ca1ae6e9 Add missing dependency management for Janino modules
Closes gh-18225
2019-09-13 17:59:59 +01:00
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
2019-09-13 10:26:59 +01:00
Stephane Nicoll b5589f8abe Merge branch '2.1.x'
Closes gh-18222
2019-09-13 09:06:50 +02:00
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
2019-09-13 09:05:54 +02:00
Phillip Webb 8e398e164c Fix checkstyle violations 2019-09-12 15:23:32 -07:00
Phillip Webb eea5d15412 Merge branch '2.1.x'
Closes gh-18219
2019-09-12 15:11:13 -07:00
Phillip Webb 23174eb484 Remember annotations when using withExistingValue
Update `Bindable` builder methods so that existing annotations are
retained.

Closes gh-18218
2019-09-12 15:09:47 -07:00
Stephane Nicoll 70f7e47002 Polish "Use Duration for ServerProperties.Jetty.idleTimeout"
See gh-18206
2019-09-12 15:13:31 +02:00
Johnny Lim 96019362f7 Use Duration for ServerProperties.Jetty.idleTimeout
See gh-18206
2019-09-12 14:59:54 +02:00
Johnny Lim 5b41c3b608 Polish
See gh-18192
2019-09-12 14:55:47 +02:00
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
2019-09-11 21:09:43 +02:00
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
2019-09-09 23:04:50 -07:00
wonwoo b321dacc1c Fix typo in javadoc
See gh-18187
2019-09-09 15:22:21 +02:00
Andy Wilkinson 0074a7c662 Merge branch '2.1.x' 2019-09-09 14:03:55 +01:00
Andy Wilkinson 4f21b51a2b Polish one sentence per line in the reference docs 2019-09-09 14:00:12 +01:00
Stephane Nicoll a56eb4b974 Fix typo 2019-09-09 14:23:24 +02:00
Stephane Nicoll ae34ae78dc Polish "Remove management.health.status.order from docs"
See gh-18170
2019-09-09 14:13:46 +02:00
dreis2211 0975b5b220 Fix link formatting in custom HealthIndicator section
See gh-18170
2019-09-09 14:13:23 +02:00
dreis2211 7a49651e09 Remove management.health.status.order from docs
See gh-18170
2019-09-09 14:13:04 +02:00
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.
2019-09-09 13:37:54 +02:00
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
2019-09-09 13:29:31 +02:00
Andy Wilkinson 0c0e2dd54b Merge branch '2.1.x'
Closes gh-18186
2019-09-09 11:16:30 +01:00
Andy Wilkinson 674d3dd262 Polish health endpoint documentation for groups and nesting
Closes gh-14022
2019-09-09 11:02:39 +01:00
Andy Wilkinson 7b1e10ed00 Use one sentence per line in Actuator and Gradle plugin doc source
Closes gh-18185
2019-09-09 10:59:49 +01:00
gaohanghang 74d2fe472a Simplify code
See gh-18175
2019-09-09 09:51:55 +02:00
Andy Wilkinson 41111ac96f Upgrade to Junit Jupiter 5.5.2
Closes gh-18182
2019-09-09 07:00:53 +01:00
Andy Wilkinson ba6bd12898 Upgrade to Glassfish El 3.0.3
Closes gh-18181
2019-09-09 07:00:52 +01:00
Andy Wilkinson 35c01e3f08 Upgrade to Micrometer 1.2.1
Closes gh-18180
2019-09-09 07:00:51 +01:00
dreis2211 09e991ca1c Fix broken links for master snapshot builds
See gh-18172
2019-09-08 08:36:28 +02:00