Commit Graph

25128 Commits

Author SHA1 Message Date
Andy Wilkinson
64aa418baa Merge pull request #22141 from im47cn
* gh-22141:
  Polish "Avoid NPE when binder is closed before started event"
  Avoid NPE when binder is closed before started event

Closes gh-22141
2020-06-30 14:09:42 +01:00
Andy Wilkinson
3922fb7164 Polish "Avoid NPE when binder is closed before started event"
See gh-22141
2020-06-30 13:26:30 +01:00
im47cn
b34c268547 Avoid NPE when binder is closed before started event
Previously, if TomcatMetricsBinder destroy() was called before it had
received an ApplicationStartedEvent an NPE would be thrown due to
TomcatMetrics being null. This NPE was then caught and logged at
warning level by the disposable bean adapter.

This prevents the NPE by checking that the TomcatMetrics instance is
null before calling close() on it.

See gh-22141
2020-06-30 13:23:58 +01:00
Madhura Bhave
9c732fa2b6 Merge pull request #22082 from thenx-wei
* pr/22082:
  Simplify logic in ErrorPage's equals method

Closes gh-22082
2020-06-29 17:08:05 -07:00
May
c1b9d3c226 Simplify logic in ErrorPage's equals method
See gh-22082
2020-06-29 17:06:49 -07:00
Madhura Bhave
67060731bc Merge branch '2.1.x' into 2.2.x 2020-06-29 16:40:59 -07:00
Madhura Bhave
4a55a414e7 Fix typo 2020-06-29 16:40:24 -07:00
Andy Wilkinson
5475f10657 Remove WebClient's in-memory buffer size limit for endpoint tests
Previously, the thread dump endpoint's response could exceed
WebClient's in-memory buffer limt when there were a large number of
threads or the threads had large stacks.

This commit disables WebClient's in-memory buffer size limit so that
the test passing is not dependent on the number of active threads and
their stack sizes.

Closes gh-22101
2020-06-25 10:21:43 +01:00
Scott Frederick
b27303704f Fix RedisReactiveHealthIndicator in clustered configuration
Prior to Spring Data Redis version 2.2.8, the contents of the
Properties object returned from the
ReactiveRedisConnection.ServerCommands.info API were the same
for clustered and non-clustered Redis configurations, containing a set
of key/value pairs. This allowed ReactiveRedisHealthIndicator to get
a version property using a well-known key. Starting with Spring Data
Redis 2.2.8, the info property keys contain a host:port prefix in a
clustered Redis configuration. This prevented
ReactiveRedisHealthIndicator from getting the version property as
before and resulted in the health always being reported as DOWN.

This commit adjusts ReactiveRedisHealthIndicator to detect the
clustered configuration from Spring Data Redis and find the version
property for one of the reported cluster nodes.

Fixes gh-22061
2020-06-24 13:34:22 -05:00
Andy Wilkinson
3fed27fd90 Merge branch '2.1.x' into 2.2.x
Closes gh-22085
2020-06-24 10:17:57 +01:00
Andy Wilkinson
0b4533659f Use Groovy's bom in spring-boot-dependencies
Closes gh-22084
2020-06-24 10:17:06 +01:00
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