root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
25,167 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

25167 Commits

Author SHA1 Message Date
Phillip Webb a49156d95e Merge pull request #22022 from polarbear567 
* pr/22022:
  Polish 'Inherit show-details property in health groups'
  Inherit show-details property in health groups

Closes gh-22022
 2020-06-22 23:15:05 -07:00
Phillip Webb e6eb02603c Polish 'Inherit show-details property in health groups' 
Rework the inheritance so that the property metadata JSON more
accurately reflects the default value.

See gh-22022
 2020-06-22 23:01:37 -07:00
Leo Li 10de88884f Inherit show-details property in health groups 
Update `Group` properties so that the `showDetails` value does not
inherit `Show.NEVER`. Prior to this commit, the `Group` properties
would not correctly inherit a `showDetails` value from the main
`management.endpoint.health.show-details` property.

See gh-22022
 2020-06-22 22:54:34 -07:00
Phillip Webb bf04baba73 Merge pull request #22040 from Konrado85 
* pr/22040:
  Polish 'Fix infinite loop in FieldValues'
  Fix infinite loop in FieldValues

Closes gh-22040
 2020-06-22 12:13:08 -07:00
Phillip Webb 3b3a49db1f Polish 'Fix infinite loop in FieldValues' 
See gh-22040
 2020-06-22 12:01:04 -07:00
Konrado85 39a853c57b Fix infinite loop in FieldValues 
Update `FieldValues` test object so that it doesn't cause an infinite
loop if it is actually created.

See gh-22040
 2020-06-22 11:58:22 -07:00
Stephane Nicoll 97af782ee6 Merge pull request #22000 from mla-mpensdavila 
* pr/22000:
  Polish "Document how to exclude an annotation processor with Maven"
  Document how to exclude an annotation processor with Maven

Closes gh-22000
 2020-06-19 11:37:31 +02:00
Stephane Nicoll 9b803af3c3 Polish "Document how to exclude an annotation processor with Maven" 
See gh-22000
 2020-06-19 11:36:25 +02:00
Marco Pens 627c0b1031 Document how to exclude an annotation processor with Maven 
See gh-22000
 2020-06-19 11:35:48 +02:00
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