Andy Wilkinson
a4a6f482c6
Upgrade to Hsqldb 2.4.1
...
Closes gh-13394
2018-06-06 10:15:33 +01:00
Andy Wilkinson
ecd8760514
Upgrade to Hibernate Validator 6.0.10.Final
...
Closes gh-13393
2018-06-06 10:15:33 +01:00
Andy Wilkinson
50f3f50ebb
Upgrade to Activemq 5.15.4
...
Closes gh-13392
2018-06-06 10:15:33 +01:00
Andy Wilkinson
2b4d51e763
Upgrade to Rxjava2 2.1.14
...
Closes gh-13391
2018-06-06 10:15:33 +01:00
Andy Wilkinson
d79f2401be
Upgrade to Netty 4.1.25.Final
...
Closes gh-13390
2018-06-06 10:15:33 +01:00
Andy Wilkinson
2d4f1bb043
Upgrade to Unboundid Ldapsdk 4.0.6
...
Closes gh-13389
2018-06-06 10:15:33 +01:00
Andy Wilkinson
27b5fdd1e1
Merge branch '1.5.x' into 2.0.x
2018-06-06 10:15:24 +01:00
Stephane Nicoll
42c2059dd8
Merge branch '2.0.x'
2018-06-06 11:00:25 +02:00
Stephane Nicoll
f6c99361a4
Merge branch '1.5.x' into 2.0.x
2018-06-06 11:00:02 +02:00
Stephane Nicoll
0d63e7f592
Merge branch '2.0.x'
2018-06-06 09:30:46 +02:00
dreis2211
ba8a32fa4e
Replace commons-codec Base64 usage
...
See gh-13378
2018-06-06 09:19:17 +02:00
Phillip Webb
e0ae805924
Update copyright header
2018-06-05 17:45:09 -07:00
Phillip Webb
66be6c3396
Polish
2018-06-05 17:44:51 -07:00
Madhura Bhave
26b826e017
Merge branch '2.0.x'
2018-06-05 13:49:42 -07:00
Madhura Bhave
d0a2a8e929
Document ConfigurableServletWebServerFactory variants
...
Closes gh-13083
2018-06-05 13:48:43 -07:00
Brian Clozel
56ab0da287
Support EncodedResourceResolver in resource chain
...
As of https://jira.spring.io/browse/SPR-16381 , Spring Framework now
supports both gzip and Brotli as compression formats for static
resources resolved by the resource chain.
The `GzipResourceResolver` has been deprecated and replaced by the
`EncodedResourceResolver`. This commit uses this new resolver and adapts
the configuration key to reflect those changes.
Note that this resolver is now configured ahead of the
`VersionResourceResolver`.
Closes gh-13242
2018-06-05 17:25:25 +02:00
Dmytro Nosan
5b159a6bd0
Use Duration in HttpWebServiceMessageSenderBuilder
...
Closes gh-13364
2018-06-05 16:14:34 +02:00
Stephane Nicoll
909722f143
Polish
2018-06-05 16:02:32 +02:00
Stephane Nicoll
e9c3df4ad2
Polish "Add duration support for setConnectTimeout and setReadTimeout"
...
Closes gh-13355
2018-06-05 16:00:33 +02:00
Dmytro Nosan
36f3c1b883
Add duration support for setConnectTimeout and setReadTimeout
...
See gh-13355
2018-06-05 16:00:33 +02:00
Stephane Nicoll
8691d01aaf
Polish "Add duration support for setConnectTimout and setReadTimeout"
...
See gh-13355
2018-06-05 16:00:25 +02:00
Stephane Nicoll
83f7df920b
Merge branch '2.0.x'
2018-06-05 13:30:07 +02:00
Stephane Nicoll
bf56ec496d
Polish
2018-06-05 13:29:56 +02:00
Stephane Nicoll
47634f5587
Polish
2018-06-05 13:21:03 +02:00
Stephane Nicoll
1901008d6f
Merge branch '2.0.x'
2018-06-05 13:18:40 +02:00
Stephane Nicoll
fff06822dc
Polish
2018-06-05 13:15:38 +02:00
Stephane Nicoll
d84e2b90d7
Fix wrong usage of ManagementContextConfiguration
...
Closes gh-13366
2018-06-05 13:15:21 +02:00
Stephane Nicoll
51cf4e5d74
Polish "Add support to set visibility via JacksonProperties"
...
Closes gh-13214
2018-06-05 10:30:15 +02:00
Eddú Meléndez
ca3659059a
Add support to set visibility via JacksonProperties
...
This commit allows to configure properties visibility.
See gh-13214
2018-06-05 10:20:25 +02:00
Stephane Nicoll
3248400665
Merge branch '2.0.x'
2018-06-05 10:12:46 +02:00
Stephane Nicoll
b4f8361989
Make JMX metrics domain configurable
...
Closes gh-13356
2018-06-05 10:12:26 +02:00
Stephane Nicoll
c612ed2695
Polish "RestTemplateCustomizers should be applied at the end"
...
Closes gh-13358
2018-06-05 09:45:19 +02:00
Dmytro Nosan
ce3420748f
RestTemplateCustomizers should be applied at the end
...
See gh-13358
2018-06-05 09:42:42 +02:00
Phillip Webb
ade1397ea2
Merge branch '2.0.x'
2018-06-04 17:28:54 -07:00
Phillip Webb
571c50e43f
Switch to functional web code to use static imports
...
Update the samples and tests to use the more idiomatic static import
style.
2018-06-04 17:27:34 -07:00
Phillip Webb
2274ac5214
Move spring-javaformat plugins to root POM
...
Relocate spring-javaformat plugins to the root of the project.
Closes gh-13306
2018-06-04 17:25:19 -07:00
Phillip Webb
d47e7ebb5b
Merge branch '2.0.x'
2018-06-04 15:42:12 -07:00
Phillip Webb
e1d21e52d5
Allow multi-value spring.profiles properties
...
Update `ConfigFileApplicationListener` to correctly load properties
that have `spring.profiles` values containing a list.
Prior to this commit the loaded would attempt to add the same document
twice resulting in a "property source cannot be added relative to
itself" error.
Closes gh-13362
2018-06-04 15:39:16 -07:00
Phillip Webb
a12baed5de
Merge branch '2.0.x'
2018-06-04 15:02:14 -07:00
Phillip Webb
c1ab3eab69
Polish
2018-06-04 15:02:06 -07:00
Phillip Webb
67b548dafb
Protect against infinite property include loop
...
Update `ConfigFileApplicationListener` to ensure that a
`spring.profiles.include` property that refers to an already processed
profile doesn't cause an infinite loop.
Closes gh-13361
2018-06-04 14:59:29 -07:00
Madhura Bhave
378c4c9535
Stop included profiles overriding active profiles
...
Update `ConfigFileApplicationListener` so that `spring.profiles.include`
properties do not override higher priority active profiles.
This commit also changes when profiles get added to the environment.
Profiles are now added to the environment at the time of profile
processing so that they get logged in the order that they are processed.
Closes gh-13151
2018-06-04 14:46:44 -07:00
Brian Clozel
87af880446
Reactor BOM is now declaring reactor-netty 0.8
...
See gh-13321
2018-06-04 22:03:51 +02:00
Madhura Bhave
360d392eb1
Merge branch '2.0.x'
2018-06-04 12:51:07 -07:00
Madhura Bhave
60a4d67b13
Handle special characters in TraceableHttpServletRequest
...
Fixes gh-13273
2018-06-04 12:50:11 -07:00
Phillip Webb
ef5301d079
Add saaj and jax-ws dependencies for Java 9 build
...
Add test dependencies for saaj-impl and jax-ws since Java 9+ no longer
includes them.
See gh-1270
2018-06-04 12:16:30 -07:00
Andy Wilkinson
ebb99d1c20
Merge branch '2.0.x'
2018-06-04 19:38:53 +01:00
Andy Wilkinson
1a0dfa06ab
Add log4j-jul to Log4j 2 starter
...
Closes gh-12659
2018-06-04 19:38:25 +01:00
Phillip Webb
1d35b629bb
Merge branch '2.0.x'
2018-06-04 11:02:06 -07:00
Phillip Webb
abe92eba2e
Protect Inet test against "helpful" DNS resolvers
...
Update `InetAddressFormatterTests` to ensure that DNS resolvers that
return a "help" page for missing domains don't cause the build to fail.
Closes gh-11897
2018-06-04 10:50:36 -07:00