Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
27,826 Commits 23 Branches 0 Tags
4827e84a121ac5844d9ec1516eaa22fa67a1ccd5
Commit Graph

27826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
4827e84a12 Merge branch '2.3.x' 
Closes gh-22581
 2020-07-27 11:30:34 +01:00
Andy Wilkinson
d0c75aef19 Merge branch '2.2.x' into 2.3.x 
Closes gh-22580
 2020-07-27 11:29:14 +01:00
Andy Wilkinson
16eaae0b2f Defer background pre-init till the environment is prepared 
Previously, background pre-init was started in response to the
application starting event. This meant that it would be running while
the logging turbo filter was in place and was rejecting all logging.
As a result, any logging performed during pre-init would be lost.

This commit changes background pre-init so that it is now started
in response to the application environment prepared event. By this
point, the logging turbo filter has been removed as the logging levels
have been configured from the environment.

Closes gh-21897
 2020-07-27 11:24:36 +01:00
Andy Wilkinson
3444a23765 Merge branch '2.3.x' 
Closes gh-22579
 2020-07-27 10:58:15 +01:00
Andy Wilkinson
f0d90020e5 Merge branch '2.2.x' into 2.3.x 
Closes gh-22578
 2020-07-27 10:57:58 +01:00
Andy Wilkinson
b98c3dccfd Fix property-based configuration of Undertow socket options 
Previously, only UndertowOptions was used as the source of options for
both server and socket options, but it only contains server options.
As a result, attempting to configure any socket options defined by
XNIO's Options class would fail.

This commit updates the property-based configuration of options to use
UndertowOptions as the source for server options and XNIO's Options as
the source for socket options.

Fixes gh-22502
 2020-07-27 10:47:14 +01:00
Andy Wilkinson
8a9cc64221 Merge branch '2.3.x' 
Closes gh-22577
 2020-07-27 10:12:09 +01:00
Andy Wilkinson
5279b90ced Merge branch '2.2.x' into 2.3.x 
Closes gh-22576
 2020-07-27 10:11:47 +01:00
Andy Wilkinson
1c3528f5a4 Include Jackson Modules in WebMvcTest and WebFluxTest 
Fixes gh-22530
 2020-07-27 10:11:29 +01:00
Andy Wilkinson
6b4114e4cf Merge branch '2.3.x' 
Closes gh-22575
 2020-07-27 09:59:22 +01:00
Andy Wilkinson
979aef1f68 Merge branch '2.2.x' into 2.3.x 
Closes gh-22574
 2020-07-27 09:59:07 +01:00
Andy Wilkinson
7b3c0a9e09 Advise against java.util.Optional configuration properties 
Closes gh-21868
 2020-07-27 09:58:24 +01:00
Stephane Nicoll
85ed16de13 Merge branch '2.3.x' 
Closes gh-22568
 2020-07-26 17:26:30 +02:00
Stephane Nicoll
6b32e62142 Fix CacheAutoConfiguration relative order for Couchbase 
This commit fixes the auto-configuration of the Couchbase caching
support by configuring the cache once Spring Data Couchbase has gotten
a chance to be processed.

Closes gh-22542
 2020-07-26 17:24:24 +02:00
Andy Wilkinson
edca4be021 Merge branch '2.3.x' 2020-07-26 10:09:40 +01:00
Andy Wilkinson
43524575cc Merge branch '2.2.x' into 2.3.x 2020-07-26 10:09:33 +01:00
Andy Wilkinson
162253948a Merge branch '2.1.x' into 2.2.x 2020-07-26 10:08:22 +01:00
Andy Wilkinson
25866019c9 Polish pipeline env vars used by Gradle Enterprise 2020-07-26 10:05:26 +01:00
Andy Wilkinson
04777d06d9 Merge branch '2.3.x' 2020-07-25 10:36:33 +01:00
Andy Wilkinson
8d665a1eea Merge branch '2.2.x' into 2.3.x 2020-07-25 10:36:26 +01:00
Andy Wilkinson
750777db24 Merge branch '2.1.x' into 2.2.x 2020-07-25 10:36:19 +01:00
Andy Wilkinson
5d776f2a8b Set user.name in CI builds so it's picked up by Gradle Enterprise 2020-07-25 10:33:39 +01:00
Andy Wilkinson
d5ec823454 Merge branch '2.3.x' 2020-07-25 10:29:08 +01:00
Andy Wilkinson
8b84f66132 Merge branch '2.2.x' into 2.3.x 2020-07-25 10:28:52 +01:00
Andy Wilkinson
1dfa21c99f Merge branch '2.1.x' into 2.2.x 2020-07-25 10:28:35 +01:00
Andy Wilkinson
141c59e348 Set BRANCH env var so it's available to Gradle Enterprise 2020-07-25 10:26:53 +01:00
Andy Wilkinson
4eb24754af Merge branch '2.3.x' 2020-07-25 09:14:29 +01:00
Andy Wilkinson
43316fa6b6 Merge branch '2.2.x' into 2.3.x 2020-07-25 09:14:12 +01:00
Andy Wilkinson
4a828c7db1 Merge branch '2.1.x' into 2.2.x 2020-07-25 09:10:50 +01:00
Andy Wilkinson
45d50e279e Disable build scans in custom layout sample's tests 2020-07-25 09:10:31 +01:00
Andy Wilkinson
9a4ed48627 Merge branch '2.3.x' 2020-07-25 09:07:56 +01:00
Andy Wilkinson
8eca4d9d8d Merge branch '2.2.x' into 2.3.x 2020-07-25 09:07:43 +01:00
Andy Wilkinson
ce7210c4f0 Merge branch '2.1.x' into 2.2.x 
Closes gh-22563
 2020-07-25 09:06:11 +01:00
Andy Wilkinson
ebfa26e3ac Merge pull request #22555 from runningcode 
* gh-22555:
  Polish "Add generated-snippets as output to test goal"
  Add generated-snippets as output to test goal

Closes gh-22555
 2020-07-25 09:05:05 +01:00
Andy Wilkinson
d1ea5befea Polish "Add generated-snippets as output to test goal" 
See gh-22555
 2020-07-25 08:27:05 +01:00
Nelson Osacky
585aed8f8f Add generated-snippets as output to test goal 
The generated snippets were not declared as an output to the
`spring-boot-actuator-autoconfigure` test goal so when the test was
pulled from the cache, it did not contain the `generated-snippets`
directory. This directory is required as an input to the Asciidoctor
plugin.

See gh-22555
 2020-07-25 08:26:15 +01:00
Stephane Nicoll
71fbd794fa Merge pull request #22549 from izeye 
* pr/22549:
  Polish

Closes gh-22549
 2020-07-25 07:26:59 +02:00
izeye
6eba7c5f10 Polish 
See gh-22549
 2020-07-25 07:26:49 +02:00
Stephane Nicoll
42155321cb Merge branch '2.3.x' 
Closes gh-22561
 2020-07-25 07:20:50 +02:00
Stephane Nicoll
7ed54bda96 Fix typo for management.health.readinessstate.enabled 
Closes gh-22560
 2020-07-25 07:20:06 +02:00
Andy Wilkinson
a1bfe217c9 Merge branch '2.3.x' 2020-07-24 21:14:00 +01:00
Spring Buildmaster
90809f266e Next development version (v2.3.3.BUILD-SNAPSHOT) 2020-07-24 17:46:53 +00:00
Andy Wilkinson
120db242a0 Merge branch '2.3.x' 2020-07-24 18:32:12 +01:00
Andy Wilkinson
2e1366f61f Make spring-boot-dependencies available when building test app 2020-07-24 18:30:52 +01:00
Andy Wilkinson
e712d9a662 Merge branch '2.3.x' 2020-07-24 16:45:42 +01:00
Andy Wilkinson
98115239b3 Only create effective bom artifact when needed 
Closes gh-22143
 2020-07-24 16:44:46 +01:00
Andy Wilkinson
d7c5956a7a Merge branch '2.3.x' 2020-07-24 15:54:06 +01:00
Andy Wilkinson
63cac4bedd Upgrade to Micrometer 1.5.3 
Closes gh-22553
 2020-07-24 15:53:35 +01:00
Andy Wilkinson
71f48e38c4 Merge branch '2.3.x' 2020-07-24 14:57:26 +01:00
Andy Wilkinson
fb34fd31e9 Upgrade to Micrometer 1.5.3 
Closes gh-22553
 2020-07-24 14:55:30 +01:00