Andy Wilkinson
6036cde7a3
Merge pull request #27409 from dreis2211
...
* gh-27409:
Remove redundant deprecation suppressions
Closes gh-27409
2021-07-20 14:54:15 +01:00
dreis2211
f0df9671cd
Remove redundant deprecation suppressions
...
See gh-27409
2021-07-20 14:53:28 +01:00
Andy Wilkinson
5783caabd7
Upgrade to Spring AMQP 2.3.10
...
Closes gh-27392
2021-07-20 13:14:48 +01:00
Andy Wilkinson
47289de332
Upgrade to Spring Kafka 2.7.4
...
Closes gh-27165
2021-07-20 13:14:07 +01:00
Andy Wilkinson
9d2cb162e6
Configure initializer dependencies grouped by detector
...
Previously, database initializers were detected and were configured
with dependencies based on their detection order. For example, if
detectors a, b, and c detected initializers a1, b1, b2, and c1,
c1 would depend on b2, b2 on b1, and b1 on a1:
------ ------ ------ ------
| c1 | --> | b2 | --> | b1 | --> | a1 |
------ ------ ------ ------
This could cause a dependency cycle in certain situations, for
example because the user had already configured b1 to depend on b2.
This commit reduces the risk of a cycle being created by batching
the initializers by their detector, with dependencies being
configured between each batch rather than between every initializer.
In the example above, this results in c1 depending on b1 and b2,
and b1 and b2 depending on a1:
------
------ | b1 | ------
| c1 | --> | | --> | a1 |
------ | b2 | ------
------
As b1 and b2 were detected by the same detector, no dependency
between those initializers is defined.
Closes gh-27131
2021-07-19 20:00:59 +01:00
Andy Wilkinson
cfed99dff5
Merge branch '2.4.x' into 2.5.x
2021-07-19 17:46:54 +01:00
Andy Wilkinson
9d64269552
Upgrade to Logback 1.2.4
...
Closes gh-27380
2021-07-19 17:16:28 +01:00
Andy Wilkinson
9973937af3
Upgrade to Spring AMQP 2.3.10
...
Closes gh-27391
2021-07-19 17:15:50 +01:00
Andy Wilkinson
b354188bd8
Upgrade to Spring Data 2021.0.3
...
Closes gh-27164
2021-07-19 11:15:11 +01:00
Andy Wilkinson
6c8e040089
Upgrade to Netty 4.1.66.Final
...
Closes gh-27390
2021-07-19 11:13:59 +01:00
Andy Wilkinson
ff31dffb0b
Upgrade to jOOQ 3.14.13
...
Closes gh-27389
2021-07-19 11:13:58 +01:00
Andy Wilkinson
67739d9126
Upgrade to Jetty Reactive HTTPClient 1.1.10
...
Closes gh-27388
2021-07-19 11:13:56 +01:00
Andy Wilkinson
db6ab63a38
Upgrade to Jedis 3.6.2
...
Closes gh-27387
2021-07-19 11:13:55 +01:00
Andy Wilkinson
f6e4e0b299
Upgrade to Infinispan 12.1.7.Final
...
Closes gh-27386
2021-07-19 11:13:54 +01:00
Andy Wilkinson
b4c3d00bd0
Upgrade to Dropwizard Metrics 4.1.25
...
Closes gh-27385
2021-07-19 11:13:52 +01:00
Andy Wilkinson
0ffafae375
Upgrade to AppEngine SDK 1.9.90
...
Closes gh-27384
2021-07-19 11:13:51 +01:00
Andy Wilkinson
c9ccfcc25f
Rework Jetty10Http2OverTlsTests so they compile with Java 8
...
Closes gh-27382
2021-07-19 11:06:58 +01:00
Andy Wilkinson
46b3d1e47b
Merge branch '2.4.x' into 2.5.x
2021-07-19 10:48:31 +01:00
Andy Wilkinson
3e0829cd47
Upgrade to Spring Data 2020.0.11
...
Closes gh-27161
2021-07-19 10:30:49 +01:00
Andy Wilkinson
d8959f4bb2
Upgrade to Netty 4.1.66.Final
...
Closes gh-27381
2021-07-19 10:30:49 +01:00
Andy Wilkinson
47afdc0218
Upgrade to jOOQ 3.14.13
...
Closes gh-27379
2021-07-19 10:20:14 +01:00
Andy Wilkinson
f8e3d86223
Upgrade to Dropwizard Metrics 4.1.25
...
Closes gh-27378
2021-07-19 10:20:12 +01:00
Andy Wilkinson
1d3b0d6262
Upgrade to AppEngine SDK 1.9.90
...
Closes gh-27377
2021-07-19 10:20:11 +01:00
Andy Wilkinson
96111514e1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27369
2021-07-16 15:46:27 +01:00
Andy Wilkinson
06a3c40506
Use a 10s init query timeout in Cassandra tests
...
Closes gh-27368
2021-07-16 15:45:49 +01:00
Andy Wilkinson
36a4b775d7
Merge pull request #27366 from dreis2211
...
* gh-27366:
Add CI pipeline for JDK 17
Closes gh-27366
2021-07-16 15:09:42 +01:00
dreis2211
056f817ba2
Add CI pipeline for JDK 17
...
See gh-27366
2021-07-16 15:07:35 +01:00
Andy Wilkinson
530d17cf7e
Merge pull request #27328 from dreis2211
...
* gh-27328:
Disable Gradle plugin tests that fail on JDK 17
Closes gh-27328
2021-07-16 11:43:28 +01:00
dreis2211
be38ce3645
Disable Gradle plugin tests that fail on JDK 17
...
See gh-27328
2021-07-16 11:42:51 +01:00
Andy Wilkinson
1e09ef1db3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27361
2021-07-16 09:43:33 +01:00
Andy Wilkinson
fe081b1742
Add Gson converter immediately before default Jackson converter
...
Previously, when the preferred json mapper was set to Gson, the Gson
HTTP message converter was added before any other converters. This
changed the form of String responses that were already valid. When
Jackson is in use, a string converter is used as it appears earlier
in the list than the Jackson converter. When the mapper is switched
to Gson, the Gson converter is added first in the list of converters
and the Strong converter is no longer used. This results in the
String, that was already valid JSON, being converted again. This
changes its form as quotes are escaped, etc.
This commit updates HttpMessageConverters so that the Gson converter
is added to the list immediately before the default Jackson
converter. This is done by considering the Gson converter to be an
equivalent of the Jackson converter.
Fixes gh-27354
2021-07-16 09:04:46 +01:00
Madhura Bhave
5b927bdf9f
Merge pull request #27357 from anvithabs
...
* pr/27357:
Fix reference to a configuration property in cloud.adoc
Closes gh-27357
2021-07-15 16:15:38 -07:00
anvithabs
e48efa158b
Fix reference to a configuration property in cloud.adoc
...
See gh-27357
2021-07-15 16:14:55 -07:00
Andy Wilkinson
74527db743
Merge branch '2.4.x' into 2.5.x
2021-07-15 20:20:11 +01:00
Andy Wilkinson
2f54198e31
Merge pull request #27348 from izeye
...
* gh-27348:
Remove Flyway references from DependsOn BFPPs for Liquibase
Closes gh-27348
2021-07-15 20:19:26 +01:00
izeye
198e40c72e
Remove Flyway references from DependsOn BFPPs for Liquibase
...
See gh-27348
2021-07-15 20:18:27 +01:00
Andy Wilkinson
c8c784bd5c
Allow @SpyBean to be used to spy on a Spring Data repository
...
Fixes gh-7033
2021-07-15 19:44:52 +01:00
Andy Wilkinson
62695f76f7
Provide complete dependency management for Prometheus's Pushgateway
...
Fixes gh-27349
2021-07-15 19:26:25 +01:00
Andy Wilkinson
d4159130a5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27346
2021-07-15 11:50:51 +01:00
Andy Wilkinson
7a23a12ce0
Fix configprops endpoint's handling of config tree values
...
Fixes gh-27327
2021-07-15 11:50:40 +01:00
Stephane Nicoll
765b1ae060
Merge branch '2.4.x' into 2.5.x
2021-07-15 10:03:17 +02:00
Stephane Nicoll
c7c1ba929a
Upgrade Ubuntu version in CI images
...
Closes gh-27336
2021-07-15 10:02:28 +02:00
Stephane Nicoll
2d3006171d
Merge branch '2.3.x' into 2.4.x
2021-07-15 09:48:52 +02:00
Stephane Nicoll
d1b242e6c8
Upgrade Ubuntu version in CI images
...
Closes gh-27337
2021-07-15 09:48:33 +02:00
Stephane Nicoll
235e48683c
Upgrade Ubuntu version in CI images
...
Closes gh-27335
2021-07-15 09:45:21 +02:00
Stephane Nicoll
7ab316ea0e
Merge branch '2.4.x' into 2.5.x
2021-07-15 09:02:06 +02:00
Stephane Nicoll
39626fa4e7
Upgrade to Spring HATEOAS 1.3.3
...
Closes gh-27184
2021-07-15 09:00:17 +02:00
Stephane Nicoll
8268c21158
Upgrade to Micrometer 1.7.2
...
Closes gh-27342
2021-07-15 08:58:14 +02:00
Stephane Nicoll
1c69789ca4
Upgrade to Lettuce 6.1.4.RELEASE
...
Closes gh-27341
2021-07-15 08:58:12 +02:00
Stephane Nicoll
8694b67744
Upgrade to Spring HATEOAS 1.2.8
...
Closes gh-27183
2021-07-15 08:51:42 +02:00