ba29788482
Polish "Replace explicit generic type with diamond operator"
...
Closes gh-15424
2018-12-09 11:43:28 +01:00
a2ebba8db1
Replace explicit generic type with diamond operator
...
See gh-15424
2018-12-09 11:42:27 +01:00
f040459ae5
Merge branch '2.1.x'
2018-12-07 14:32:07 -08:00
a11dea46d7
Use the right class in @ConditionalOnClass
...
See gh-15372
2018-12-07 14:15:59 -08:00
e0b55d36de
Merge branch '2.1.x'
2018-12-07 13:51:11 -08:00
f13697b278
Make Resource Server auto-config conditional on JwtDecoder class
...
Fixes gh-15372
2018-12-07 13:48:32 -08:00
d3e5c5688f
Polish
2018-12-07 19:58:13 +00:00
e367b54928
Merge branch '2.1.x'
2018-12-07 11:57:19 -08:00
31a5e85ab6
Perform placeholder resolution in test env post processor
...
Fixes gh-15354
2018-12-07 11:45:04 -08:00
bbf0932f0f
Exclude jcl-over-slf4j in favour of spring-jcl
...
Closes gh-15392
2018-12-07 15:37:24 +00:00
2cd3cff608
Merge branch '2.1.x'
2018-12-07 15:25:35 +00:00
4c6c07ddbb
Start building against Spring AMQP 2.1.3 snapshots
...
See gh-15407
2018-12-07 15:22:35 +00:00
f04f74870a
Start building against Spring Data Lovelace SR4 snapshots
...
See gh-15410
2018-12-07 15:22:06 +00:00
96f1a394b8
Start building against Spring Integration 5.1.2 snapshots
...
See gh-15413
2018-12-07 15:21:28 +00:00
e27d3d0d5e
Start building against Spring Kafka 2.2.3
...
See gh-15414
2018-12-07 15:20:40 +00:00
b01d5f62a4
Start building against Spring Security 5.1.3 snapshots
...
See gh-15417
2018-12-07 15:20:05 +00:00
a5f5ead520
Start building against Spring AMQP 2.0.11 snapshots
...
See gh-15406
2018-12-07 15:15:01 +00:00
5e640877c9
Start building against Spring Data Kay SR13 snapshots
...
See gh-15409
2018-12-07 15:14:15 +00:00
12a844d7da
Start building against Spring Integration 5.0.11 snapshots
...
See gh-15412
2018-12-07 15:13:36 +00:00
5336c8ccde
Start building against Spring Security 5.0.11 snapshots
...
See gh-15416
2018-12-07 15:13:01 +00:00
d5f90ffcfb
Polish "Replace this lambda with a method reference"
...
Closes gh-15401
2018-12-07 11:10:10 +01:00
5c1813aef8
Replace this lambda with a method reference
...
See gh-15401
2018-12-07 11:01:42 +01:00
71173f2db5
Merge branch '2.1.x'
2018-12-07 09:57:20 +01:00
c84d199cb7
Upgrade to Flyway 5.2.4
...
Closes gh-15402
2018-12-07 09:56:18 +01:00
95a14e7ba5
Remove duplicate dependency management for spring-core
...
Closes gh-15380
2018-12-06 12:07:25 +00:00
6f6e712a7b
Merge branch '2.1.x'
2018-12-06 09:08:12 +01:00
bd21113e9f
Fix indent of WebServiceTemplate section
...
Closes gh-15389
2018-12-06 09:06:02 +01:00
5a18df2d69
Fix tests
2018-12-05 18:33:50 -08:00
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
2018-12-05 17:49:09 -08:00
4c96c76f11
Include Junit5 dependencies in Spring Boot Starter Test
...
See gh-14736
2018-12-05 17:48:52 -08:00
12e1d9a6a4
Add Junit5 OutputCapture Extension
...
See gh-14738
2018-12-05 17:48:27 -08:00
fb1c7c82b4
Merge branch '2.1.x'
2018-12-05 15:56:18 +01:00
ef40241bf6
Merge branch '2.0.x' into 2.1.x
2018-12-05 15:56:04 +01:00
d864b427eb
Remove unused ByteArrayStartsWith matcher
...
Closes gh-15386
2018-12-05 15:52:42 +01:00
ed3347f00d
Configure Asciidoctor toolchain for ref docs
...
This commit replaces the Docbook+Asciidoctor documentation toolchain by
a single Asciidoctor generation process.
First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.
Closes gh-12611
2018-12-05 14:20:07 +01:00
a7d22aaf4b
Reorganize asciidoc content
...
This commit adds an index page for the multi-file HTML version, and
fixed a couple of casing issues (significant words starting with lower
case in headings).
While researching how to get the content from index-docinfo.xml into
the output, I came across the notion of a colophon, which is a good name
for the information in that file. I have consequently changed "Legal"
(which I never liked but couldn't think of a better term for at the
time) to "Colophon".
See gh-12611
2018-12-05 10:32:37 +01:00
a60c575836
Cleanup asciidoctor build
...
Remove Guardfile for now; we might reintroduce it later, but it is
currently out of sync with the documentation changes.
Do not ignore html files in the asciidoc directory as those are needed
for docinfo parts.
See gh-12611
2018-12-05 10:32:36 +01:00
11f6a5ab70
Remove docbook toolchain
...
See gh-12611
2018-12-05 10:32:36 +01:00
096640de84
Merge branch '2.1.x'
2018-12-05 08:57:14 +01:00
185a49fb3b
Add reference to JaVers starter
2018-12-05 08:56:50 +01:00
95b94c0158
Merge branch '2.1.x'
2018-12-04 10:53:41 +01:00
c56c0ff433
Rename OAuth2ResourceServerJwkConfiguration
...
Closes gh-15375
2018-12-04 10:53:01 +01:00
5c986b5030
Merge branch '2.1.x'
2018-12-03 16:29:36 +00:00
42b58f6d27
Add JAXB API dependency that is no longer transitive via testcontainers
...
See gh-15371
2018-12-03 16:29:10 +00:00
8b21044902
Merge branch '2.1.x'
2018-12-03 15:07:54 +00:00
917108cce7
Merge branch '2.0.x' into 2.1.x
2018-12-03 15:07:30 +00:00
425a3aacf5
Add JAXB API dependency that is no longer transitive via testcontainers
...
See gh-15371
2018-12-03 15:06:32 +00:00
a85e27c7cd
Further replace magic number by HttpStatus
...
See gh-15130
2018-12-03 15:48:13 +01:00
f2ca2533d5
Polish "Replace magic number by HttpStatus"
...
Closes gh-15130
2018-12-03 15:33:57 +01:00
ffdc9f0ff3
Replace magic number by HttpStatus
...
See gh-15130
2018-12-03 15:33:35 +01:00
9483c91d58
Make sure to include validation query in case of failure
...
See gh-15055
2018-12-03 15:27:52 +01:00
9e84abc46b
Polish "Add validation query to DataSourceHealthIndicator details"
...
Closes gh-15055
2018-12-03 15:10:59 +01:00
fc85c34dd8
Add validation query to DataSourceHealthIndicator details
...
See gh-15055
2018-12-03 14:33:52 +01:00
bbad720e23
Polish contribution
...
Closes gh-15086
2018-12-03 14:23:16 +01:00
9e571a2827
Fail fast if nested condition uses a phase inappropriate for its members
...
See gh-15086
2018-12-03 14:14:29 +01:00
0f474ec08f
Merge branch '2.1.x'
2018-12-03 13:01:56 +00:00
07065532fe
Replace accidental use of code shaded by Testcontainers
...
See gh-15371
2018-12-03 13:01:27 +00:00
910a0e57b8
Drop dependency management for DropWizard Metrics modules removed in v4
...
Closes gh-15370
2018-12-03 12:49:15 +00:00
b05abe8ca0
Merge branch '2.1.x'
2018-12-03 12:16:18 +00:00
72ad0cc6be
Merge branch '2.0.x' into 2.1.x
2018-12-03 12:15:36 +00:00
3fd0380359
Correct optional dependency declarations in spring-boot-test-support
...
Closes gh-15371
2018-12-03 12:14:18 +00:00
0df13baa0f
Polish "Add configurable property for JWK encryption algorithm"
...
Closes gh-15145
2018-12-03 11:49:18 +01:00
460fdaf52f
Add configurable property for JWK encryption algorithm
...
See gh-15145
2018-12-03 11:35:10 +01:00
ec678eaa3b
Polish "Configure MessageSource if no "messageSource" bean defined"
...
Closes gh-15212
2018-12-03 11:28:26 +01:00
82d99da32a
Configure MessageSource if no "messageSource" bean defined
...
Enable MessageSourceAutoConfiguration OnMissingBeanCondition by name
rather than class since AbstractApplicationContext expects MessageSource
to be defined only with "messageSource" name.
See gh-15212
2018-12-03 11:28:07 +01:00
1b40b0edf1
Polish contribution
...
Closes gh-15054
2018-12-03 11:16:54 +01:00
3059f0e2e2
Add configuration property for configuring Tomcat's processor cache
...
See gh-15054
2018-12-03 11:13:19 +01:00
b528eb8a7e
Remove unnecessary cast in LoggingSystemProperties
...
Closes gh-15297
2018-12-03 11:01:30 +01:00
f57f16c190
Avoid premature declaration of variables
...
Closes gh-15215
2018-12-03 10:59:20 +01:00
a1a8a8cef0
Avoid instantiation of BeanPropertyBinder in Binder
...
Closes gh-15181
2018-12-03 10:54:36 +01:00
e2d5dfad3a
Use varargs for DefaultApplicationArguments
...
Closes gh-15142
2018-12-03 10:48:10 +01:00
7939b8b4da
Polish "Rename logging.file to logging.file.name"
...
Closes gh-15089
2018-12-03 10:42:30 +01:00
21da4a5d12
Rename logging.file to logging.file.name
...
See gh-15089
2018-12-03 10:42:30 +01:00
d9586d94f6
Change DataSourceHealthIndicator details from "hello" to "result"
...
Closes gh-15136
2018-12-03 09:34:17 +01:00
9c426c63bf
Polish
2018-11-29 22:57:04 -08:00
ed9468a31a
Update copyright year for changed files
2018-11-29 22:02:45 -08:00
81896e0222
Upgrade to Micrometer 1.1.1
...
Closes gh-15328
2018-11-29 21:29:25 -08:00
73d87ac112
Upgrade to Micrometer 1.0.8
...
Closes gh-15327
2018-11-29 15:33:19 -08:00
ba1ef52e39
Merge branch '2.0.x'
2018-11-29 15:32:48 -08:00
893d5666be
Update copyright year for changed files
2018-11-29 15:30:51 -08:00
74376aa023
Polish
2018-11-29 15:30:28 -08:00
ac322a8e30
Polish
2018-11-29 14:45:20 +00:00
789f18259f
Upgrade to Infinispan 9.4.3.Final
...
Closes gh-15338
2018-11-29 10:16:14 +00:00
d6adda1ec9
Upgrade to Flyway 5.2.3
...
Closes gh-15337
2018-11-29 10:16:14 +00:00
ebd6f4d0e5
Upgrade to Jetty Reactive Httpclient 1.0.2
...
Closes gh-15336
2018-11-29 10:16:13 +00:00
a02c0c9881
Upgrade to Byte Buddy 1.9.5
...
Closes gh-15335
2018-11-29 10:16:12 +00:00
1ea3444e76
Upgrade to Undertow 2.0.16.Final
...
Closes gh-15334
2018-11-29 10:16:11 +00:00
9f4d55766b
Upgrade to Rxjava2 2.2.4
...
Closes gh-15333
2018-11-29 10:16:10 +00:00
4feda19072
Upgrade to Netty Tcnative 2.0.20.Final
...
Closes gh-15332
2018-11-29 10:16:09 +00:00
f29f73c295
Upgrade to Lettuce 5.1.3.RELEASE
...
Closes gh-15331
2018-11-29 10:16:08 +00:00
d0fcbd106b
Merge branch '2.0.x'
2018-11-29 10:14:46 +00:00
28cd017347
Upgrade to Thymeleaf Extras Java8time 3.0.2.RELEASE
...
Closes gh-15330
2018-11-29 10:11:19 +00:00
b709f7afaa
Upgrade to Netty 4.1.31.Final
...
Closes gh-15329
2018-11-29 10:11:18 +00:00
9a25c2ce7e
Start building against Micrometer 1.1.1 snapshots
...
See gh-15328
2018-11-29 09:58:23 +00:00
ca11e83857
Start building against Micrometer 1.0.8 snapshots
...
See gh-15327
2018-11-29 09:48:38 +00:00
321da6c578
Upgrade to Spring Session Apple SR-7
...
Closes gh-15254
2018-11-29 08:38:57 +00:00
cdecd053c3
Upgrade to Spring Session Bean-SR1
...
Closes gh-15275
2018-11-29 08:37:46 +00:00
79102454b2
Upgrade to Spring Integration 5.1.1.RELEASE
...
Closes gh-15272
2018-11-29 08:37:06 +00:00
452028e347
Upgrade to Spring Integration 5.0.10.RELEASE
...
Closes gh-15251
2018-11-29 08:35:18 +00:00
427d494d57
Merge branch '2.0.x'
2018-11-28 21:32:05 -08:00
02a1c43587
Fix tests
2018-11-28 21:26:47 -08:00
fc6c07ad3c
Merge branch '2.0.x'
2018-11-28 17:41:11 -08:00
decaacddce
Account for application path for Jersey servlet endpoints
...
Closes gh-14895
2018-11-28 17:25:32 -08:00
8560010bd4
Upgrade to Spring Kafka 2.1.11.RELEASE
...
Closes gh-15315
2018-11-28 19:46:34 +00:00
5fab0aee43
Upgrade to Spring AMQP 2.0.10.RELEASE
...
Closes gh-15256
2018-11-28 19:45:52 +00:00
edbca5f4c0
Upgrade to Spring Security 5.0.10.RELEASE
...
Closes gh-15253
2018-11-28 19:45:19 +00:00
33e67f5847
Upgrade to Spring Kafka 2.2.2.RELEASE
...
Closes gh-15273
2018-11-28 19:42:08 +00:00
524a68209a
Upgrade to Spring AMQP 2.1.2.RELEASE
...
Closes gh-15271
2018-11-28 19:42:08 +00:00
3178e3f34b
Upgrade to Spring Security 5.1.2.RELEASE
...
Closes gh-15274
2018-11-28 19:42:08 +00:00
d12e42e8d5
Polish
...
Closes gh-15211
2018-11-28 19:48:35 +01:00
0a4ba499df
Add Actuator health checks for Elasticsearch REST clients
...
This commit adds `ElasticsearchRestHealthIndicator`, a new
`HealthIndicator` for Elasticsearch, using the Elasticsearch "low level
rest client" provided by the
`"org.elasticsearch.client:elasticsearch-rest-client"` dependency.
Note that Spring Boot will auto-configure both low and high level REST
clients, but since the high level one is using the former, a single
health indicator will cover both cases.
See gh-15211
2018-11-28 19:48:35 +01:00
6a766cf919
Start building against Spring Kafka 2.2.2 snapshots
...
See gh-15273
2018-11-28 17:40:33 +00:00
114347107e
Polish key description
2018-11-28 11:31:48 +01:00
33000b6e8e
Polish contribution
...
Closes gh-14985
2018-11-28 11:29:37 +01:00
108f28417e
Allow to disable SSL client authentication on the management port
...
When server and management are at different ports, and when server
requires TLS client authentication, then there is no simple method to
disable TLS client authentication for management port.
This commit adds an additional "none" option to ssl.client-auth.
Example:
server.port=8080
server.ssl.enabled=true
server.ssl.client-auth=need
management.server.port=8081
management.server.ssl.enabled=true
management.server.ssl.client-auth=none
See gh-14985
2018-11-28 11:29:21 +01:00
476fe6ed17
Stop configuring metrics if hibernate is not available
...
Closes gh-15317
2018-11-28 10:54:56 +01:00
5f145ac482
Merge branch '2.0.x'
2018-11-28 10:23:44 +01:00
b103e0c869
Polish "Unwrap DataSource target rather than plain instanceof calls"
...
Closes gh-15227
2018-11-28 10:18:28 +01:00
98378e210d
Start building against Spring Kafka 2.1.11 snapshots
...
See gh-15315
2018-11-28 09:09:28 +01:00
17f04b8b75
Replace DirectFieldAccessor usages by hasFieldOrPropertyWithValue
...
Closes gh-15312
2018-11-28 08:47:41 +01:00
2dc8f49f8a
Polish
2018-11-27 20:54:41 +00:00
dad6d4beca
Merge branch '2.0.x'
2018-11-27 20:37:35 +00:00
2b22b23aad
Polish
2018-11-27 20:35:30 +00:00
cf7664c01a
Cope with version not found in Embedded Mongo's Version enum
...
Closes gh-15311
2018-11-27 16:33:22 +00:00
dee8085f20
Merge branch '2.0.x'
2018-11-27 16:09:02 +00:00
83cf348ec8
Warn about Quartz dropping tables on restart
...
Closes gh-15295
2018-11-27 16:05:11 +00:00
760003b9d7
Polish "Document that test slices should not be combined"
...
Closes gh-15310
2018-11-27 15:50:19 +00:00
29cd1cc762
Document that test slices should not be combined
...
See gh-15310
2018-11-27 15:50:19 +00:00
b094e28081
Remove auto-configuration of RequestContextFilter when using Jersey
...
Closes gh-15048
2018-11-27 15:39:46 +00:00
643b0f84da
Merge branch '2.0.x'
2018-11-27 15:32:14 +00:00
ab39e50ece
List Gradle's Shadow Plugin as an alternative to Boot's loader
...
Closes gh-1828
2018-11-27 15:31:26 +00:00
e1ad5641d5
Polish "Trim whitespace when coercing to a LogLevel"
...
Closes gh-15143
2018-11-27 15:14:26 +00:00
dfe94a0abb
Trim whitespace when coercing to a LogLevel
...
See gh-15143
2018-11-27 15:10:36 +00:00
d6571c0157
Upgrade to Reactor Californium-SR3
...
Closes gh-15192
2018-11-27 15:21:36 +01:00
bf88a7e466
Be more lenient when repackage is invoked several times
...
This commit makes the repackager more lenient when it is invoked several
times in the same lifecycle.
Closes gh-15034
2018-11-27 15:09:55 +01:00
d7fe3c73a3
Provide better logging for RepackageMojo
...
Closes gh-15294
2018-11-27 15:06:51 +01:00
9331390079
Upgrade to Spring Data Lovelace-SR3
...
Closes gh-15191
2018-11-27 14:01:15 +00:00
fb3deab89d
Merge branch '2.0.x'
2018-11-27 13:55:33 +00:00
e81abc3f11
Order jacksonCodecCustomizer so user-provided customizer can go after it
...
Closes gh-15167
2018-11-27 13:51:33 +00:00
971adfcd5b
Merge branch '2.0.x'
2018-11-27 13:27:05 +00:00
e6dd11254c
Polish
2018-11-27 13:26:49 +00:00
51a5b841dd
Merge branch '2.0.x'
2018-11-27 12:51:16 +00:00
4a385e89bd
Mention fully executable jars in Jersey’s scanning limitations
...
Closes gh-3413
2018-11-27 12:51:05 +00:00
669eeef29b
Merge branch '2.0.x'
2018-11-27 12:36:22 +00:00
1f994b70b5
Correct description of file generated by heapdump endpoint
...
Closes gh-15016
2018-11-27 12:35:35 +00:00
1d029a09e2
Start building against Spring Data Lovelace-$R3 snapshots
...
See gh-15191
2018-11-27 12:17:37 +00:00
f9a3b79e97
Merge branch '2.0.x'
2018-11-27 12:12:07 +00:00
ae5d5235f6
Upgrade to Spring Data Kay-SR12
...
Closes gh-14893
2018-11-27 12:11:14 +00:00
376e7fdfa1
Document profile activation limitation of .spring-boot-devtools.properties
...
Closes gh-15151
2018-11-27 12:09:56 +00:00
6729e56f6b
Merge branch '2.0.x'
2018-11-27 12:00:36 +00:00
e74b084c67
Auto-configure codec customizations and JSON when using @WebFluxTest
...
Closes gh-15070
2018-11-27 11:48:30 +00:00
f6a22a05b8
Merge branch '2.0.x'
2018-11-27 11:21:22 +00:00
9553d4f64b
Polish "Auto-configure Spring Session's cookie serializer"
...
Closes gh-15163
2018-11-27 11:08:15 +00:00
0daf83efab
Auto-configure Spring Session's cookie serializer
...
See gh-15163
2018-11-27 11:08:05 +00:00
dfab0b4231
Upgrade to Spring Framework 5.1.3
...
Closes gh-15186
2018-11-27 11:40:06 +01:00
e89d1a8ebe
Upgrade to Spring Framework 5.0.11
...
Closes gh-15189
2018-11-27 11:06:57 +01:00
8928cd1982
Deprecate spring.rabbitmq.template.queue
...
Closes gh-15301
2018-11-27 09:55:45 +01:00
a240e22593
Adapt to Rabbit internal change
...
See gh-15271
2018-11-27 08:31:46 +01:00
cf525dabd2
Merge branch '2.0.x'
2018-11-26 17:53:53 +00:00
69edf8960f
Correct stale reference to embeddedLaunchScriptProperties with Gradle
...
Closes gh-15094
2018-11-26 17:53:27 +00:00
de8c353cec
Merge branch '2.0.x'
2018-11-26 17:40:46 +00:00
898d9f80f3
Merge branch '1.5.x' into 2.0.x
2018-11-26 17:40:35 +00:00
fa7be63fbb
Merge branch '2.0.x'
2018-11-26 16:53:00 +00:00
7ddbb37bd5
Polish
2018-11-26 16:52:49 +00:00
073ac7bc99
Fix Thymeleaf security dialect tests on Windows
2018-11-26 16:15:15 +00:00
a0d0ecf9d4
Test the Gradle plugin against Gradle 5.0
...
Closes gh-15171
2018-11-26 16:02:54 +00:00
5a9ff6a3cb
Merge branch '2.0.x'
2018-11-26 15:51:52 +00:00
5201584c60
Upgrade to Neo4j Ogm 3.1.5
...
Closes gh-15293
2018-11-26 15:51:01 +00:00
55721f06df
Upgrade to Kotlin 1.2.71
...
Closes gh-15292
2018-11-26 15:50:59 +00:00
c73fdc4ce4
Merge branch '2.0.x'
2018-11-26 12:09:21 +00:00
d2756319cb
Polish
2018-11-26 12:09:14 +00:00
1c4a26557c
Polish
2018-11-26 11:47:35 +00:00
c1bbcb6908
Merge branch '2.0.x'
2018-11-26 11:41:55 +00:00
4bc32e6358
Use a HandlerInterceptor for timing long tasks
...
Closes gh-15204
2018-11-26 11:30:06 +00:00
f43a83fa4f
Upgrade to Junit Jupiter 5.3.2
...
Closes gh-15286
2018-11-26 10:41:08 +01:00
ae1979f1ff
Merge branch '2.0.x'
2018-11-26 10:35:37 +01:00
5f0ac46d78
Unwrap DataSource target rather than plain instanceof calls
...
Closes gh-15227
2018-11-26 10:35:10 +01:00
e424dfbe15
Polish "Perform best effort to retrieve DataSourceProxy"
...
Closes gh-15206
2018-11-26 10:18:48 +01:00
26f9a92837
Perform best effort to retrieve DataSourceProxy
...
Prior to this commit, `DataSourceJmxConfiguration` with tomcat
`DataSource`, it can only find `DataSourceProxy` if the given
`DataSource` is a direct child of it. Since it uses `instanceof`, it
could not find `DataSourceProxy` if the `DataSource` is
wrapped(delegated) or proxied.
This is because `DataSourceProxy#unwrap()` always returns null; thus
cannot use this method to directly obtain `DataSourceProxy`.
In this commit, updated the check logic to perform the best effort to
retrieve `DataSourceProxy`. If given `DataSource` is wrapped or proxied
by spring, tries to unwrap or get target datasource recursively to find
`DataSourceProxy`.
See gh-15206
2018-11-26 10:18:48 +01:00
ee2107c91b
Merge branch '2.0.x'
2018-11-23 20:15:42 +00:00
44632ea55c
Merge branch '1.5.x' into 2.0.x
2018-11-23 20:15:26 +00:00
548cc05bb6
Polish
2018-11-23 19:33:33 +00:00
5a246ce24d
Merge branch '2.0.x'
2018-11-23 17:00:24 +00:00
8772f90e2f
Polish
2018-11-23 17:00:16 +00:00
35cce76ae8
Merge branch '2.0.x'
2018-11-23 16:59:27 +00:00
3331fa2d02
Merge branch '1.5.x' into 2.0.x
2018-11-23 16:59:18 +00:00
1797040e1a
Merge branch '2.0.x'
2018-11-23 16:42:13 +00:00
a54de61e61
Polish
...
Revert change inadvertently committed as part of gh-15017
2018-11-23 16:41:25 +00:00
4f405ed97d
Merge branch '2.0.x'
2018-11-23 15:45:13 +00:00
058428a14c
Clarify how multiple attributes are treated by ConditionalOn(Missing)Bean
...
Closes gh-15177
2018-11-23 15:44:58 +00:00
f25c32e8b9
Merge branch '2.0.x'
2018-11-23 15:26:08 +00:00
d104205880
Update docs to reflect that @AutoConfigureRestDocs supports WebTestClient
...
Closes gh-15220
2018-11-23 15:26:01 +00:00
deeb961c6e
Merge branch '2.0.x'
2018-11-23 15:23:14 +00:00
1f39b5dd7a
Align MeterRegistryConfigurer's javadoc with its implementation
...
Closes gh-15017
2018-11-23 15:22:09 +00:00
56519e5cbb
Merge branch '2.0.x'
2018-11-23 15:12:13 +00:00
8ee57ac574
Remove redundant suggestion to add a dependency on Woodstox
...
It's now a transitive dependency of jackson-dataformat-xml so there is no
need to depend on it explicitly.
Closes gh-15092
2018-11-23 15:11:03 +00:00
7790876575
Merge branch '2.0.x'
2018-11-23 14:01:12 +00:00
c0e286b96b
Test the Gradle Plugin against Gradle 5.0-rc-3
...
Closes gh-15171
2018-11-23 13:47:19 +00:00
ce0a3d0311
Add missing classpath setters to BootJar and BootWar
...
Closes gh-15087
2018-11-23 13:46:56 +00:00
3bda78a3d3
Fix tests after HandlerExceptionResolver logging changes
...
See gh-14936 and gh-15189
2018-11-22 20:27:19 +00:00
Stephane Nicoll
igor-suhorukov
Madhura Bhave
Andy Wilkinson
dreis2211
Brian Clozel
Jay Bryant
holy12345
Erlend Haugsnes
Razib Shahriar
artsiom
cac03
TwinProduction
Andre Restolho
Phillip Webb
Alon Bar-Lev
Johannes Zick
Dileep Bapat
Vedran Pavic
Tadaya Tsuyukubo