Commit Graph

14204 Commits

Author SHA1 Message Date
Andy Wilkinson a5656e0932 Make @ConstructorBinding implict for config prop records
Closes gh-27216
2021-07-24 10:03:37 +01:00
Andy Wilkinson 3ff20ed4d9 Merge branch '2.5.x'
Closes gh-27485
2021-07-24 09:44:35 +01:00
Andy Wilkinson dead33a90a Merge branch '2.4.x' into 2.5.x
Closes gh-27484
2021-07-24 09:44:18 +01:00
Andy Wilkinson cff1827e27 Stabilize socketChannelClosedTriggersTunnelClose
Closes gh-27483
2021-07-24 09:43:41 +01:00
Andy Wilkinson 355226c21e Merge branch '2.5.x'
Closes gh-27474
2021-07-23 13:09:37 +01:00
Andy Wilkinson eaca9c7a83 Merge branch '2.4.x' into 2.5.x
Closes gh-27473
2021-07-23 13:09:27 +01:00
Andy Wilkinson ee07d6c3ca Increase response timeout for server-bound WebTestClients
Closes gh-27472
2021-07-23 13:06:25 +01:00
Andy Wilkinson dd7dd58f41 Merge branch '2.5.x'
Closes gh-27471
2021-07-23 11:02:43 +01:00
Andy Wilkinson 589a22eb0d Merge branch '2.4.x' into 2.5.x
Closes gh-27470
2021-07-23 11:02:24 +01:00
Andy Wilkinson 9e81fb3e38 Fix race condition in Jetty graceful shutdown tests
Some of the Jetty graceful shutdown tests were flaky due to the way
in which Jetty behaves when it is stopped.
Stopping the Jetty web server interrupts the thread that's handling
the active request. This initiates a race between the request-handling
thread which will decrement the number of active requests and the
main thread which expects an active request to cause the shutdown
result to be REQUESTS_ACTIVE. The test passes when the main thread
wins and fails as a request is active which it's checked. When the
request-handling thread wins the test fails as the count of active
requests has been deprecated before it is checked.

The blocking servlet that's used to stall a request and keep it
active needs to be updated to ignore the thread being interrupted
and continue waiting. This will ensure that a request remains active
until the main thread has checked the active request count and
determine the result of the shutdown.

Closes gh-27464
2021-07-23 10:30:17 +01:00
Phillip Webb 7e9ac39f0d Update copyright year of changed files 2021-07-22 09:50:37 -07:00
Phillip Webb 20a6073913 Polish 2021-07-22 09:50:17 -07:00
Andy Wilkinson c9361798be Merge branch '2.5.x'
Closes gh-27455
2021-07-22 11:42:45 +01:00
Andy Wilkinson 18b4898977 Polish "Fix deriving DataSources from custom type"
See gh-27453
2021-07-22 11:41:54 +01:00
saraswathy-krish d0e2823c49 Fix deriving DataSources from custom type
Eliminate the unsupported datasource property exception thrown
when trying to derive a datasource from an unknown datasource type.

See gh-27453
2021-07-22 11:41:54 +01:00
Andy Wilkinson 68c5f6cd30 Upgrade to Undertow 2.2.9.Final
Closes gh-27452
2021-07-22 10:05:59 +01:00
Andy Wilkinson 191bd8ca57 Upgrade to SLF4J 1.7.32
Closes gh-27451
2021-07-22 10:05:58 +01:00
Andy Wilkinson a279d42712 Upgrade to MySQL 8.0.26
Closes gh-27450
2021-07-22 10:05:57 +01:00
Andy Wilkinson 982d6c6097 Upgrade to Logback 1.2.4
Closes gh-27449
2021-07-22 10:05:55 +01:00
Andy Wilkinson 8044bd2424 Upgrade to Jedis 3.6.3
Closes gh-27448
2021-07-22 10:05:54 +01:00
Andy Wilkinson 3ca86435d1 Upgrade to Undertow 2.2.9.Final
Closes gh-27446
2021-07-22 09:05:30 +01:00
Andy Wilkinson aaf26245d5 Upgrade to SLF4J 1.7.32
Closes gh-27445
2021-07-22 09:05:29 +01:00
Andy Wilkinson 7fbfbfe21e Upgrade to MySQL 8.0.26
Closes gh-27444
2021-07-22 09:05:27 +01:00
Andy Wilkinson 37f690323f Polish
Closes gh-27432
2021-07-21 11:55:38 +01:00
Andy Wilkinson bb26b7bdf5 Polish
Closes gh-27431
2021-07-21 11:53:10 +01:00
izeye 734293d491 Polish
See gh-27418
2021-07-21 11:17:43 +01:00
Andy Wilkinson c211c971f1 Polishing
Closes gh-27429
2021-07-21 11:07:15 +01:00
Andy Wilkinson 4a533e14c3 Merge branch '2.4.x' into 2.5.x
Closes gh-27428
2021-07-21 11:06:40 +01:00
dreis2211 4d0c98011e Polishing
See gh-27417
2021-07-21 11:05:59 +01:00
Andy Wilkinson 91579158c3 Merge branch '2.5.x'
Closes gh-27425
2021-07-21 10:58:27 +01:00
Andy Wilkinson 29c83bfd76 Instantiate detectors with ClassLoader that discovered them
Fixes gh-27422
2021-07-21 10:57:30 +01:00
Andy Wilkinson 7e0fdb74f5 Merge branch '2.5.x'
Closes gh-27174
2021-07-20 19:15:22 +01:00
Andy Wilkinson dfe91be885 Upgrade to Spring Integration 5.5.2
Closes gh-27166
2021-07-20 19:14:21 +01:00
Andy Wilkinson 289ebef7da Merge branch '2.5.x'
Closes gh-27420
2021-07-20 18:00:21 +01:00
Andy Wilkinson a5e95ef4c8 Merge branch '2.4.x' into 2.5.x
Closes gh-27419
2021-07-20 17:59:53 +01:00
Andy Wilkinson b5587b053d Use ClassLoader that will load Yaml to check if it's present
Fixes gh-27133
2021-07-20 17:59:40 +01:00
Andy Wilkinson a05da3ae14 Merge branch '2.5.x'
Closes gh-27416
2021-07-20 15:14:44 +01:00
dreis2211 0ea3b9246a Add Java 17 to JavaVersion enum
See gh-26769
2021-07-20 15:12:50 +01:00
Andy Wilkinson 668f45f0e8 Polish "Make RabbitTemplateConfigurer's setters public"
See gh-27376
2021-07-20 14:59:24 +01:00
bono007 ce87928170 Make RabbitTemplateConfigurer's setters public
See gh-27376
2021-07-20 14:58:06 +01:00
Andy Wilkinson 6e7e72a481 Remove redundant deprecation suppressions
Closes gh-27415
2021-07-20 14:55:06 +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
Scott Frederick 9f001efa29 Adjust fat jar central directory to account for launch script
An upgrade to Apache Commons Compress allows the build plugins to write
the launch script to the fat jar as a proper preamble, making the file
compatible with more jar and zip tooling.

Fixes gh-22336
2021-07-19 15:02:42 -05:00
Andy Wilkinson b5ef5a2d90 Merge branch '2.5.x'
Closes gh-27408
2021-07-19 20:20:19 +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 8e7a6ceb44 Polish "Make dev tools' home directory configurable"
See gh-17924
2021-07-19 17:56:34 +01:00
sfeldstein b9dbfad473 Make dev tools' home directory configurable
This allows separate projects to keep their own settings where common
settings such as spring.* or server.* don't conflict.

See gh-17924
2021-07-19 17:56:34 +01:00
Andy Wilkinson 48db35bf8d Upgrade to Spring Kafka 2.8.0-M1
Closes gh-27177
2021-07-19 17:50:02 +01:00
Andy Wilkinson a1cf18a06a Upgrade to Spring AMQP 2.4.0-M1
Closes gh-27171
2021-07-19 17:49:28 +01:00
Andy Wilkinson f1e99649df Upgrade to Spring Security 5.6.0-M1
Closes gh-27173
2021-07-19 17:47:43 +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 26bedd6527 Upgrade to Spring Data 2021.1.0-M1
See gh-27170
2021-07-19 15:43:37 +01:00
Andy Wilkinson ed38ac6ff0 Polish "Add idle timeout property for Reactor Netty"
See gh-27371
2021-07-19 14:58:15 +01:00
Saraswathy Hariharakrishnan cbcd7b939b Add idle timeout property for Reactor Netty
See gh-27371
2021-07-19 14:49:08 +01:00
izeye 14d8c33125 Polish
See gh-27405
2021-07-19 14:45:47 +01:00
Andy Wilkinson 51fedd6528 Reinstate support for Hibernate < 5.5
See gh-27352
2021-07-19 13:52:40 +01:00
Andy Wilkinson 6d50e65572 Revert "Add support for InfluxDB 2.x"
This reverts commit 52fedb2bb4.

See gh-25891
2021-07-19 13:28:08 +01:00
Andy Wilkinson 4d30eb453f Adopt Hiberate's CamelCaseToUnderscoresNamingStrategy
Closes gh-27352
2021-07-19 13:19:49 +01:00
Andy Wilkinson 99ada4e386 Upgrade to Rabbit AMQP Client 5.13.0
Closes gh-27404
2021-07-19 12:45:53 +01:00
Andy Wilkinson 02c1ce0953 Upgrade to Netty 4.1.66.Final
Closes gh-27403
2021-07-19 12:45:51 +01:00
Andy Wilkinson bae0a081fe Upgrade to jOOQ 3.14.13
Closes gh-27402
2021-07-19 12:45:50 +01:00
Andy Wilkinson 3112d163ea Upgrade to Jedis 3.6.2
Closes gh-27401
2021-07-19 12:45:49 +01:00
Andy Wilkinson d37e79a7f2 Upgrade to Infinispan 12.1.7.Final
Closes gh-27400
2021-07-19 12:45:47 +01:00
Andy Wilkinson 5f537cca39 Upgrade to Hibernate 5.5.4.Final
Closes gh-27399
2021-07-19 12:45:45 +01:00
Andy Wilkinson 9082e16a25 Upgrade to Git Commit ID Plugin 4.9.9
Closes gh-27398
2021-07-19 12:45:43 +01:00
Andy Wilkinson 5bedfe414f Upgrade to Flyway 7.11.2
Closes gh-27397
2021-07-19 12:45:42 +01:00
Andy Wilkinson 521155c48f Upgrade to Dropwizard Metrics 4.2.3
Closes gh-27396
2021-07-19 12:45:40 +01:00
Andy Wilkinson 3409c13b0e Upgrade to Byte Buddy 1.11.8
Closes gh-27395
2021-07-19 12:45:39 +01:00
Andy Wilkinson e1623708bd Upgrade to AppEngine SDK 1.9.90
Closes gh-27394
2021-07-19 12:45:37 +01:00
Andy Wilkinson 069074e490 Make ConnectionNameStrategy publicly settable
See gh-26982
2021-07-19 11:57:47 +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 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
Scott Frederick a0b32251eb Split gradle test support into a separate module
See gh-25824
2021-07-16 12:52:39 -05:00
Andy Wilkinson d60191add2 Merge pull request #26258 from pirgeo
* gh-26258:
  Polish "Refine documentation"
  Refine documentation
  Polish "Add properties for Dynatrace metrics API v2 ingest with Micrometer"
  Add properties for Dynatrace metrics API v2 ingest with Micrometer

Closes gh-26258
2021-07-16 17:39:38 +01:00
Andy Wilkinson 21b3202ab2 Polish "Refine documentation"
See gh-26258
2021-07-16 17:17:57 +01:00
Georg Pirklbauer d0cd3ab1d3 Refine documentation
See gh-26258
2021-07-16 17:05:19 +01:00
Andy Wilkinson 3d581847e6 Merge branch '2.5.x'
Closes gh-27370
2021-07-16 15:46:39 +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 25234219ce Merge branch '2.5.x'
Closes gh-27365
2021-07-16 11:51:43 +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 43f1b98864 Polish "Add @WebServiceServerTest slice test support"
See gh-27091
2021-07-16 11:28:39 +01:00
Daniil Razorenov c897b1e689 Add @WebServiceServerTest slice test support
Add `@WebServiceServerTest` and related test auto-configuration to
allow slice testing of Spring Web Service server applications.

See gh-27091
2021-07-16 10:11:06 +01:00
Andy Wilkinson bc8ab6c755 Merge branch '2.5.x'
Closes gh-27362
2021-07-16 09:43:55 +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