Commit Graph

23481 Commits

Author SHA1 Message Date
Andy Wilkinson
58eddb8fa4 Become compatible with Jackson 2.10 while remaining 2.9 compatible
See gh-17999
2019-09-05 17:13:45 +01:00
Stephane Nicoll
65917890d3 Merge branch '2.1.x' 2019-09-05 18:08:38 +02:00
Spring Buildmaster
25e6a2d37d Next development version (v2.1.9.BUILD-SNAPSHOT) 2019-09-05 15:17:25 +00:00
Stephane Nicoll
743351e067 Upgrade to Httpcore 4.4.12
Closes gh-18147
2019-09-05 14:44:45 +02:00
Stephane Nicoll
798fe069ce Upgrade to Activemq 5.15.10
Closes gh-18146
2019-09-05 14:44:44 +02:00
Stephane Nicoll
a4582307da Upgrade to Undertow 2.0.26.Final
Closes gh-18145
2019-09-05 14:44:43 +02:00
Stephane Nicoll
bcaa828f66 Merge branch '2.1.x' 2019-09-05 14:43:16 +02:00
Stephane Nicoll
9cd93ac98f Upgrade to Httpcore 4.4.12
Closes gh-18144
2019-09-05 14:41:40 +02:00
Stephane Nicoll
5fe4f3b25a Upgrade to Activemq 5.15.10
Closes gh-18143
2019-09-05 14:41:39 +02:00
Stephane Nicoll
fd77fd4f05 Upgrade to Undertow 2.0.26.Final
Closes gh-18142
2019-09-05 14:41:38 +02:00
Stephane Nicoll
e978f9ac8e Upgrade to Reactor Bom Californium-SR11
Closes gh-18141
2019-09-05 14:41:37 +02:00
Stephane Nicoll
e7474b55de Upgrade to Reactor Dysprosium-RC1
Closes gh-17895
2019-09-05 13:10:20 +02:00
Stephane Nicoll
359279b1fb Upgrade to Spring Framework 5.2.0.RC2
Closes gh-17896
2019-09-05 13:08:59 +02:00
Stephane Nicoll
b4ec255758 Merge pull request #18130 from eddumelendez
* pr/18130:
  Polish "Polish test"
  Polish test

Closes gh-18130
2019-09-05 08:55:45 +02:00
Stephane Nicoll
7cb2eb1850 Polish "Polish test"
See gh-18130
2019-09-05 08:54:35 +02:00
Eddú Meléndez
16a0188666 Polish test
See gh-18130
2019-09-05 08:54:06 +02:00
Stephane Nicoll
c20cfba98f Merge branch '2.1.x' 2019-09-05 08:41:45 +02:00
Stephane Nicoll
85a44dff64 Upgrade to Micrometer 1.1.6
Closes gh-18133
2019-09-05 08:28:06 +02:00
Phillip Webb
f70c0b8fbb Merge branch '2.1.x' 2019-09-04 22:20:27 -07:00
Phillip Webb
a3cde7fd8d Fix typo 2019-09-04 22:20:14 -07:00
Phillip Webb
877c65c714 Merge branch '2.1.x'
Closes gh-18132
2019-09-04 22:10:28 -07:00
Phillip Webb
a0a204ae6a Clarify devtools trigger file documentation
Closes gh-17775
2019-09-04 22:09:33 -07:00
Phillip Webb
7511502471 Merge branch '2.1.x' 2019-09-04 14:55:07 -07:00
Phillip Webb
7c7ad03e1e Remove stop_docker from CI script
Update our CI script to no longer attempt to stop docker. We don't
call it anyway and it will be one less moving part trying to diagnose
why `dockerd` sometimes terminates early.

See gh-18127
2019-09-04 14:51:33 -07:00
Phillip Webb
ebae76b1b8 Protect against null BindHandler.onStart result
Fixes gh-18129
2019-09-04 14:02:26 -07:00
Phillip Webb
1851f7119f Merge branch '2.1.x' 2019-09-04 13:53:28 -07:00
Phillip Webb
f1bbb2a017 Fix documentation typos
See gh-16718
2019-09-04 13:52:10 -07:00
Andy Wilkinson
13b45b42c7 Align with breaking API changes in latest Security snapshots
See gh-17897
2019-09-04 14:55:50 +01:00
Andy Wilkinson
4b5ebd8505 Process all non-private methods, not just public methods
Previously, the configuration processor would ignore any
@ConfigurationProperties-annotated methods that were not public. This
prevented metadata generation for package-private @Bean methods such
as those in DataSourceConfiguration's inner-classes for DBCP2, Hikari,
and Tomcat JDBC.

This commit updates the annotation processor so that it will process
any non-private method annotated with @ConfigurationProperties.

Fixes gh-18124
2019-09-04 14:26:12 +01:00
Andy Wilkinson
d5b289c02f Merge branch '2.1.x' 2019-09-04 10:15:20 +01:00
Andy Wilkinson
29080b87ec Protect autoconfigure module against slow starting test containers 2019-09-04 10:15:10 +01:00
Andy Wilkinson
8190b8eafb Merge branch '2.1.x'
Closes gh-18125
2019-09-04 09:54:26 +01:00
Andy Wilkinson
7f62c5a283 Provide a How-To for customizing Reactor Netty's TcpClient
Closes gh-17856
2019-09-04 09:49:56 +01:00
Phillip Webb
5c665ddd55 Merge branch '2.1.x'
Closes gh-18120
2019-09-03 21:04:43 -07:00
Phillip Webb
da1d7cff14 Merge pull request #16718 from Tetsuya3850
* pr/16718:
  Polish "Document the pros and cons of MockMvc"
  Document the pros and cons of MockMvc

Closes gh-16718
2019-09-03 21:04:22 -07:00
Phillip Webb
624c118cdf Polish "Document the pros and cons of MockMvc"
See gh-16718
2019-09-03 21:03:46 -07:00
Tetsuya Hasegawa
8f8a4af001 Document the pros and cons of MockMvc
Update the MockMvc documentation to provide more details about the
pros and cons of such an approach, specifically calling out the
difference with error page handling.

See gh-16718
2019-09-03 21:01:44 -07:00
Phillip Webb
b43edf5493 Merge branch '2.1.x'
Closes gh-18118
2019-09-03 18:20:24 -07:00
Phillip Webb
827c624b22 Merge pull request #16901 from michaldo
* pr/16901:
  Extend documentation on logback include files
  Clarify documentation on logback include files

Closes gh-16901
2019-09-03 18:19:59 -07:00
Phillip Webb
158e25c00f Extend documentation on logback include files
Expand the Logback "How To" to provide further clarifications on
the different include files available.

See gh-16901
2019-09-03 18:18:09 -07:00
michal
1f97a60d16 Clarify documentation on logback include files
Update documentation and comments on Logback to show the correct
use of `default.xml` rather than `base.xml`.

See gh-16901
2019-09-03 18:15:59 -07:00
Phillip Webb
c1a16f5f21 Merge branch '2.1.x'
Closes gh-18117
2019-09-03 16:56:34 -07:00
Phillip Webb
43108d5495 Add @SpringBootApplication.scanBasePackages note
Update the javadoc to note that `scanBasePackages` only affects the
`@ComponentScan` annotation and isn't a replacement for `@EntityScan`
or `@Enable...Repositories`.

Closes gh-18109
2019-09-03 16:51:06 -07:00
Phillip Webb
4fa41054d5 Merge branch '2.1.x'
Closes gh-18116
2019-09-03 16:12:55 -07:00
Phillip Webb
8e6dbae402 Build CI images in parallel
Closes gh-18115
2019-09-03 16:10:42 -07:00
Phillip Webb
625f4e6dec Merge branch '2.1.x'
Closes gh-18114
2019-09-03 15:46:00 -07:00
Phillip Webb
42ba3050bc Upgrade CI images to Ubuntu Bionic 20190807
Closes gh-18113
2019-09-03 15:44:50 -07:00
Phillip Webb
013a8fcd03 Merge branch '2.1.x'
Closes gh-18112
2019-09-03 15:36:52 -07:00
Phillip Webb
3639776ec2 Upgrade CI to docker 19.03.2
Closes gh-18111
2019-09-03 15:35:46 -07:00
Phillip Webb
75a6397b52 Merge branch '2.1.x'
Closes gh-18110
2019-09-03 14:35:35 -07:00