Commit Graph

10380 Commits

Author SHA1 Message Date
Stephane Nicoll 92d088f33f Start building against Spring Data Neumann-SR6 snapshots
See gh-24283
2020-12-07 17:39:09 +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
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
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 bb7ad30de4 Fix ErrorAttributeOptions#getIncludes Javadoc
See gh-24257
2020-11-26 09:00:52 +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 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 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 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 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 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
Stephane Nicoll dea12f7551 Merge branch '2.2.x' into 2.3.x
Closes gh-24185
2020-11-17 21:36:34 +01:00
izeye b17895844d Provide dependency management for elasticsearch-rest-client-sniffer
See gh-24173
2020-11-17 21:32:37 +01:00
Scott Frederick da2276e7d4 Use stable builder and run images in integration tests
Fixes gh-24183
2020-11-17 13:54:10 -06:00
Sergey Kolesnikov b341b478a6 Rename "sla" to "slo" in reference documentation
See gh-24160
2020-11-16 07:20:23 +01:00
Stephane Nicoll 8311edf722 Upgrade to Neo4j OGM 3.2.18
Closes gh-24125
2020-11-12 07:15:26 +01:00
Stephane Nicoll 79835dc20f Upgrade to Netty 4.1.54.Final
Closes gh-24124
2020-11-12 07:08:37 +01:00
Andy Wilkinson 3e243de41b Merge branch '2.2.x' into 2.3.x
Closes gh-24121
2020-11-11 20:16:39 +00:00
dreis2211 033c78b945 Fix link to Flyway callback docs
See gh-24119
2020-11-11 20:14:08 +00:00
Andy Wilkinson e35c8e0214 Upgrade to Micrometer 1.5.7
Closes gh-24050
2020-11-11 19:33:12 +00:00
Andy Wilkinson 6507175d35 Upgrade to Spring Kafka 2.5.8.RELEASE
Closes gh-24075
2020-11-11 19:30:09 +00:00
Andy Wilkinson 0053fb7871 Upgrade to Spring Integration 5.3.4.RELEASE
Closes gh-24096
2020-11-11 19:28:49 +00:00
Andy Wilkinson 4a630dc7a9 Only skip ..-prefixed locations when found via wildcard
Closes gh-23983
2020-11-11 15:36:39 +00:00
Andy Wilkinson e8a1c3b9f8 Start building against Spring Integration 5.3.4 snapshots
See gh-24096
2020-11-11 09:16:30 +00:00
Andy Wilkinson 85cb5d4b3b Upgrade to Reactor Dysprosium-SR14
Closes gh-24109
2020-11-11 09:14:21 +00:00
Andy Wilkinson e6ab20b029 Merge branch '2.2.x' into 2.3.x
Closes gh-24111
2020-11-10 17:37:41 +00:00
Andy Wilkinson 31042bfc49 Test inclusion of system scope dependencies in repackaged war
Closes gh-22503
2020-11-10 17:35:04 +00:00
Stephane Nicoll afe721bc34 Start building against Reactor Dysprosium-SR14 snapshots
See gh-24109
2020-11-10 18:00:10 +01:00
Stephane Nicoll 9e901b6e07 Upgrade to Testcontainers 1.15.0
Closes gh-24103
2020-11-10 16:24:16 +01:00