Commit Graph

11605 Commits

Author SHA1 Message Date
Stephane Nicoll 2770326356 Upgrade to DB2 JDBC 11.5.5.0
Closes gh-24383
2020-12-08 05:20:46 +01:00
Stephane Nicoll ad079bf58a Upgrade to Caffeine 2.8.7
Closes gh-24382
2020-12-08 05:20:44 +01:00
Stephane Nicoll df405e1636 Upgrade to Reactor 2020.0.2
Closes gh-24275
2020-12-08 05:13:20 +01:00
Stephane Nicoll f84cb1b765 Upgrade to Reactor Dysprosium-SR15
Closes gh-24274
2020-12-08 05:07:59 +01:00
Stephane Nicoll 07a1ef3604 Upgrade to Reactor Dysprosium-SR15
Closes gh-24273
2020-12-08 05:05:33 +01:00
Stephane Nicoll 0df3797c37 Upgrade to Spring Security 5.4.2
Closes gh-24297
2020-12-08 04:30:12 +01:00
Stephane Nicoll 4fa460d4a5 Start building against Spring Kafka 2.6.4 snapshots
See gh-24294
2020-12-08 04:30:12 +01:00
Stephane Nicoll eabcc81b03 Start building against Spring Batch 4.3.1 snapshots
See gh-24291
2020-12-08 04:30:11 +01:00
Stephane Nicoll 013d8ed990 Start building against Spring AMQP 2.3.2 snapshots
See gh-24288
2020-12-08 04:30:11 +01:00
Stephane Nicoll f3ae8d9e8e Start building against Spring HATEOAS 1.2.2 snapshots
See gh-24285
2020-12-08 04:30:10 +01:00
Scott Frederick d61724aada Add @Name support for Kotlin value object binding
Fixes gh-24379
2020-12-07 18:51:42 -06:00
Stephane Nicoll 64d4648ad1 Upgrade to Spring Security 5.3.6
Closes gh-24296
2020-12-07 17:42:46 +01:00
Stephane Nicoll 9b4cf0c2fc Start building against Spring Kafka 2.5.10 snapshots
See gh-24293
2020-12-07 17:42:17 +01:00
Stephane Nicoll 4d29098e6a Start building against Spring Batch 4.2.5 snapshots
See gh-24290
2020-12-07 17:41:35 +01:00
Stephane Nicoll c17442c37b Start building against Spring AMQP 2.2.13 snapshots
See gh-24287
2020-12-07 17:40:53 +01:00
Stephane Nicoll 92d088f33f Start building against Spring Data Neumann-SR6 snapshots
See gh-24283
2020-12-07 17:39:09 +01:00
Stephane Nicoll 60523b07b9 Start building against Spring Kafka 2.3.13 snapshots
See gh-24292
2020-12-07 16:56:56 +01:00
Stephane Nicoll 4c07539a9f Start building against Spring Batch 4.2.5 snapshots
See gh-24289
2020-12-07 16:56:11 +01:00
Stephane Nicoll dab6d0a53f Start building against Spring AMQP 2.2.13 snapshots
See gh-24286
2020-12-07 16:55:43 +01:00
Stephane Nicoll 9ce919d6dc Start building against Spring Data Moore-SR12 snapshots
See gh-24282
2020-12-07 16:55:00 +01:00
Stephane Nicoll 6e040740c6 Upgrade to Tomcat 9.0.40
Closes gh-24375
2020-12-07 15:22:26 +01:00
Stephane Nicoll ddda80909e Upgrade to Jetty 9.4.35.v20201120
Closes gh-24374
2020-12-07 15:22:25 +01:00
Stephane Nicoll 9eeae227b0 Upgrade to HttpCore 4.4.14
Closes gh-24373
2020-12-07 15:22:23 +01:00
Stephane Nicoll c1ef49ae63 Upgrade to Hibernate 5.4.25.Final
Closes gh-24372
2020-12-07 15:22:22 +01:00
Stephane Nicoll 1e252ab382 Upgrade to Groovy 2.5.14
Closes gh-24371
2020-12-07 15:22:20 +01:00
Stephane Nicoll ae71111893 Upgrade to Dropwizard Metrics 4.1.16
Closes gh-24370
2020-12-07 15:22:19 +01:00
Stephane Nicoll dfae03704b Upgrade to DB2 JDBC 11.5.5.0
Closes gh-24369
2020-12-07 15:22:18 +01:00
Stephane Nicoll fa3723eb8b Upgrade to Caffeine 2.8.7
Closes gh-24368
2020-12-07 15:22:16 +01:00
Stephane Nicoll 530b3e79a4 Upgrade to Spring Security 5.2.8.RELEASE
Closes gh-24366
2020-12-07 12:27:49 +01:00
Stephane Nicoll cabe0ef28b Upgrade to Neo4j Ogm 3.2.18
Closes gh-24365
2020-12-07 12:27:48 +01:00
Stephane Nicoll 6779180a94 Upgrade to Infinispan 9.4.21.Final
Closes gh-24364
2020-12-07 12:27:47 +01:00
Stephane Nicoll 75059beac3 Upgrade to Hibernate 5.4.25.Final
Closes gh-24363
2020-12-07 12:27:46 +01:00
Stephane Nicoll aa87b788e2 Upgrade to Jetty 9.4.35.v20201120
Closes gh-24362
2020-12-07 12:27:44 +01:00
Stephane Nicoll 28cf851ed8 Upgrade to Groovy 2.5.14
Closes gh-24361
2020-12-07 12:27:43 +01:00
Stephane Nicoll 0ea2ab1005 Upgrade to Tomcat 9.0.40
Closes gh-24360
2020-12-07 12:27:42 +01:00
Stephane Nicoll 193e3e5e82 Upgrade to Httpcore 4.4.14
Closes gh-24359
2020-12-07 12:27:40 +01:00
Stephane Nicoll e06c106a4f Upgrade to Byte Buddy 1.10.18
Closes gh-24358
2020-12-07 12:27:39 +01:00
Stephane Nicoll e8f6f6be17 Upgrade to Netty 4.1.54.Final
Closes gh-24357
2020-12-07 12:27:38 +01:00
Stephane Nicoll 8498f402e5 Upgrade to Dropwizard Metrics 4.1.16
Closes gh-24356
2020-12-07 12:27:36 +01:00
Stephane Nicoll 7689609f81 Upgrade to Db2 Jdbc 11.5.5.0
Closes gh-24355
2020-12-07 12:27:35 +01:00
Stephane Nicoll cf51d80278 Upgrade to Appengine Sdk 1.9.83
Closes gh-24354
2020-12-07 12:27:34 +01:00
Stephane Nicoll 264ff95753 Upgrade to Caffeine 2.8.7
Closes gh-24353
2020-12-07 12:27:33 +01:00
Stephane Nicoll d8706cdcfe Upgrade to Jackson 2.10.5.20201202
Closes gh-24352
2020-12-07 12:27:31 +01:00
Stephane Nicoll aba4c20823 Upgrade to Couchbase Client 2.7.18
Closes gh-24351
2020-12-07 12:27:30 +01:00
Phillip Webb ff0725f6bf Fix HazelcastHealthIndicatorTests
See gh-24337
2020-12-05 07:52:53 -08:00
Phillip Webb 55ae5be84b Revert "Restore HazelcastHealthIndicatorTests"
This reverts commit 5a51b5853e.
2020-12-05 07:47:50 -08:00
Phillip Webb 5a51b5853e Restore HazelcastHealthIndicatorTests
Restore `HazelcastHealthIndicatorTests` which was accidentally replaced
with a version from 2.4.x.

See gh-24337
2020-12-05 07:28:08 -08:00
Phillip Webb 30c27274e2 Merge branch '2.3.x'
Closes gh-24339
2020-12-04 18:31:55 -08:00
Phillip Webb 5f351a6983 Merge branch '2.2.x' into 2.3.x
Closes gh-24338
2020-12-04 18:21:57 -08:00
Phillip Webb d8a05090b3 Fix checkstyle BDD Mockito violations
See gh-24337
2020-12-04 18:06:54 -08:00
Phillip Webb 837fc83527 Fix checkstyle header violations
See gh-24337
2020-12-04 18:05:53 -08:00
dreis2211 0389a07f7c Remove deprecated code in EndpointDiscoverer
See gh-24317
2020-12-03 16:59:29 -08:00
dreis2211 b9ec88a7a5 Fix Asciidoc build step
See gh-24326
2020-12-03 16:30:16 -08:00
Madhura Bhave 977140053b Merge pull request #24325 from dreis2211
* pr/24325:
  Remove System.out.println in DevToolsPropertyDefaultsPostProcessor

Closes gh-24325
2020-12-03 16:25:57 -08:00
dreis2211 faec47d332 Remove System.out.println in DevToolsPropertyDefaultsPostProcessor
See gh-24325
2020-12-03 16:25:03 -08:00
Madhura Bhave 13a5ec169c Merge pull request #24323 from dreis2211
* pr/24323:
  Remove deprecated ExposeExcludePropertyEndpointFilter

Closes gh-24323
2020-12-03 16:18:49 -08:00
dreis2211 3e2d0c6d86 Remove deprecated ExposeExcludePropertyEndpointFilter
See gh-24323
2020-12-03 16:18:35 -08:00
Madhura Bhave d041c7d6b9 Document the granularity for property document imports
Closes gh-22987
2020-12-03 12:17:53 -08:00
Madhura Bhave 932fb65107 Correct external application properties load order
Fixes gh-24308
2020-12-03 11:55:51 -08:00
Phillip Webb 3dc03ac275 Refine non-optional classpath location checking
Update `StandardConfigDataLocationResolver` to no longer check if
directories exist for classpath resources. Unfortunately checking for
the parent directory of a `ClassPathResource` isn't always possible
without resorting something similar to the
`PathMatchingResourcePatternResolver` which would add a lot of
complexity to the resolver.

In order to ensure that non-optional locations are always resolved,
the `ConfigDataEnvironment` now checks that all imported locations
have been loaded.

Closes gh-24143
2020-12-01 21:33:59 -08:00
Scott Frederick 01478a25b4 Handle wrapper types in Env actuator
This commit modifies the actuator `EnvironmentEndpoint` to allow
primitive wrapper types to be serialized in the response data
structure.

Fixes gh-24307
2020-12-01 15:12:13 -06:00
Stephane Nicoll bd7e89be1a Start building against Spring Framework 5.3.2 snapshots
See gh-24278
2020-11-30 17:18:35 +01:00
Stephane Nicoll 7c59d8a32f Start building against Reactor 2020.0.2 snapshots
See gh-24275
2020-11-30 17:17:27 +01:00
Stephane Nicoll 065fde2996 Start building against Spring Framework 5.2.12 snapshots
See gh-24277
2020-11-30 16:42:38 +01:00
Stephane Nicoll 5f81882305 Start building against Reactor Dysprosium-SR15 snapshots
See gh-24274
2020-11-30 16:41:32 +01:00
Stephane Nicoll 9763ba56ba Start building against Spring Framework 5.2.12 snapshots
See gh-24276
2020-11-30 16:04:27 +01:00
Stephane Nicoll afeb9f29d4 Start building against Reactor Dysprosium-SR15 snasphots
See gh-24273
2020-11-30 14:32:15 +01:00
Jim Stockwell 728e474f7f Mark OriginTrackedPropertiesLoader#isNewDocument private
See gh-24268
2020-11-27 09:16:01 +01:00
Stephane Nicoll e6ccbfb017 Merge branch '2.3.x'
Closes gh-24259
2020-11-26 09:02:33 +01:00
Jim Stockwell bb7ad30de4 Fix ErrorAttributeOptions#getIncludes Javadoc
See gh-24257
2020-11-26 09:00:52 +01:00
João Guerra 1d6bacf1c8 Fix typo
See gh-24245
2020-11-25 14:57:14 +01:00
Stephane Nicoll f248cfe79c Polish "Check that WebClient is available"
See gh-24152
2020-11-25 14:52:47 +01:00
Tobias Gesellchen f6255cc691 Check that WebClient is available
This commit reinstanties the isWeBClientPresent() check so that
WebTestClientContextCustomizer is only added if a web client is
available.

See gh-24152
2020-11-25 14:38:42 +01:00
Stephane Nicoll b1678ee6ad Merge branch '2.3.x'
Closes gh-24251
2020-11-25 14:36:16 +01:00
Stephane Nicoll 9b992af34b Merge branch '2.2.x' into 2.3.x
Closes gh-24250
2020-11-25 14:31:30 +01:00
Stephane Nicoll d506f0c73e Polish "Reduce redis health indicator info command result size"
See gh-24208
2020-11-25 14:27:07 +01:00
xJoeWoo 99cc3f4bfc Reduce redis health indicator info command result size
See gh-24208
2020-11-25 14:23:57 +01:00
Stephane Nicoll 8bcc3d1b09 Merge branch '2.3.x'
Closes gh-24234
2020-11-23 20:51:58 +01:00
Stephane Nicoll 016b69aa78 Polish "Allow to exclude an empty set of ErrorAttributes"
See gh-24230
2020-11-23 20:44:18 +01:00
Wanderlei Souza 6518f8f7fd Allow to exclude an empty set of ErrorAttributes
See gh-24230
2020-11-23 20:43:59 +01:00
Andy Wilkinson 11c81ad245 Merge branch '2.3.x'
Closes gh-24223
2020-11-20 11:48:51 +00:00
Andy Wilkinson 7efa1e47aa Merge branch '2.2.x' into 2.3.x
Closes gh-24222
2020-11-20 11:48:25 +00:00
Andy Wilkinson 12f2529be5 Allow actuator endpoint to have responses with custom HTTP statuses
Fixes gh-24123
2020-11-20 11:38:31 +00:00
Andy Wilkinson 1f3012b466 Merge branch '2.3.x'
Closes gh-24220
2020-11-20 11:36:45 +00:00
Andy Wilkinson 0ed7f7f40a Merge branch '2.2.x' into 2.3.x
Closes gh-24219
2020-11-20 11:36:31 +00:00
Andy Wilkinson 08b9d1da57 Polish "Ensure that MeterRegistry bean is defined before SI looks for it"
See gh-24095
2020-11-20 11:20:31 +00:00
Artem Bilan 7d712aaa2d Ensure that MeterRegistry bean is defined before SI looks for it
Previously, it was possible for Spring Integration, including its
built-in Micrometer support, to be auto-configured before the
Micrometer auto-configuration had defined the MeterRegistry bean. This
resulted in missing Spring Integration metrics.

Spring Integration is unusual in having its own built-in Micrometer
support that it configures itself. Rather than providing
auto-configuration for Integration's Micrometer support (Which isn't
needed), this commit introduces some auto-configuration that just
affects the ordering of the auto-configuration classes. This ordering
ensures that the MeterRegistry bean has been defined by Spring
Integration is auto-configured. This ensures that the MeterRegistry
bean is known to the BeanFactory when Spring Integration goes looking
for it.

See gh-24095
2020-11-20 11:18:09 +00:00
Andy Wilkinson 4a7bc3d096 Require bean name match for Locale(Context)Resolver to back off
Web MVC and WebFlux look up by name the Locale(Context)Resolver beans
that they use. Previously, the auto-configured resolvers for MVC and
WebFlux would back off when any bean of the required type was defined,
irrespective of its name. If the name of the user's bean didn't match
the name used by MVC and WebFlux to find the custom resolver, the
custom resolver would be ignored and MVC and WebFlux would use their
defaults. There was no indication of this happening in the condition
evaluation report as all it would show is that the auto-configured
resolver had backed off in favour of the custom resolver. It wouldn't
show anything to explain why the custom resolver had not been used.

This commit updates the auto-configured resolvers to be conditional
on a missing bean of the name required by MVC and WebFlux. If the
user then defines a custom resolver with a different name, the
condition evaluation report will show that the auto-configured
resolver remained as the bean name didn't match.

Fixes gh-24209
2020-11-20 10:35:30 +00:00
Madhura Bhave e342d7d262 Fix processing of line immediately after # in properties file
Fixes gh-24158
2020-11-18 11:33:37 -08:00
Stephane Nicoll c86ce27117 Use non deprecated properties to override web resources cache
Closes gh-24203
2020-11-18 17:40:35 +01:00
Andy Wilkinson 15c44aa45f Merge branch '2.3.x'
Closes gh-24200
2020-11-18 12:04:29 +00:00
Andy Wilkinson 988526bee9 Only attempt unwrapping of interfaces
Wrapper's isWrapperFor and unwrap methods both take a Class<?> target
but document that the target should be an interface. Prior to this
change, we were calling isWrapperFor with any Class<?> irrespective of
whether or not it was an interface. When using Oracle UCP each call
to isWrapperFor with an interface results in an exception stack trace
being logged.

This commit upates DataSourceUnwrapper to adhere to Wrapper's contract
by only calling isWrapperFor and unwrap with interfaces.

Fixes gh-24154
2020-11-18 11:35:11 +00:00
Stephane Nicoll f3afd8a0f4 Fix location of Spring LDAP and Spring Session properties
Closes gh-23558
2020-11-18 10:28:54 +01:00
Stephane Nicoll e708667fc0 Merge branch '2.3.x'
Closes gh-24194
2020-11-18 10:09:23 +01:00
Stephane Nicoll 76912d1952 Merge branch '2.2.x' into 2.3.x
Closes gh-24193
2020-11-18 10:09:03 +01:00
Stephane Nicoll d3440880c4 Polish "Avoid unnecessary pattern compilation in WebFluxTags"
See gh-24147
2020-11-18 09:58:03 +01:00
Peter Paul Bakker b22bb7ea04 Avoid unnecessary pattern compilation in WebFluxTags
See gh-24147
2020-11-18 09:58:03 +01:00
Phillip Webb 0ce3e7ec6b Protect against NPE caused by recursive calls
Update `SpringBootConfigurationFactory` so that it no longer attempts
to get a `LoggingSystem`.

The recent `LoggingSystem` update means makes use of the
`SpringFactoriesLoader` class to load candidate logging systems.
Unfortunately, the `SpringFactoriesLoader` class creates a `Logger`
which (when using Log4J2) causes `SpringBootConfigurationFactory` to
run. Calling `LoggingSystem.get` from `SpringBootConfigurationFactory`
results in a recursive call to `SpringFactoriesLoader` which hasn't
yet been fully initialized. We then see an NPE caused by a `null`
`cache`.

This update removes the call to `LoggingSystem.get` with the assumption
that it would never return `null` anyway.

Fixes gh-24163
2020-11-17 17:24:14 -08:00
Phillip Webb e8244d8d70 Add CharSequenceToObjectConverter support
Update `ApplicationConversionService` with support for converting
`CharSequence` source types by using existing `String` based converters.

The addition is primarily to allow `ConfigTreePropertySource` values
to be converted correctly.

Closes gh-24171
2020-11-17 13:19:10 -08:00
Stephane Nicoll e220536ddb Merge branch '2.3.x'
Closes gh-24186
2020-11-17 21:36:58 +01:00