Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,158 Commits 20 Branches 322 Tags 258 MiB
e5ec6dfef0
Commit Graph

25158 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
f656083007 Merge pull request #21988 from tszmytka 
* gh-21988:
  Polish "Use Awaitility instead of Thread.sleep"
  Use Awaitility instead of Thread.sleep

Closes gh-21988
 2020-06-19 08:18:59 +01:00
Andy Wilkinson
41173f7c40 Polish "Use Awaitility instead of Thread.sleep" 
See gh-21988
 2020-06-19 08:18:01 +01:00
Tomek Szmytka
c13385ea74 Use Awaitility instead of Thread.sleep 
See gh-21988
 2020-06-19 08:17:53 +01:00
Andy Wilkinson
67604a5416 Only process main metadata as it already includes additional metadata 
Previously, the configuration property table generation was reading
both the main metadata and the additional metadata from each project.
This was unnecessary as the annotation processor will have already
merged the additional metadata into the main metadata before writing
it to disk. Processing both the main and additional metadata led to
a clash as the metadata overlapped. When the entry in the additional
metadata won the clash, the resulting entry in the configuration
property table would lose any details that aren't contained in the
additional metadata.

This commit updates the property table generation code to only use
the main metadata files.

Fixes gh-21131
 2020-06-18 15:49:34 +01:00
Andy Wilkinson
1b62abab9a Configure context on SizeAndTimeBasedRollingPolicy 
Previously, when file-based logging was enabled, Logback would output
the following during logging system initialization:

LOGBACK: No context given for c.q.l.core.rolling.SizeAndTimeBasedRollingPolicy

This commit updates the default logback configuration to set the
context on the SizeAndTimeBasedRollingPolicy that it creates.

Fixes gh-21056
 2020-06-18 11:01:26 +01:00
Andy Wilkinson
73a1047ad2 Merge branch '2.1.x' into 2.2.x 
Closes gh-22005
 2020-06-18 10:22:28 +01:00
Andy Wilkinson
db634d762e Update CI images to use ubuntu:bionic-20200526 
Closes gh-22003
 2020-06-18 10:17:39 +01:00
Andy Wilkinson
907b64a5eb Remove redundant stop() calls from LiveReloadServerTests 2020-06-18 09:23:02 +01:00
Madhura Bhave
615cf63a82 Make MockBean resolve right type for abstract test class 
Fixes gh-20916
 2020-06-17 17:25:03 -07:00
Stephane Nicoll
58974ab9cf Start building against Reactor Dysprosium-SR9 snapshots 
See gh-21937
 2020-06-16 07:57:31 +02:00
Phillip Webb
550b2847c5 Merge branch '2.1.x' into 2.2.x 2020-06-15 10:52:50 -07:00
Phillip Webb
b129a3f7fb Check that a distribution has been started 
Update the releasescript to ensure that a distribution has been started
before starting it again. This functionality was accidentally removed
during the updates for gh-21474.

See gh-21474
 2020-06-15 10:50:06 -07:00
Madhura Bhave
0395b186ad Merge branch '2.1.x' into 2.2.x 2020-06-15 09:23:26 -07:00
Madhura Bhave
9d9a90ccd4 Polish 2020-06-15 09:22:14 -07:00
Stephane Nicoll
04639d3387 Merge pull request #21906 from lltx 
* pr/21906:
  Update copyright year of changed files
  Fix wrong property reference to keys-to-sanitize in Javadoc

Closes gh-21906
 2020-06-15 08:40:02 +02:00
Stephane Nicoll
ec8c1e3860 Update copyright year of changed files 
See gh-21906
 2020-06-15 08:39:51 +02:00
lltx
de897b9b72 Fix wrong property reference to keys-to-sanitize in Javadoc 
See gh-21906
 2020-06-15 08:39:51 +02:00
Phillip Webb
209c5c4013 Merge branch '2.1.x' into 2.2.x 2020-06-11 23:19:16 -07:00
Phillip Webb
6d93d732b4 Cherry-pick release script updates 
Cherry-pick release script updates from 2.3.x

See gh-21474
 2020-06-11 23:15:10 -07:00
Stephane Nicoll
4999ca5f35 Merge branch '2.1.x' into 2.2.x 2020-06-11 17:12:19 +02:00
Spring Buildmaster
08ce50c86e Next development version (v2.2.9.BUILD-SNAPSHOT) 2020-06-11 13:06:12 +00:00
Stephane Nicoll
f8a0ca0d80 Upgrade to Netty Tcnative 2.0.31.Final 
Closes gh-21889
 2020-06-11 13:23:35 +02:00
Spring Buildmaster
5abca71056 Next development version (v2.1.16.BUILD-SNAPSHOT) 2020-06-11 09:14:56 +00:00
Stephane Nicoll
9af5f70b75 Upgrade to Spring Batch 4.2.4 
Closes gh-21783
 2020-06-11 10:34:50 +02:00
Stephane Nicoll
e64bfb80e4 Upgrade to Postgresql 42.2.14 
Closes gh-21888
 2020-06-11 08:55:47 +02:00
Stephane Nicoll
664436a3d6 Upgrade to Spring Kafka 2.3.9 
Closes gh-21781
 2020-06-11 08:54:52 +02:00
Stephane Nicoll
028ecfb147 Merge branch '2.1.x' into 2.2.x 2020-06-11 08:54:01 +02:00
Stephane Nicoll
49ba5dc6bc Upgrade to Postgresql 42.2.14 
Closes gh-21887
 2020-06-11 08:44:30 +02:00
Stephane Nicoll
c496f2401f Upgrade to Netty Tcnative 2.0.31.Final 
Closes gh-21886
 2020-06-11 08:44:29 +02:00
Stephane Nicoll
7dee9e34b5 Upgrade to Spring Kafka 2.2.14 
Closes gh-21780
 2020-06-11 08:43:39 +02:00
Phillip Webb
ac197be815 Fix checkstyle issue 2020-06-10 22:14:09 -07:00
Phillip Webb
3f36f6ea47 Rollback to Spring Batch 4.2.2 
See gh-21885
 2020-06-10 22:04:32 -07:00
Phillip Webb
02bfc9d30a Polish 2020-06-10 21:50:17 -07:00
Madhura Bhave
4e014da9e9 Return all loggers for Log4j2 
This commit aligns log4j2's behavior with logback such that loggers
with a null configuredLevel are also returned by the actuator endpoint.

Fixes gh-20037
 2020-06-10 18:48:14 -07:00
Madhura Bhave
92ce94b3d8 Align default log levels for Log4j2 and Logback 
Fixes gh-21293
 2020-06-10 18:48:01 -07:00
Phillip Webb
3fe4fb1373 Merge branch '2.1.x' into 2.2.x 2020-06-10 17:33:48 -07:00
Phillip Webb
418859fab6 Further reduce repetition in CI pipeline.yml 
See gh-21716
 2020-06-10 17:25:40 -07:00
Phillip Webb
da09e227c7 Merge branch '2.1.x' into 2.2.x 2020-06-10 17:14:37 -07:00
Phillip Webb
0957c7460b Polish pipeline YAML 2020-06-10 17:06:39 -07:00
Phillip Webb
f39a3f963b Merge branch '2.1.x' into 2.2.x 2020-06-10 16:44:22 -07:00
Phillip Webb
7e64f9709a Use milestone as docker tag 
Update the pipeline YAML to use ((milestone)) rather than ((branch))
when tagging docker images.

See gh-21716
 2020-06-10 16:43:09 -07:00
Phillip Webb
9aa8a073d6 Merge branch '2.1.x' into 2.2.x 
Closes gh-21876
 2020-06-10 16:33:34 -07:00
Phillip Webb
3a8d173845 Reduce repetition in CI pipeline.yml 
Use YAML anchors and aliases to reduce the amount of repetition
in our CI pipeline YAML.

Closes gh-21716
 2020-06-10 16:32:45 -07:00
Phillip Webb
ce13235e76 Polish 2020-06-10 16:32:45 -07:00
Scott Frederick
0fa1d0ef2e Handle bind exceptions in management context 
This commit updates the logic for handling binding exceptions in the
management context when it is separate from the application context.
The changes allow the exception details to be visible to
DefaultErrorAttributes without causing the servlet container to
detect an error condition.

Fixes gh-21036
 2020-06-10 13:53:04 -05:00
Andy Wilkinson
3927bd81eb Upgrade to Spring Integration 5.2.7.RELEASE 
Closes gh-21778
 2020-06-10 19:24:43 +01:00
Andy Wilkinson
4eea0329d3 Upgrade to Spring Data Moore SR8 
Closes gh-21775
 2020-06-10 19:24:12 +01:00
Andy Wilkinson
9cffcf9e5b Merge branch '2.1.x' into 2.2.x 2020-06-10 19:22:37 +01:00
Andy Wilkinson
ea55bb32a2 Upgrade to Spring Data Lovelace-SR18 
Closes gh-21774
 2020-06-10 19:20:53 +01:00
Andy Wilkinson
4eba8e2dc2 Upgrade to Spring Integration 5.1.11.RELEASE 
Closes gh-21777
 2020-06-10 19:16:40 +01:00