Commit Graph

28160 Commits

Author SHA1 Message Date
XenoAmess 89d4cda855 Remove duplicated icon from git-repo-windows resource definition
See gh-22163
2020-06-30 16:25:32 +01:00
Andy Wilkinson 75fc140e2d Merge branch '2.2.x' into 2.3.x
Closes gh-22167
2020-06-30 14:09:57 +01:00
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
Andy Wilkinson f86831da9c Use TCCL at time of access for resource loading
Fixes gh-22119
2020-06-30 10:51:13 +01:00
Madhura Bhave f19f2b8714 Merge branch '2.2.x' into 2.3.x
Closes gh-22155
2020-06-29 17:08:37 -07: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 affb2da07a Merge branch '2.2.x' into 2.3.x 2020-06-29 16:41:26 -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
Madhura Bhave 550ff443df Merge pull request #22090 from izeye
* pr/22090:
  Polish

Closes gh-22090
2020-06-29 16:35:43 -07:00
Johnny Lim 43aee1bddd Polish
See gh-22090
2020-06-29 16:35:23 -07:00
Madhura Bhave 62f5e44324 Fix typo 2020-06-29 16:29:09 -07:00
Madhura Bhave 7a81cea513 Update layers.idx file example in docs
Fixes gh-21510
2020-06-29 16:25:23 -07:00
Scott Frederick 9a083584b8 Improve validation of layertools input
This commit improves the validation performed on the user
input provided to the layertools jarmode to provide more
clear error messages when the input is not correct and
reduce the chance of ambiguity.

Fixes gh-22042
2020-06-26 11:51:07 -05:00
Andy Wilkinson a2f7ce0564 Merge branch '2.2.x' into 2.3.x
Closes gh-22102
2020-06-25 10:32:32 +01: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 72f37c41fb Merge branch '2.2.x' into 2.3.x
Fixes gh-22061 in 2.3.2
2020-06-24 13:37:16 -05: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 fc2e3770de Merge branch '2.2.x' into 2.3.x
Closes gh-22087
2020-06-24 10:52:55 +01: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
Andy Wilkinson 6215336602 Upgrade to Testcontainers 1.14.3
Closes gh-22069
2020-06-23 10:50:18 +01:00
Andy Wilkinson 345d33c6a1 Upgrade to Maven Shade Plugin 3.2.4
Closes gh-22068
2020-06-23 10:50:17 +01:00
Andy Wilkinson 2d779adca6 Upgrade to Maven Resolver 1.4.2
Closes gh-22067
2020-06-23 10:50:15 +01:00
Andy Wilkinson 12d3f14e15 Use bom plugin to configure spring-boot-parent
Closes gh-21439
2020-06-23 10:43:59 +01:00
Phillip Webb 03b0a373ab Merge branch '2.2.x' into 2.3.x
Closes gh-22063
2020-06-22 23:15:48 -07: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 f296f57401 Rename ImageReferenceParser to Regex
Rename `ImageReferenceParser` to `Regex` and remove state. The regular
expressions are now used directly by the `ImageName` and
`ImageReference` classes with the values accessed directly from the
`Matcher`.

See gh-21495
2020-06-22 22:36:46 -07:00
Phillip Webb 9843888714 Merge branch '2.2.x' into 2.3.x
Closes gh-22059
2020-06-22 12:14:35 -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
Andy Wilkinson 73aa8f1434 Enforce spring-boot-parent's platform dependencies
Closes gh-22047
2020-06-22 09:59:21 +01:00
Scott Frederick d5e667f286 Merge pull request #22035 from dreis2211
* gh-22035:
  Catch more generic FileSystemException in NamedPipeSocket

Closes gh-22035
2020-06-19 15:41:43 -05:00
dreis2211 a6e8561391 Catch more generic FileSystemException in NamedPipeSocket
See gh-22035
2020-06-19 15:41:20 -05:00
Stephane Nicoll f961043f36 Merge pull request #22018 from izeye
* pr/22018:
  Remove Javadoc throw for ConfigurationPropertyName.ofIfValid()

Closes gh-22018
2020-06-19 14:15:10 +02:00
Johnny Lim b218a89862 Remove Javadoc throw for ConfigurationPropertyName.ofIfValid()
See gh-22018
2020-06-19 14:14:57 +02:00
Stephane Nicoll d5385a7b64 Merge branch '2.2.x' into 2.3.x
Closes gh-22023
2020-06-19 11:37:52 +02: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 136c9b1af8 Merge branch '2.2.x' into 2.3.x
Closes gh-22020
2020-06-19 08:23:15 +01:00
Andy Wilkinson 1e97ff834e Only consider current context when finding lifecycle processor
Previously, LifecycleAutoConfiguration would check the current context
and all of its ancestors for a lifecycle processor bean, only
configuring a custom processor if one was not found. Every context
has a lifecycle processor so this check meant that lifecycle processing
timeout could not be customized in any context with a parent.

This commit updates the auto-configuration to only check the current
context.

Closes gh-22014
2020-06-19 08:19:57 +01: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