Commit Graph

10107 Commits (4827e84a121ac5844d9ec1516eaa22fa67a1ccd5)

Author SHA1 Message Date
Andy Wilkinson da319f5f59 Merge branch '2.2.x' into 2.3.x
Closes gh-22249
4 years ago
Andy Wilkinson 14f24dbecc Merge branch '2.1.x' into 2.2.x
Closes gh-22248
4 years ago
Andy Wilkinson 26f591264c Fix handling of NestedServletException with no root cause
Fixes gh-22169
4 years ago
dreis2211 507eb9498b Use Class.getDeclaredConstructor().newInstance()
See gh-21913
4 years ago
Andy Wilkinson fbfb7df3e1 Merge branch '2.3.x'
Closes gh-22247
4 years ago
Andy Wilkinson 24e1a1dddf Merge branch '2.2.x' into 2.3.x
Closes gh-22246
4 years ago
Andy Wilkinson a8d3f9af31 Polish "Rename NoneOfNestedConditions to NoneNestedConditions in example docs"
See gh-22207
4 years ago
Clayton Walker 7fee70a625 Rename NoneOfNestedConditions to NoneNestedConditions in example docs
See gh-22207
4 years ago
Andy Wilkinson 7864a7da52 Polish "Remove redundant bitwise operations"
See gh-22212
4 years ago
XenoAmess de46d4bfd3 Remove redundant bitwise operations
See gh-22212
4 years ago
XenoAmess 7c73ed69e1 Use valueOf rather than parseInt as result is assigned to an int
See gh-22209
4 years ago
Andy Wilkinson 3c7f54b97f Polish "Remove redundant close() call from JarResourceManagerTests"
See gh-22213
4 years ago
XenoAmess 623b3ab96e Remove redundant close() call from JarResourceManagerTests
See gh-22213
4 years ago
Andy Wilkinson cd8081f952 Polish "Use new ArrayList(Collection) rather than new and addAll"
See gh-22211
4 years ago
XenoAmess fb70c529d4 Use new ArrayList(Collection) rather than new and addAll
See gh-22211
4 years ago
XenoAmess 90d8480ffe Use new ArrayList(Collection) rather than new, iterate, and add
See gh-22210
4 years ago
XenoAmess 66dc24062f Fix typos in test code
See gh-22218
4 years ago
Andy Wilkinson 2a9193f6d9 Merge branch '2.3.x'
Closes gh-22244
4 years ago
Andy Wilkinson 96e6b74894 Merge branch '2.2.x' into 2.3.x
Closes gh-22243
4 years ago
Andy Wilkinson a0f1424393 Polish "Fix unwrapping of captured PrintStream in test support's OutputCapture"
See gh-22214
4 years ago
XenoAmess 75a64bd901 Fix unwrapping of captured PrintStream in test support's OutputCapture
See gh-22214
4 years ago
Andy Wilkinson b627918011 Polish "Optionally ignore routing data sources when creating DB health indicators"
See gh-22222
4 years ago
Julio Gomez Diaz 13d1d2393d Optionally ignore routing data sources when creating DB health indicators
See gh-22222
4 years ago
Andy Wilkinson 523dd937cd Merge branch '2.3.x'
Closes gh-22238
4 years ago
Andy Wilkinson 28128a9577 Add support for ChronoUnit.WEEKS when using PeriodUnit
Fixes gh-22225
4 years ago
Andy Wilkinson 0141f554b8 Merge branch '2.3.x' 4 years ago
Andy Wilkinson d1f074858e Correct class name of StringToPeriodConverterTests 4 years ago
Andy Wilkinson aca609c4c5 Merge branch '2.3.x'
Closes gh-22235
4 years ago
Andy Wilkinson 2007490ce7 Merge branch '2.2.x' into 2.3.x
Closes gh-22234
4 years ago
Andy Wilkinson 4301580095 Improve testing of PropertyPlaceholderAutoConfiguration
Since Spring Framework 4.3.0.RC2, a default embedded value resolver
has been registered with the bean factory when one is not otherwise
configured. This meant that placeholders in `@Value` would be resolved
with or without PropertyPlaceholderAutoConfiguration defining a
PropertySourcesPlaceholderConfigurer bean. However, placeholders in
bean definitions would only be resolved if a
PropertySourcesPlaceholderConfigurer was defined.

This commit updates PropertyPlaceholderAutoConfigurationTests to align
with this change in Framework. We now test that placeholders are
resolved in `@Value` annotations with or without the auto-configuration
and that placeholders in bean definitions are only resolved with the
auto-configured.

Closes gh-22230
4 years ago
Andy Wilkinson 6331a27822 Merge branch '2.3.x'
Closes gh-22228
4 years ago
anshlykov 683a7a851f Update to Maven Shade Plugin 3.2.4
See gh-22227
4 years ago
Andy Wilkinson b356bc830d Merge branch '2.3.x' 4 years ago
Andy Wilkinson dfea2f432a Polish
See gh-21921
4 years ago
Brian Clozel 3f93978e99 Merge branch '2.3.x'
Closes gh-22215
4 years ago
Brian Clozel 86d8366ee2 Polish support for reactive Elasticsearch healthcheck
Fixes gh-21042
4 years ago
Aleksander Lech 203878a16f Add support for reactive Elasticsearch healthcheck
Prior to this commit, configuring a reactive Elasticsearch client would
auto-configure an Actuator Health check using a synchronous client, with
the default configuration properties (so tarting localhost:9200).

This would lead to false reports of unhealthy Elasticsearch clusters
when using reactive clients.

This commit reproduces the logic for MongoDB repositories: if a reactive
variant is available, it is selected for the health check
infrastructure.

See gh-21042
4 years ago
Andy Wilkinson ecbc8ea2df Merge branch '2.3.x'
Closes gh-22202
4 years ago
Andy Wilkinson 79770b9615 Use source sets to determine configurations deprecated for resolution
Fixes gh-22200
4 years ago
Andy Wilkinson ecc50d179d Merge branch '2.3.x'
Closes gh-22198
4 years ago
Andy Wilkinson f6b3666b16 Merge branch '2.2.x' into 2.3.x
Closes gh-22197
4 years ago
Andy Wilkinson 21453b5016 Ignore scoped targets when finding matching beans
Fixes gh-22038
4 years ago
Andy Wilkinson 81d6751ba7 Use ApplicationContextRunner in ConditionalOnSingleCandidateTests 4 years ago
Andy Wilkinson d85774ea77 Merge branch '2.3.x'
Closes gh-22196
4 years ago
Eddú Meléndez 54e0a61b42 Reinstate metrics for Kafka Streams
See gh-21921
4 years ago
Andy Wilkinson d64337013f Upgrade to Spring Kafka 2.5.3.RELEASE
Closes gh-22185
4 years ago
Andy Wilkinson 9360ba168b Upgrade to Reactor Dysprosium-SR9
Closes gh-21938
4 years ago
Andy Wilkinson a13acf9f2b Upgrade to Reactor Dysprosium-SR9
Closes gh-21937
4 years ago
Andy Wilkinson 160d8e49e3 Merge branch '2.3.x'
Closes gh-22180
4 years ago
Andy Wilkinson 9317135690 Improve error handling when builder image isn't a builder
Fixes gh-22179
4 years ago
Andy Wilkinson 8c341df73b Polish "Add properties to control exceptions ignored by LdapTemplate"
See gh-21289
4 years ago
Filip Hrisafov 6853320661 Add properties to control exceptions ignored by LdapTemplate
See gh-21289
4 years ago
dreis2211 20debcd471 Remove redundant deprecation suppression
See gh-22178
4 years ago
Andy Wilkinson 568f41e8e2 Merge branch '2.3.x'
Closes gh-22176
4 years ago
Andy Wilkinson 0e1ded6893 Merge branch '2.2.x' into 2.3.x
Closes gh-22175
4 years ago
dreis2211 8c0e302f2e Accept empty filter dispatcher types in auto-configurations
Prior to this commit, the usage of EnumSet.copyOf resulted in exceptions when
the underlying collection was empty.

See gh-22138
4 years ago
Andy Wilkinson 6da52a0d08 Suggest iso-offset as value for WebFlux time and date-time properties
Closes gh-22174
4 years ago
Andy Wilkinson 9230ea4ab7 Polish "Support iso-offset for date-time and time formatting with MVC"
See gh-21630
4 years ago
Gaurav Pareek c3b1172aea Support iso-offset for date-time and time formatting with MVC
See gh-21630
4 years ago
Andy Wilkinson bb1a0ffbd5 Merge branch '2.3.x'
Closes gh-22173
4 years ago
Andy Wilkinson 4566ac5c25 Add package info to o.s.b.autoconfigure.elasticsearch.rest
Closes gh-22147
4 years ago
Andy Wilkinson 4ea07f432d Merge branch '2.3.x'
Closes gh-22168
4 years ago
Andy Wilkinson 75fc140e2d Merge branch '2.2.x' into 2.3.x
Closes gh-22167
4 years ago
Andy Wilkinson 3922fb7164 Polish "Avoid NPE when binder is closed before started event"
See gh-22141
4 years ago
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
4 years ago
Andy Wilkinson 62aa8ce107 Support incremental annotation processing with Gradle
Closes gh-22150
4 years ago
Andy Wilkinson 27c458ca26 Merge branch '2.3.x'
Closes gh-22160
4 years ago
Andy Wilkinson f86831da9c Use TCCL at time of access for resource loading
Fixes gh-22119
4 years ago
Madhura Bhave 255f8197ab Merge branch '2.3.x'
Closes gh-22156
4 years ago
Madhura Bhave f19f2b8714 Merge branch '2.2.x' into 2.3.x
Closes gh-22155
4 years ago
May c1b9d3c226 Simplify logic in ErrorPage's equals method
See gh-22082
4 years ago
Madhura Bhave 75abb9cc18 Merge branch '2.3.x'
Closes gh-22153
4 years ago
Johnny Lim 43aee1bddd Polish
See gh-22090
4 years ago
Madhura Bhave a963bba0e4 Merge branch '2.3.x' 4 years ago
Madhura Bhave 62f5e44324 Fix typo 4 years ago
Madhura Bhave fbf2beef6e Merge branch '2.3.x'
Closes gh-22152
4 years ago
Madhura Bhave 7a81cea513 Update layers.idx file example in docs
Fixes gh-21510
4 years ago
Andy Wilkinson d33a01a13f Only create effective bom artifact when needed
Closes gh-22143
4 years ago
Andy Wilkinson c000ccdaea Upgrade to Spring Session 2020.0.0-M1
Closes gh-21928
4 years ago
Andy Wilkinson 77eb5f7794 Polish "Add StatsD transport protocol configuration option"
See gh-22125
4 years ago
Lee Dobryden 5d41f60e45 Add StatsD transport protocol configuration option
See gh-22125
4 years ago
Kedar Joshi 6c29b29bd5 Upgrade to Flyway 6.5.0 and support createSchemas
See gh-22120
4 years ago
Andy Wilkinson f6400e95ee Switch to a RuntimeException as NPE has a message on Java 15
Closes gh-22136
4 years ago
Andy Wilkinson 12add61504 Upgrade to WebJars Locator Core 0.46
Closes gh-22135
4 years ago
Andy Wilkinson 9d7cea0286 Upgrade to Spring Kafka 2.5.3.RELEASE
Closes gh-22134
4 years ago
Andy Wilkinson 872ccddd52 Upgrade to Oracle Database 19.7.0.0
Closes gh-22133
4 years ago
Andy Wilkinson c91565b412 Upgrade to Micrometer 1.5.2
Closes gh-22132
4 years ago
Andy Wilkinson ee5e35f3fd Upgrade to MariaDB 2.6.1
Closes gh-22131
4 years ago
Andy Wilkinson 8c974c0480 Upgrade to Jackson Bom 2.11.1
Closes gh-22130
4 years ago
Andy Wilkinson d2a53e4811 Upgrade to Hazelcast 3.12.8
Closes gh-22129
4 years ago
Andy Wilkinson 46b10fd46f Upgrade to Spring AMQP 2.3.0-M1
Closes gh-22127
4 years ago
Andy Wilkinson c18896ed5a Upgrade to Spring Batch 4.3.0-M1
Closes gh-22126
4 years ago
Andy Wilkinson 7c1a8c1041 Drop back to Spring Security 5.4.0-M1
See gh-21932
4 years ago
Andy Wilkinson 742ac877c6 Upgrade to Spring Integration 5.4.0-M1
Closes gh-21931
4 years ago
Scott Frederick a73af52496 Merge branch '2.3.x'
Closes gh-22121
4 years ago
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
4 years ago
Madhura Bhave c3ddfcdbf5 Trim trailing whitespace from value of logging.config
Closes gh-22078
4 years ago
Andy Wilkinson d12b6b3a86 Disable LogbackLoggingSystem's XML support when spring.xml.ignore=true
Closes gh-22106
4 years ago
Andy Wilkinson 308e337009 Polish "Disable XML reader when spring.xml.ignore is true"
See gh-22093
4 years ago
Sébastien Deleuze 8d5cf79675 Disable XML reader when spring.xml.ignore is true
This commit allows to set the XmlBeanDefinitionReader field from
BeanDefinitionLoader to null in a way that allows the GraalVM native
compiler to remove it from the native image when the spring.xml.ignore
flag introduced by spring-projects/spring-framework#25151
is set to true.

The purpose of this change is to allow smaller footprint on native
images without requiring to use GraalVM native substitutions
which are unmaintainable by nature and also to increase the consistency
between JVM and native images.

In order to effective, this optimization requires BeanDefinitionLoader
class to be initialized at build time.

See gh-22093
4 years ago
Andy Wilkinson ea30c096dd Polish 16263e3
See gh-22105
4 years ago
Andy Wilkinson 263adf1cde Upgrade to Spring Data Bom 2020.0.0-M1
Closes gh-21930
4 years ago
Andy Wilkinson 6cdd8942e7 Upgrade to Spring Framework 5.3.0-M1
Closes gh-21929
4 years ago
Andy Wilkinson 920e961f9b Upgrade to Reactor Bom 2020.0.0-M1
Closes gh-21927
4 years ago
Andy Wilkinson 16263e342c Move bean definition counting only used in tests into test code
Closes gh-22105
4 years ago
Andy Wilkinson fe78be240a Merge branch '2.3.x'
Closes gh-22103
4 years ago
Andy Wilkinson a2f7ce0564 Merge branch '2.2.x' into 2.3.x
Closes gh-22102
4 years ago
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
4 years ago
Scott Frederick 3b587449a6 Provide cluster info in RedisReactiveHealthIndicator
This commit changes the information provided by
RedisReactiveHealthIndicator to include cluster details when Spring
Data Redis detects that Redis is running in a clustered configuration.
This brings the reactive and non-reactive Redis health indicators
into alignment.

Fixes gh-21514
4 years ago
Scott Frederick dba8ca2848 Merge branch '2.3.x'
Closes gh-22095
4 years ago
Scott Frederick 72f37c41fb Merge branch '2.2.x' into 2.3.x
Fixes gh-22061 in 2.3.2
4 years ago
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
4 years ago
Andy Wilkinson c3aa494ba3 Start building against Spring Session 2020.0.0-M1 snapshots
See gh-21928
4 years ago
Andy Wilkinson a92d64cb80 Start building against Spring Security 5.4.0-M2 snapshots
See gh-21932
4 years ago
Andy Wilkinson c54918e46d Start building against Spring Integration 5.4.0-M1 snapshots
See gh-21931
4 years ago
Andy Wilkinson 360d44ac04 Restrict JLine version to 2.11 to avoid breaking changes in 2.12+
Closes gh-22072
4 years ago
Andy Wilkinson 9b26c67627 Merge branch '2.3.x'
Closes gh-22088
4 years ago
Andy Wilkinson fc2e3770de Merge branch '2.2.x' into 2.3.x
Closes gh-22087
4 years ago
Andy Wilkinson 3fed27fd90 Merge branch '2.1.x' into 2.2.x
Closes gh-22085
4 years ago
Andy Wilkinson 0b4533659f Use Groovy's bom in spring-boot-dependencies
Closes gh-22084
4 years ago
Andy Wilkinson 63e1e7365e Upgrade to Testcontainers 1.14.3
Closes gh-22076
4 years ago
Andy Wilkinson 549f6abc9a Upgrade to MockK 1.10.0
Closes gh-22075
4 years ago
Andy Wilkinson 5e7917e33a Upgrade to Maven Shade Plugin 3.2.4
Closes gh-22074
4 years ago
Andy Wilkinson 66b84ac7e6 Upgrade to Maven Resolver 1.4.2
Closes gh-22073
4 years ago
Andy Wilkinson ae4ebbe685 Upgrade to Commons Compress 1.20
Closes gh-22071
4 years ago
Andy Wilkinson 6215336602 Upgrade to Testcontainers 1.14.3
Closes gh-22069
4 years ago
Andy Wilkinson 345d33c6a1 Upgrade to Maven Shade Plugin 3.2.4
Closes gh-22068
4 years ago
Andy Wilkinson 2d779adca6 Upgrade to Maven Resolver 1.4.2
Closes gh-22067
4 years ago
Andy Wilkinson 4c0d2686ad Merge branch '2.3.x'
Closes gh-22066
4 years ago
Andy Wilkinson 12d3f14e15 Use bom plugin to configure spring-boot-parent
Closes gh-21439
4 years ago
Phillip Webb efe84356b7 Merge branch '2.3.x'
Closes gh-22064
4 years ago
Phillip Webb 03b0a373ab Merge branch '2.2.x' into 2.3.x
Closes gh-22063
4 years ago
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
4 years ago
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
4 years ago
Phillip Webb 301ec12a0c Merge branch '2.3.x' 4 years ago
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
4 years ago
Andy Wilkinson 5ec7745b96 Upgrade to SQLite JDBC 3.32.3
Closes gh-22058
4 years ago
Andy Wilkinson 1d44eb68b7 Upgrade to Jetty Reactive HTTPClient 1.1.4
Closes gh-22057
4 years ago
Andy Wilkinson b65f7f2b31 Upgrade to Jakarta Servlet 4.0.4
Closes gh-22056
4 years ago
Andy Wilkinson 5de7919a56 Upgrade to Hibernate 5.4.18.Final
Closes gh-22055
4 years ago
Andy Wilkinson 06de6625f8 Upgrade to Byte Buddy 1.10.12
Closes gh-22054
4 years ago
Phillip Webb 82ed255bb1 Merge branch '2.3.x'
Closes gh-22060
4 years ago
Phillip Webb 9843888714 Merge branch '2.2.x' into 2.3.x
Closes gh-22059
4 years ago
Phillip Webb 3b3a49db1f Polish 'Fix infinite loop in FieldValues'
See gh-22040
4 years ago
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
4 years ago
Andy Wilkinson a6784e3bea Upgrade to Cassandra Driver 4.7.2
Closes gh-22052
4 years ago
Andy Wilkinson 96f748949d Starting building against Spring Data 2020.0.0 snapshots
See gh-21930
4 years ago
Andy Wilkinson 0d6ea79007 Start building against Spring Framework 5.3.0 snapshots
See gh-21929
4 years ago
Andy Wilkinson a0946c8923 Start building against Reactor 2020.0.0 snapshots
See gh-21927
4 years ago
Andy Wilkinson 632d9bab21 Merge branch '2.3.x'
Closes gh-22048
4 years ago
Andy Wilkinson 73aa8f1434 Enforce spring-boot-parent's platform dependencies
Closes gh-22047
4 years ago
Scott Frederick 39b2d01541 Merge branch '2.3.x'
Closes gh-22037
4 years ago
dreis2211 a6e8561391 Catch more generic FileSystemException in NamedPipeSocket
See gh-22035
4 years ago
Stephane Nicoll 51e9a5dae0 Merge branch '2.3.x'
Closes gh-22029
4 years ago
Johnny Lim b218a89862 Remove Javadoc throw for ConfigurationPropertyName.ofIfValid()
See gh-22018
4 years ago
Stephane Nicoll ea63984f93 Merge branch '2.3.x'
Closes gh-22024
4 years ago
Stephane Nicoll d5385a7b64 Merge branch '2.2.x' into 2.3.x
Closes gh-22023
4 years ago
Stephane Nicoll 9b803af3c3 Polish "Document how to exclude an annotation processor with Maven"
See gh-22000
4 years ago
Marco Pens 627c0b1031 Document how to exclude an annotation processor with Maven
See gh-22000
4 years ago
Andy Wilkinson ca76b60de2 Merge branch '2.3.x'
Closes gh-22021
4 years ago
Andy Wilkinson 136c9b1af8 Merge branch '2.2.x' into 2.3.x
Closes gh-22020
4 years ago
Andy Wilkinson c37fd865c0 Merge branch '2.3.x'
Closes gh-22019
4 years ago
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
4 years ago
Andy Wilkinson 41173f7c40 Polish "Use Awaitility instead of Thread.sleep"
See gh-21988
4 years ago
Tomek Szmytka c13385ea74 Use Awaitility instead of Thread.sleep
See gh-21988
4 years ago
Scott Frederick 73b737c7d8 Merge branch '2.3.x'
Closes gh-22017
4 years ago
Scott Frederick 28643e4d2d Validate image references before passing to CNB builder
Prior to this commit, an image name or run image name derived from
the project name or provided by the user would be passed to the CNB
builder without validation by the Maven plugin build-image goal or
Gradle plugin bootBuildImage task. This could lead to error messages
from the plugins that are difficult to understand and diagnose.

This commit makes parsing of the image names more strict, based on
the grammar implemented by the Docker go library. This provides
validation of the image names before passing them to the builder,
with a more descriptive error message when parsing and validation
fails.

Fixes gh-21495
4 years ago
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
4 years ago
Andy Wilkinson 01c270d54b Merge branch '2.3.x'
Closes gh-22011
4 years ago
Andy Wilkinson ce907b129c Merge branch '2.2.x' into 2.3.x
Closes gh-22010
4 years ago
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
4 years ago
Andy Wilkinson cd47bece7f Merge branch '2.3.x'
Closes gh-22009
4 years ago
Andy Wilkinson 8a7c32fff7 Prevent oauth2-oidc-sdk from downgrading json-smart in Maven projects
Fixes gh-21939
4 years ago
Stephane Nicoll f0f8424191 Merge branch '2.3.x'
Closes gh-22008
4 years ago
dreis2211 855d596c2a Use lazy lambda instead of explicit argument
See gh-21986
4 years ago
Andy Wilkinson f3220b16fe Merge branch '2.3.x' 4 years ago
Andy Wilkinson 8f7d71ca11 Merge branch '2.2.x' into 2.3.x 4 years ago
Andy Wilkinson 907b64a5eb Remove redundant stop() calls from LiveReloadServerTests 4 years ago
Madhura Bhave f47e06c4ef Merge branch '2.3.x'
Closes gh-22007
4 years ago
Madhura Bhave f4ad30c448 Merge branch '2.2.x' into 2.3.x
Closes gh-22006
4 years ago
Madhura Bhave 615cf63a82 Make MockBean resolve right type for abstract test class
Fixes gh-20916
4 years ago
Andy Wilkinson 57b9286c84 Merge branch '2.3.x' 4 years ago
Andy Wilkinson 2d1dffa3ad Correct additions to spring-boot-starter-parent's pom
Following the fix for gh-21989, spring-boot-starter-parent no longer
contains an <issueManagement> element. As a result the additional
content was no longer being added to the pom. This commit updates
the additions so that they are now added after the <scm> element
that is still present.

See gh-21989
4 years ago
Andy Wilkinson 22fd2005b4 Remove plugin management for Flatten Maven Plugin
Closes gh-21984
4 years ago
Andy Wilkinson 9e08490522 Merge branch 'gh-21271'
Closes gh-21271
4 years ago
Andy Wilkinson 753bea64c6 Enable varargs compilation warnings
See gh-21271
4 years ago
Andy Wilkinson 9636350b0b Enable rawtypes compilation warnings
See gh-21271
4 years ago
Andy Wilkinson 056d5f3120 Enable deprecation compilation warnings
See gh-21271
4 years ago
Andy Wilkinson c64649a6d9 Enable unchecked compilation warnings
See gh-21271
4 years ago
Andy Wilkinson 47874d8c6a Treat warnings as errors when compiling
See gh-21271
4 years ago
Andy Wilkinson 0f1ada5e29 Upgrade to Undertow 2.1.3.Final
Closes gh-21983
4 years ago
Andy Wilkinson 2e54da04e2 Upgrade to Tomcat 9.0.36
Closes gh-21982
4 years ago
Andy Wilkinson 8115619021 Upgrade to Spring Retry 1.3.0
Closes gh-21981
4 years ago
Andy Wilkinson c00e751910 Upgrade to Spring Kafka 2.5.2.RELEASE
Closes gh-21980
4 years ago
Andy Wilkinson 37c9d13946 Upgrade to Spring Batch 4.2.4.RELEASE
Closes gh-21979
4 years ago
Andy Wilkinson dfd32e7a54 Upgrade to Spring AMQP 2.2.7.RELEASE
Closes gh-21978
4 years ago
Andy Wilkinson 030a01192d Upgrade to SendGrid 4.6.0
Closes gh-21977
4 years ago
Andy Wilkinson f1a7730698 Upgrade to Selenium HtmlUnit 2.41.0
Closes gh-21976
4 years ago
Andy Wilkinson 9000f047bd Upgrade to RSocket 1.0.1
Closes gh-21975
4 years ago
Andy Wilkinson aad6c3d6c9 Upgrade to R2DBC Bom Arabba-SR5
Closes gh-21974
4 years ago
Andy Wilkinson 9db3f9adbf Upgrade to Postgresql 42.2.14
Closes gh-21973
4 years ago
Andy Wilkinson 5fd2b85b48 Upgrade to Oracle Database 19.6.0.0
Closes gh-21972
4 years ago
Andy Wilkinson 5365e41e4c Upgrade to OkHttp3 3.14.9
Closes gh-21971
4 years ago
Andy Wilkinson 0bb7b0f243 Upgrade to OAuth2 OIDC SDK 7.5
Closes gh-21970
4 years ago
Andy Wilkinson 909b7db6f1 Upgrade to Netty tcNative 2.0.31.Final
Closes gh-21969
4 years ago
Andy Wilkinson 7ed98bcde8 Upgrade to Netty 4.1.50.Final
Closes gh-21968
4 years ago
Andy Wilkinson 9241e488e8 Upgrade to Neo4j OGM 3.2.12
Closes gh-21967
4 years ago
Andy Wilkinson 914af4a9f0 Upgrade to MongoDB 4.0.4
Closes gh-21966
4 years ago
Andy Wilkinson 1266738522 Upgrade to Maven War Plugin 3.3.0
Closes gh-21965
4 years ago
Andy Wilkinson 40c9029e3c Upgrade to Log4j2 2.13.3
Closes gh-21964
4 years ago
Andy Wilkinson 5bb661c95f Upgrade to Liquibase 3.10.0
Closes gh-21963
4 years ago
Andy Wilkinson 87afd8dc62 Upgrade to Lettuce 5.3.1.RELEASE
Closes gh-21962
4 years ago
Andy Wilkinson 4345c1c9fb Upgrade to Kotlin Coroutines 1.3.7
Closes gh-21961
4 years ago
Andy Wilkinson 9fa4e92fbb Upgrade to Johnzon 1.2.7
Closes gh-21960
4 years ago
Andy Wilkinson 07cd868ca5 Upgrade to Jetty 9.4.30.v20200611
Closes gh-21959
4 years ago
Andy Wilkinson 2cc950065a Upgrade to Jetty Reactive HTTPClient 1.1.3
Closes gh-21958
4 years ago
Andy Wilkinson 43a7a4af13 Upgrade to Jersey 2.31
Closes gh-21957
4 years ago
Andy Wilkinson 1fa41ee4ee Upgrade to Jaybird 3.0.9
Closes gh-21956
4 years ago
Andy Wilkinson 0d48b049d9 Upgrade to Javax Money 1.1
Closes gh-21955
4 years ago
Andy Wilkinson 73e00ee929 Upgrade to InfluxDB Java 2.19
Closes gh-21954
4 years ago
Andy Wilkinson 78a72bb6c3 Upgrade to HtmlUnit 2.41.0
Closes gh-21953
4 years ago
Andy Wilkinson 262554a65b Upgrade to Hibernate 5.4.17.Final
Closes gh-21952
4 years ago
Andy Wilkinson 1fdabbc5f7 Upgrade to Groovy 2.5.12
Closes gh-21951
4 years ago
Andy Wilkinson 06eda713ee Upgrade to Flyway 6.4.4
Closes gh-21950
4 years ago
Andy Wilkinson 0e0b6c98e0 Upgrade to Elasticsearch 7.7.1
Closes gh-21948
4 years ago
Andy Wilkinson 9bbad6fb25 Upgrade to Dropwizard Metrics 4.1.9
Closes gh-21947
4 years ago
Andy Wilkinson d4c5f54f11 Upgrade to Couchbase Client 3.0.5
Closes gh-21946
4 years ago
Andy Wilkinson c366afea6e Upgrade to Caffeine 2.8.4
Closes gh-21945
4 years ago
Andy Wilkinson d914a6f713 Upgrade to Byte Buddy 1.10.11
Closes gh-21944
4 years ago
Andy Wilkinson 3435f5ea3b Upgrade to Awaitility 4.0.3
Closes gh-21943
4 years ago
Andy Wilkinson 1ed5bc72fd Upgrade to Artemis 2.13.0
Closes gh-21942
4 years ago
Andy Wilkinson 07fb4b065d Merge branch '2.3.x'
Closes gh-21940
4 years ago
Andy Wilkinson 0de466e06e Require dependency on s-b-dependencies to use its constraints
Previously, Spring Boot's modules published Gradle Module Metadata
(GMM) the declared a platform dependency on spring-boot-dependencies.
This provided versions for each module's own dependencies but also had
they unwanted side-effect of pulling in spring-boot-dependencies
constraints which would influence the version of other dependencies
declared in the same configuration. This was undesirable as users
should be able to opt in to this level of dependency management, either
by using the dependency management plugin or by using Gradle's built-in
support via a platform dependency on spring-boot-dependencies.

This commit reworks how Spring Boot's build uses
spring-boot-dependencies and spring-boot-parent to provide its own
dependency management. Configurations that aren't seen by consumers are
configured to extend a dependencyManagement configuration that has an
enforced platform dependency on spring-boot-parent. This enforces
spring-boot-parent's version constraints on Spring Boot's build without
making them visible to consumers. To ensure that the versions that
Spring Boot has been built against are visible to consumers, the
Maven publication that produces pom files and GMM for the published
modules is configured to use the resolved versions from the module's
runtime classpath.

Fixes gh-21911
4 years ago
Stephane Nicoll e30b8bf742 Start building against Reactor Dysprosium-SR9 snapshots
See gh-21938
4 years ago
Stephane Nicoll 58974ab9cf Start building against Reactor Dysprosium-SR9 snapshots
See gh-21937
4 years ago
Scott Frederick 838cfc529f Merge branch '2.3.x'
Closes gh-21933
4 years ago
Scott Frederick 6119d69679 Add runImage option for image building
This commit adds a runImage property to the Maven plugin build-image
goal and the Gradle bootBuildImage task. The property allows the user
to override the run image reference provided in the builder metadata
with an alternate run image. The runImage property can be specified
in the build file or on the command line.

Fixes gh-21534
4 years ago
Stephane Nicoll 164a992d6e Fix assertion for startup info format
See gh-21926
4 years ago
Brian Clozel 33b61e698e Merge branch '2.3.x' 4 years ago
Brian Clozel a480f6e2ee Polish 4 years ago
Brian Clozel e438864ad9 Merge branch '2.3.x'
Closes gh-21925
4 years ago
Brian Clozel af2666df79 Fix welcome page support in WebFlux
Prior to this commit, the welcome page support implemented in gh-9785
would override existing index views in both annotation and functional
variants.

This comes from the fact that the feature was implemented as a
`RouterFunction` configured in the main `RouterFunctionMapping` bean.
Due to ordering issues between mappings, this would override existing
application mappings in some cases.

This commit ensures that the welcome page `RouterFunction` is
contributed to the context in its own handler mapping, ordered after the
application ones.

Fixes gh-21909
4 years ago
Stephane Nicoll e87c3193ce Polish "Add Java 15 CI"
See gh-21713
4 years ago
dreis2211 3d27391d47 Allow StringSequence.isEmpty() to be compatible with JDK 15
JDK 15 introduces isEmpty() on CharSequence which clashes with the one
declared in StringSequence because it is not public.

See gh-21713
4 years ago
dreis2211 cf3cd0be48 Use Class.getName() as fallback in HandlerFunctionDescription
In JDK 15 the concept of hidden classes was introduced, which also
affects Lambdas in so far that Class.getCanonicalName() will return null
for those. This commit uses Class.getName() as a fallback when no
canonical name is available.

See gh-21713
4 years ago
Stephane Nicoll 9e2902130c Polish 4 years ago
Stephane Nicoll bf96b0c57b Polish "Add support for webAdminPassword property of H2 Console"
See gh-21533
4 years ago
Radek Koubsky 1d40234737 Add support for webAdminPassword property of H2 Console
See gh-21533
4 years ago
Stephane Nicoll 35e069e2cd Polish "Add health indicator for Cassandra that uses the CqlSession"
See gh-20887
4 years ago
Alexandre Dutra dad9ec86d5 Add health indicator for Cassandra that uses the CqlSession
This commit provides a CassandraDriverHealthIndicator and
CassandraDriverReactiveHealthIndicator that do not require Spring Data.
As a result, a health indicator for Cassandra is provided even if the
application does not use Spring Data.

See gh-20887
4 years ago
Stephane Nicoll ce4ef5ed81 Merge branch '2.3.x'
Closes gh-21918
4 years ago
Stephane Nicoll 7500f0f22d Add section about Kafka metrics support
Closes gh-21910
4 years ago
Stephane Nicoll 554971d29b Merge branch '2.3.x'
Closes gh-21917
4 years ago
Stephane Nicoll ee250e058a Merge branch '2.2.x' into 2.3.x
Closes gh-21916
4 years ago
Stephane Nicoll ec8c1e3860 Update copyright year of changed files
See gh-21906
4 years ago
lltx de897b9b72 Fix wrong property reference to keys-to-sanitize in Javadoc
See gh-21906
4 years ago
Stephane Nicoll 631a5dddd1 Merge branch '2.3.x'
Closes gh-21915
4 years ago
Stephane Nicoll 676cd10dbf Fix encoding of @Bean in reference documentation
Closes gh-21908
4 years ago
Phillip Webb 9eb251a8f3 Merge branch '2.3.x'
Closes gh-21904
4 years ago
Phillip Webb 1604545727 Ensure AvailabilityChangeEvent carries generics
Update `AvailabilityChangeEvent` to be a `PayloadEvent` and ensure
that the `getResolvableType` method returns a generic compatible
result.

Prior to this commit, a ClassCastExeption would be thrown if the
following event listener was declared:

  @EventListener
  void onEvent(AvailabilityChangeEvent<ReadinessState> event) {
    ...
  }

Closes gh-21898
4 years ago
Phillip Webb bb7936a000 Merge branch '2.3.x'
Closes gh-21896
5 years ago
Phillip Webb 069d2769f4 Reinstate disabled Reactor Netty test
Reinstate test now that we are on a reactor-netty releases that fixes
reactor/reactor-netty issue 1093.

Closes gh-21437
5 years ago
Phillip Webb 82abcd3043 Merge branch '2.3.x' 5 years ago
Phillip Webb 2a37b2e258 Refine PropertiesLauncher close logic
Further attempt to fix Windows file issues.

See gh-21575
5 years ago
Phillip Webb 3892f4402a Merge branch '2.3.x'
Closes gh-21895
5 years ago
Phillip Webb 1e7da4d3ca Allow digest builder references
Update `BuildRequest` to also allow digest based references.

Closes gh-21879
5 years ago
Phillip Webb 866ebf7c13 Merge branch '2.3.x' 5 years ago
Phillip Webb 8a249daf1a Refactor PropertiesLauncher so jars can be closed
Refactor the internals of `PropertiesLauncher` so that opened jar files
are tracked and can be closed after a test completes.

See gh-21575
5 years ago
Madhura Bhave fc9760ba49 Merge branch '2.3.x'
Closes gh-21894
5 years ago
dreis2211 469dfc285b Fix deprecation in NettyRSocketServerFactoryTests
See gh-21872
5 years ago
Scott Frederick 9d9a501b17 Merge branch '2.3.x'
Closes gh-21892
5 years ago
Scott Frederick 7a2939f129 Use non-blocking I/O for Docker API
This commit changes the NamedPipeSocket used for communication with
a local Docker daemon to use a non-blocking AsynchronousByteChannel
instead of a blocking RandomAccessFile, modeled after a similar
change to the docker-java project. This eliminates the potential for
a blocking call to hang indefinitely.

Fixes gh-21672
5 years ago
Andy Wilkinson 6ac100583c Merge branch '2.3.x'
Closes gh-21891
5 years ago
Andy Wilkinson d347346a93 Upgrade to Spring Asciidoctor Extensions 0.4.3.RELEASE
Pick up the workaround for the AsciidoctorJ bug that prevents the
configprops macro's attributes from being parsed. The lack of parsing
meant that the envvar format was being lost and properties were being
written in the canonical form instead.

Closes gh-21794
5 years ago
Stephane Nicoll f8a0ca0d80 Upgrade to Netty Tcnative 2.0.31.Final
Closes gh-21889
5 years ago
Stephane Nicoll ca44e83279 Merge branch '2.3.x'
Closes gh-21802
5 years ago
Stephane Nicoll ca5afb6e90 Fix flaky integration test
Closes gh-21487
5 years ago
Stephane Nicoll a74afc104c Upgrade to Spring Batch 4.2.4
Closes gh-21784
5 years ago
Stephane Nicoll 9af5f70b75 Upgrade to Spring Batch 4.2.4
Closes gh-21783
5 years ago
Stephane Nicoll cbd5b77fa4 Upgrade to Spring Data Neumann-SR1
Closes gh-21776
5 years ago
Stephane Nicoll 122f5afd42 Upgrade to Spring Integration 5.3.1
Closes gh-21779
5 years ago
Stephane Nicoll 760aec3136 Upgrade to Spring Kafka 2.5.2
Closes gh-21782
5 years ago
Stephane Nicoll e64bfb80e4 Upgrade to Postgresql 42.2.14
Closes gh-21888
5 years ago
Stephane Nicoll 664436a3d6 Upgrade to Spring Kafka 2.3.9
Closes gh-21781
5 years ago
Stephane Nicoll 49ba5dc6bc Upgrade to Postgresql 42.2.14
Closes gh-21887
5 years ago
Stephane Nicoll c496f2401f Upgrade to Netty Tcnative 2.0.31.Final
Closes gh-21886
5 years ago
Stephane Nicoll 7dee9e34b5 Upgrade to Spring Kafka 2.2.14
Closes gh-21780
5 years ago
Phillip Webb 087c62d34b Merge branch '2.3.x' 5 years ago
Phillip Webb 3b71403b99 Merge branch '2.2.x' into 2.3.x 5 years ago
Phillip Webb ac197be815 Fix checkstyle issue 5 years ago
Phillip Webb aecd13bb9b Merge branch '2.3.x' 5 years ago
Phillip Webb 7e5d6bafa8 Merge branch '2.2.x' into 2.3.x 5 years ago
Phillip Webb 3f36f6ea47 Rollback to Spring Batch 4.2.2
See gh-21885
5 years ago
Phillip Webb 02bfc9d30a Polish 5 years ago
Madhura Bhave f96a2f2b83 Merge branch '2.3.x'
Closes gh-21881
5 years ago
Madhura Bhave 83485e625d Merge branch '2.2.x' into 2.3.x
Closes gh-21880
5 years ago
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
5 years ago
Madhura Bhave 92ce94b3d8 Align default log levels for Log4j2 and Logback
Fixes gh-21293
5 years ago
Scott Frederick 9ae6816785 Merge branch '2.3.x'
Closes gh-21874
5 years ago
Scott Frederick 7a793a11fb Merge branch '2.2.x' into 2.3.x
Fixes gh-21036 in 2.3.1
5 years ago