Phillip Webb
af1720aa2e
Fix checkstyle issue
2019-05-28 15:52:00 -07:00
Phillip Webb
6e9f2e42af
Merge branch '2.1.x'
...
Closes gh-16992
2019-05-28 15:06:16 -07:00
Phillip Webb
a51996fc10
Merge pull request #16889 from vpavic
...
* pr/16889:
Polish "Fix NoClassDefFound when missing Spring Security"
Fix NoClassDefFound when missing Spring Security
2019-05-28 15:00:52 -07:00
Phillip Webb
6913ea24b0
Polish "Fix NoClassDefFound when missing Spring Security"
...
See gh-16889
2019-05-28 14:56:58 -07:00
Vedran Pavic
e9bd11ee83
Fix NoClassDefFound when missing Spring Security
...
Update Spring Session auto-configuration to ensure that the
`DefaultCookieSerializer` doesn't break when Spring Security is not
present on the classpath.
Closes gh-16889
2019-05-28 14:55:18 -07:00
Phillip Webb
c080a4c7f2
Merge branch '2.1.x'
2019-05-28 14:34:50 -07:00
Phillip Webb
5fc67c545c
Work around Framework regression in handling of null model values
...
See https://github.com/spring-projects/spring-framework/issues/23038 .
2019-05-28 14:33:08 -07:00
Phillip Webb
df55d73bff
Merge branch '2.1.x'
...
Closes gh-16990
2019-05-28 13:49:34 -07:00
Phillip Webb
8fe18303cc
Merge pull request #16971 from nosan
...
* pr/16971:
Polish "Fix Spring Data Cassandra auto-configure condition"
Fix Spring Data Cassandra auto-configure condition
2019-05-28 13:49:07 -07:00
Phillip Webb
278a0866cd
Polish "Fix Spring Data Cassandra auto-configure condition"
...
See gh-16971
2019-05-28 13:47:45 -07:00
Dmytro Nosan
be435130e6
Fix Spring Data Cassandra auto-configure condition
...
Update `CassandraDataAutoConfiguration` do that it's only applied when
a `Cluster` bean is found.
Fixes gh-16971
2019-05-28 13:47:40 -07:00
Phillip Webb
a819b1c49c
Merge branch '2.1.x'
...
Closes gh-16989
2019-05-28 13:30:59 -07:00
Phillip Webb
ef09ee5dea
Add new line when rewriting git message
...
Update the forward merge script to add an additional new line when
rewiring the commit message. Prior this this commit, if an additional
line immediately followed the "Fixes ... in ..." pattern it would be
appended to the end of the rewritten fixes line.
Closes gh-16861
2019-05-28 13:30:13 -07:00
Phillip Webb
89f8e187d5
Merge branch '2.1.x'
...
Closes gh-16988
2019-05-28 13:26:14 -07:00
Phillip Webb
07ebfc036b
Polish
2019-05-28 13:17:56 -07:00
Phillip Webb
b1e90fdca9
Merge pull request #16974 from izeye
...
* pr/16974:
Use actual resolvedType when checking Binder cache
2019-05-28 13:17:44 -07:00
Johnny Lim
e2f69d040a
Use actual resolvedType when checking Binder cache
...
Update `JavaBeanBinder` so that the `isOfDifferentType` method checks
both the actual type and the resolved type. Prior to this commit, it
was possible that when `canCallGetValue` is `true` the `resolvedType`
could be different from `type.resolve`.
Closes gh-16974
2019-05-28 13:13:08 -07:00
Andy Wilkinson
0eb6c0ddd3
Defer disabling registry until Tomcat server is being created
...
Closes gh-16498
2019-05-28 20:49:07 +01:00
Andy Wilkinson
6787b918d5
Merge pull request #16984 from Christoph Dreis
...
* gh-16984:
Fix Gradle plugin code formatting
Closes gh-16984
2019-05-28 18:10:52 +01:00
dreis2211
e59d734098
Fix Gradle plugin code formatting
...
See gh-16984
2019-05-28 18:10:04 +01:00
Andy Wilkinson
c80218064f
Use sorted properties to make build info output repeatable
...
Closes gh-14494
2019-05-28 16:30:36 +01:00
Andy Wilkinson
6de14f71c6
Fail fast if config prop constructor binding cannot determine names
...
Previously, configuration property constructor binding relied on compilation
with -parameters to be able to discover the names of a constructor's
parameters, failing silently if the parameter names were not available. This
commit updates it to fail when the names could not be determined and switches
to using DefaultParameterNamesDiscoverer. This align configuration property
constructor binding with actuator endpoint operation invocation.
Closes gh-16928
2019-05-28 15:47:39 +01:00
Andy Wilkinson
b603cd5d4b
Disable Tomcat's MBean Registry by default
...
Closes gh-16498
2019-05-28 15:21:31 +01:00
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