Andy Wilkinson
080a2f5c3b
Align with Framework’s removal of charset attribute from application/json
...
Closes gh-16979
2019-05-28 10:58:23 +01:00
Andy Wilkinson
892e517c21
Work around Framework regression in handling of null model values
...
See https://github.com/spring-projects/spring-framework/issues/23038 .
2019-05-28 10:05:59 +01:00
Andy Wilkinson
d21a091262
Avoid duplicate retrieval of @ConfigurationProperties in registrar
...
Closes gh-15802
2019-05-28 09:00:29 +01:00
Brian Clozel
f2b4374c57
Merge pull request #16611 from qxo
...
* fix-whitelabel-with-charset:
Polish "Set UTF-8 charset for whitelabel HTML error pages"
Set UTF-8 charset for whitelabel HTML error pages
2019-05-27 19:08:12 +02:00
Brian Clozel
d46de7abc4
Polish "Set UTF-8 charset for whitelabel HTML error pages"
...
Closes gh-16611
2019-05-27 19:06:38 +02:00
qxo
64a8326989
Set UTF-8 charset for whitelabel HTML error pages
...
This commit changes the HTTP response Content-Type for whitelabel
error pages with Spring WebFlux.
See gh-16611
2019-05-27 17:48:01 +02:00
Stephane Nicoll
593bc22ecc
Merge branch '2.1.x'
2019-05-27 16:59:32 +02:00
Stephane Nicoll
2c364ceb89
Fix wrong ApplicationContext import
...
Closes gh-16978
2019-05-27 16:59:12 +02:00
Brian Clozel
0b70862627
Fix RSocket websocket config with WebFlux
...
In the case of a WebFlux + RSocket over websocket setup, the RSocket
auto-configuration would not set up the required routes; only the
websocket endpoint for RSocket would be available, overriding the
handler configured for WebFlux.
This commit introduces `NettyRouteProvider`. Components implementing
that interface can contribute HTTP routes to the Reactor Netty server
being built.
* if none is provided, the regular handler setup is used
* if one or more routes are provided, routes are sorted and added before
the WebFlux handler (acting as a default)
Fixes gh-16826
2019-05-27 15:19:32 +02:00
Brian Clozel
45507c475b
Configure String codecs in RSocket strategies
...
Closes gh-16924
2019-05-27 15:19:27 +02:00
Brian Clozel
b2e395db7a
Avoid codec auto-configuration when WebFlux is not present
...
This commit prevents the `CodecsAutoConfiguration` from being processed
if spring-webflux is not on classpath, since it is only useful for the
WebFlux server infrastructure or `WebClient`.
Closes gh-15690
2019-05-27 15:19:22 +02:00
Stephane Nicoll
15bdc12335
Merge pull request #16941 from dosdebug
...
* pr/16941:
Polish "Default to optimized launch of the JVM when using spring-boot:run"
Default to optimized launch of the JVM when using spring-boot:run
2019-05-25 12:27:52 +02:00
Stephane Nicoll
4cdb5a8ecb
Polish "Default to optimized launch of the JVM when using spring-boot:run"
...
Closes gh-16941
2019-05-25 12:22:00 +02:00
Dos Debug
569b850fe0
Default to optimized launch of the JVM when using spring-boot:run
...
See gh-16941
2019-05-25 12:21:37 +02:00
Stephane Nicoll
1c14079246
Merge pull request #16948 from izeye
...
* pr/16948:
Polish
2019-05-25 11:28:48 +02:00
Johnny Lim
d8e5169f5f
Polish
...
Closes gh-16948
2019-05-25 11:28:23 +02:00
Andy Wilkinson
54b123028c
Default to optimized launch of the JVM when using Gradle's bootRun
...
Closes gh-16222
2019-05-25 09:29:52 +01:00
Andy Wilkinson
7713a7f33a
Fix inclusion of Gradle DSL snippets in plugin reference docs
...
Closes gh-16968
2019-05-25 09:21:10 +01:00
Andy Wilkinson
f3ebd71b29
Merge branch '2.1.x'
...
Closes gh-16967
2019-05-25 08:11:10 +01:00
Andy Wilkinson
5a5b5a0d8b
Merge pull request #16938 from Robeatoz
...
* gh-16938:
Correct name and description of spring-boot-project module
Closes gh-16938
2019-05-25 08:10:56 +01:00
Robeatoz
9f248c6043
Correct name and description of spring-boot-project module
...
This commit corrects the Maven project name and description of spring-boot-project to
avoid the already used name "Spring Boot Build".
See gh-16938
2019-05-25 08:08:36 +01:00
Andy Wilkinson
ead0cd91bf
Start building against snapshots for Spring Session Corn-M2
...
See gh-16587
2019-05-25 08:04:32 +01:00
Andy Wilkinson
a9089db9e7
Start building against snapshots for Spring Data Moore-RC1
...
See gh-16966
2019-05-25 08:03:44 +01:00
Andy Wilkinson
36ccfd9d1b
Start building against snapshots for Spring Security 5.2.0.M3
...
See gh-16965
2019-05-25 08:02:50 +01:00
Andy Wilkinson
35568e4663
Start building against snapshots for Reactor Dysprosium-M2
...
See gh-16964
2019-05-25 07:59:16 +01:00
Andy Wilkinson
b07a0193ec
Start building against snapshots for Spring Framework 5.2.0.M3
...
See gh-16963
2019-05-25 07:57:45 +01:00
Andy Wilkinson
03d430d698
Merge branch '2.1.x'
2019-05-25 07:56:33 +01:00
Andy Wilkinson
d964357bfa
Start building against snapshots for Reactor Californium-SR9
...
See gh-16962
2019-05-25 07:49:15 +01:00
Andy Wilkinson
636113823c
Start building against Spring Framework 5.1.8 snapshots
...
See gh-16961
2019-05-25 07:48:19 +01:00
Andy Wilkinson
bf670d0a5a
Merge branch '2.1.x'
...
Closes gh-16960
2019-05-24 20:50:20 +01:00
Andy Wilkinson
60d60a8304
Use basedir as forked JVM's working directory in Maven plugin
...
Fixes gh-16811
2019-05-24 20:49:03 +01:00
Andy Wilkinson
babb94c791
Migrate spring-boot-gradle-plugin's tests to JUnit 5
...
Closes gh-16959
2019-05-24 20:17:34 +01:00
Andy Wilkinson
5e62faf720
Handle null CodeSource when determining Spring Boot version
...
Closes gh-16956
See gh-16182
2019-05-24 09:41:23 +01:00
Stephane Nicoll
a5537bd2e1
Fork application process with Maven by default
...
Closes gh-16945
2019-05-23 14:40:51 +02:00
Andy Wilkinson
3432044997
Use deferred logging to report Class-Path manifest attribute problems
...
Closes gh-16883
2019-05-23 11:20:15 +01:00
Andy Wilkinson
9f512ec3d9
Merge branch '2.1.x'
...
Closes gh-16950
2019-05-23 10:23:45 +01:00
Andy Wilkinson
32e1d68d2f
Upgrade to Couchbase Client 2.7.6
...
Closes gh-16909
2019-05-23 10:22:28 +01:00
Andy Wilkinson
23f803c6b6
Upgrade to Hamcrest 2.1, switch to hamcrest artifact from -core and -library
...
Closes gh-15555
2019-05-22 14:50:15 +01:00
Stephane Nicoll
f1dd973cdc
Merge pull request #16930 from dreis2211
...
* pr/16930:
Fix deprecated StandardAnnotationMetadata usages
2019-05-22 14:05:36 +02:00
dreis2211
27ca7e17d9
Fix deprecated StandardAnnotationMetadata usages
...
Closes gh-16930
2019-05-22 14:05:15 +02:00
Andy Wilkinson
9ba5c78878
Merge branch '2.1.x'
...
Closes gh-16940
2019-05-22 13:00:24 +01:00
Andy Wilkinson
46ecf7a928
Only unwrap when DataSource is a wrapper for required type
...
Closes gh-16863
2019-05-22 12:52:10 +01:00
Andy Wilkinson
46cdd6ecb2
Merge branch '2.1.x'
...
Closes gh-16939
2019-05-22 12:35:49 +01:00
Andy Wilkinson
da12ad0ca5
Make ReactiveSecurityAutoConfiguration back off without spring-webflux
...
Closes gh-16934
2019-05-22 12:33:59 +01:00
Andy Wilkinson
d3849dc0c5
Revert "Upgrade to Jackson 2.9.9"
...
This reverts commit c8712e9ec5 .
See gh-16914
2019-05-21 17:01:39 +01:00
Andy Wilkinson
26a6552e25
Merge branch '2.1.x'
2019-05-21 17:01:16 +01:00
Andy Wilkinson
6c7a6a6c3d
Revert "Upgrade to Jackson 2.9.9"
...
This reverts commit 66fba9387a .
See gh-16910
2019-05-21 17:00:16 +01:00
Andy Wilkinson
d00368e8ea
Merge branch '2.1.x'
...
Closes gh-16927
2019-05-21 11:24:34 +01:00
Andy Wilkinson
ea7ac08109
Ignore infinispan-embedded and infinispan-remote during bom verification
...
Closes gh-16926
2019-05-21 11:23:12 +01:00
Andy Wilkinson
e9ea8ed422
Merge branch '2.1.x'
2019-05-21 10:58:15 +01:00