Commit Graph

27490 Commits

Author SHA1 Message Date
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
Andy Wilkinson
3e3575eaef Upgrade to Spring Session 1.3.3.RELEASE
Closes gh-13387
2018-06-06 10:13:36 +01:00
Andy Wilkinson
6910831f25 Upgrade to Spring Cloud Connectors 1.2.6.RELEASE
Closes gh-13386
2018-06-06 10:13:36 +01:00
Andy Wilkinson
15cffde8b3 Upgrade to Spring Amqp 1.7.8.RELEASE
Closes gh-13385
2018-06-06 10:13:36 +01:00
Andy Wilkinson
884bd9008c Upgrade to Lombok 1.16.22
Closes gh-13384
2018-06-06 10:13:36 +01:00
Andy Wilkinson
26a5c4ad7e Upgrade to Hsqldb 2.3.6
Closes gh-13383
2018-06-06 10:13:36 +01:00
Andy Wilkinson
b7a46b8653 Upgrade to Appengine Sdk 1.9.64
Closes gh-13382
2018-06-06 10:13:35 +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
584d2de9f3 Document use of component scan exclude filters on SpringBootApplication
Closes gh-10933
2018-06-06 10:53:55 +02:00
Stephane Nicoll
d0b71a7d43 Document usage of auto-configuration AP for 3rd party starters
Closes gh-13368
2018-06-06 10:37:57 +02:00
Stephane Nicoll
0d63e7f592 Merge branch '2.0.x' 2018-06-06 09:30:46 +02:00
Stephane Nicoll
9f16326305 Merge pull request #13378 from dreis2211:remove-commons-codec-imports
* pr/13378:
  Polish "Replace commons-codec Base64 usage"
  Replace commons-codec Base64 usage
2018-06-06 09:30:17 +02:00
Stephane Nicoll
68380b68ef Polish "Replace commons-codec Base64 usage"
Closes gh-13378
2018-06-06 09:26:59 +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
Phillip Webb
845c20f13b Merge branch '2.0.x' 2018-06-05 17:14:34 -07:00
Phillip Webb
e3bf518819 Merge branch '1.5.x' into 2.0.x 2018-06-05 17:13:47 -07:00
Phillip Webb
6c7289b822 Allow META-INF/resources in WAR classes folder
Update `TomcatResources` so that `META-INF/resources` folders in
`src/main/resources` no longer fail with a "URI is not hierarchical"
exception.

Closes gh-13265
2018-06-05 17:00:52 -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
Stephane Nicoll
ace5ba5984 Merge pull request #13364 from nosan:http-webservice-sender-duration-int
* pr/13364:
  Use Duration in HttpWebServiceMessageSenderBuilder
2018-06-05 16:23:14 +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
638d4d94f4 Merge pull request #13355 from nosan:duration-instead-of-timeout
* pr/13355:
  Polish "Add duration support for setConnectTimeout and setReadTimeout"
  Add duration support for setConnectTimeout and setReadTimeout
  Polish "Add duration support for setConnectTimout and setReadTimeout"
2018-06-05 16:01:38 +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
df469abdb0 Merge pull request #13214 from eddumelendez:gh-13176
* pr/13214:
  Polish "Add support to set visibility via JacksonProperties"
  Add support to set visibility via JacksonProperties
2018-06-05 10:31:53 +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
48c078f0d0 Merge pull request #13358 from nosan:rest-template-customizers
* pr/13358:
  Polish "RestTemplateCustomizers should be applied at the end"
  RestTemplateCustomizers should be applied at the end
2018-06-05 09:45:48 +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
8eba37500c Upgrade to spring-javaformat 0.0.3 2018-06-04 17:26:40 -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