Commit Graph

26992 Commits

Author SHA1 Message Date
Phillip Webb
e9e4a34e62 Merge branch '2.2.x' into 2.3.x 2020-06-08 10:50:53 -07:00
Phillip Webb
ee00b57a78 Merge branch '2.1.x' into 2.2.x 2020-06-08 10:50:28 -07:00
Dave Syer
b59b48e40e Ignore 'attach_pid' files 2020-06-08 10:50:07 -07:00
Phillip Webb
8cd0f5684e Merge pull request #21650 from fastso
* pr/21650:
  Polish 'Clarify documentation for probe ports'
  Clarify documentation for probe ports

Closes gh-21650
2020-06-08 10:42:33 -07:00
Phillip Webb
47729be4e3 Polish 'Clarify documentation for probe ports'
See gh-21650
2020-06-08 10:42:01 -07:00
Hui Li
e6ade05c2d Clarify documentation for probe ports
Update the reference documentation to provide a better description of
the port that should be used for Kubernetes probes.

See gh-21650
2020-06-08 10:41:41 -07:00
Phillip Webb
9dfb09c5d7 Merge pull request #21758 from dreis2211
* pr/21758:
  Use supplier assertions in availability indicator

Closes gh-21758
2020-06-08 10:30:00 -07:00
dreis2211
eeb1db2176 Use supplier assertions in availability indicator
See gh-21758
2020-06-08 10:29:28 -07:00
Andy Wilkinson
96ae4864a2 Merge branch '2.2.x' into 2.3.x
Closes gh-21762
2020-06-08 17:42:02 +01:00
Andy Wilkinson
13564b4a13 Merge pull request #20716 from norio-io
* gh-20716:
  Polish "Clarify loss of defaults when adding custom mapping"
  Clarify loss of defaults when adding custom mapping

Closes gh-20716
2020-06-08 17:41:46 +01:00
Andy Wilkinson
2de906caf7 Polish "Clarify loss of defaults when adding custom mapping"
See gh-20716
2020-06-08 17:34:11 +01:00
Norio
9f009e4445 Clarify loss of defaults when adding custom mapping
See gh-20716
2020-06-08 17:31:26 +01:00
Andy Wilkinson
a97c63661a Merge branch '2.2.x' into 2.3.x
Closes gh-21760
2020-06-08 17:08:07 +01:00
Andy Wilkinson
4a0e8217f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21759
2020-06-08 17:07:51 +01:00
Andy Wilkinson
5dce945e29 Document dispatcher-types configuration for secured error pages
Closes gh-19293
2020-06-08 17:06:42 +01:00
Andy Wilkinson
fe265af252 Merge branch '2.2.x' into 2.3.x
Closes gh-21755
2020-06-08 14:43:39 +01:00
Andy Wilkinson
296da88e31 Merge branch '2.1.x' into 2.2.x
Closes gh-21754
2020-06-08 14:43:14 +01:00
Andy Wilkinson
c96455f7cf Remove . from CLI's classpath on Unix-like platforms
Previously, the spring bash script added . to the classpath but the
Windows spring.bat script did not. This commit aligns the classpath
of the two scripts by removing . from the classpath in the bash
script.

Fixes gh-19910
2020-06-08 14:40:14 +01:00
Andy Wilkinson
a192dcb742 Merge branch '2.2.x' into 2.3.x
Closes gh-21752
2020-06-08 14:30:05 +01:00
Andy Wilkinson
ad158ee729 Merge branch '2.1.x' into 2.2.x
Closes gh-21751
2020-06-08 14:29:53 +01:00
Andy Wilkinson
020a47ba3e Document support for Gradle 5
Closes gh-15358
2020-06-08 14:29:07 +01:00
Andy Wilkinson
82b531b49e Merge branch '2.2.x' into 2.3.x 2020-06-08 11:35:53 +01:00
Andy Wilkinson
8da1e3addb Merge branch '2.1.x' into 2.2.x 2020-06-08 11:35:10 +01:00
Andy Wilkinson
6a9450ee8b Polish 2020-06-08 11:34:56 +01:00
Phillip Webb
8ac8329ee6 Merge pull request #21381 from evgeniycheban
* pr/21381:
  Polish 'Support userInfo in elasticsearch URI'
  Support userInfo in elasticsearch URI

Closes gh-21381
2020-06-07 11:57:32 -07:00
Phillip Webb
f8982bdc14 Polish 'Support userInfo in elasticsearch URI'
See gh-21381
2020-06-07 11:56:18 -07:00
Evgeniy Cheban
a72179aa4f Support userInfo in elasticsearch URI
See gh-21381
2020-06-07 10:38:41 -07:00
Phillip Webb
abaca95467 Merge branch '2.2.x' into 2.3.x
Closes gh-21744
2020-06-07 10:27:35 -07:00
Phillip Webb
bfe1c281f0 Merge branch '2.1.x' into 2.2.x
Closes gh-21743
2020-06-07 10:25:33 -07:00
Phillip Webb
70e0a27949 Drop the use of the term "white list"
Closes gh-21737
2020-06-07 10:22:35 -07:00
Stephane Nicoll
9fd6ff7e88 Start building against Spring Framework 5.2.7 snapshots
See gh-21739
2020-06-07 11:14:02 +02:00
Stephane Nicoll
83acb39a1e Merge branch '2.2.x' into 2.3.x 2020-06-07 11:13:25 +02:00
Stephane Nicoll
4c26c7d043 Start building against Spring Framework 5.2.7 snapshots
See gh-21738
2020-06-07 10:54:38 +02:00
Stephane Nicoll
b997154caa Merge branch '2.1.x' into 2.2.x 2020-06-07 10:53:47 +02:00
Stephane Nicoll
d4c8fa9b2a Start building against Spring Framework 5.1.16 snapshots
See gh-21729
2020-06-07 10:37:47 +02:00
Phillip Webb
6e02049dd9 Merge pull request #20929 from encircled
* pr/20929:
  Polish 'Allow beans without public constructors to load'
  Allow beans without public constructors to load

Closes gh-20929
2020-06-06 12:06:47 -07:00
Phillip Webb
c11abf48d9 Polish 'Allow beans without public constructors to load'
See gh-20929
2020-06-06 12:05:50 -07:00
Vlad Kisel
d8d8f9cf0b Allow beans without public constructors to load
Allow `BeanDefinitionLoader` to load classes that don't have public
constructors. The constraint was first introduced in d82c50804f to
solve an issue with anonymous Groovy classes but causes particular
problems with `@SpringBootTest`.

See gh-20929
2020-06-06 11:59:47 -07:00
Phillip Webb
a0518d3cb8 Merge pull request #21732 from dreis2211
* pr/21732:
  Polish

Closes gh-21732
2020-06-06 11:07:59 -07:00
dreis2211
2b5569f054 Polish
See gh-21732
2020-06-06 11:07:21 -07:00
Stephane Nicoll
44f375c508 Start building against Reactor Dysprosium-SR8 snapshots
See gh-21731
2020-06-06 09:57:21 +02:00
Stephane Nicoll
cc981b1aa9 Merge branch '2.2.x' into 2.3.x 2020-06-06 09:54:18 +02:00
Stephane Nicoll
f4f9df3d10 Start building against Reactor Dysprosium-SR8 snapshots
See gh-21730
2020-06-06 09:26:15 +02:00
Stephane Nicoll
9141e9b9e0 Merge branch '2.1.x' into 2.2.x 2020-06-06 09:24:54 +02:00
Stephane Nicoll
0b0187cd0d Start building against Reactor Californium-SR19 snapshots
See gh-21728
2020-06-06 08:48:15 +02:00
Phillip Webb
2f973ebc33 Fix default Launcher.isExploded() result
Fix the default implementation of `Launcher.isExploded` which should
have returned `true`.

Fixes gh-21575
2020-06-05 19:32:06 -07:00
Phillip Webb
9b95ab26f7 Merge branch '2.2.x' into 2.3.x 2020-06-05 16:22:06 -07:00
Phillip Webb
97d4613fba Refine prepare-forward-merge to detect master 2020-06-05 16:21:36 -07:00
Phillip Webb
bbb57428cb Merge pull request #21523 from dreis2211
* pr/21523:
  Polish 'Optimize SystemEnvironmentPropertyMapper'
  Optimize SystemEnvironmentPropertyMapper
  Call append only when necessary
  Use chars rather than strings

Closes gh-21523
2020-06-05 16:17:21 -07:00
Phillip Webb
47c1928189 Polish 'Optimize SystemEnvironmentPropertyMapper'
Introduce a new `ConfigurationPropertyName.ofIfValid` method to
save us needing to throw and catch an exception unnecessarily.

See gh-21523
2020-06-05 16:11:52 -07:00