Commit Graph

14831 Commits

Author SHA1 Message Date
Andy Wilkinson ad2d9c0ab1 Customize Cassandra's configuration to reduce container startup time
Closes gh-27524
2021-07-29 17:33:56 +01:00
Andy Wilkinson cdad8e2b7f Merge branch '2.5.x' 2021-07-29 17:28:38 +01:00
Andy Wilkinson 85054723f0 Reinstate GradleProjectBuilder for compatibility with JDK17-ea32
See gh-27521
2021-07-29 17:22:59 +01:00
Andy Wilkinson 23c4674352 Merge branch '2.5.x'
Closes gh-27522
2021-07-29 12:24:54 +01:00
Andy Wilkinson ca5af2d456 Test our Gradle plugin against Gradle 7.2-rc-1
Closes gh-27521
2021-07-29 12:05:14 +01:00
Andy Wilkinson 1bca2bbc85 Merge branch '2.5.x'
Closes gh-27511
2021-07-27 14:37:30 +01:00
Andy Wilkinson 30f63cc0cf Merge branch '2.4.x' into 2.5.x
Closes gh-27510
2021-07-27 14:37:16 +01:00
Andy Wilkinson ade922baec Stabilize LiveReloadServerTests
Closes gh-27503
2021-07-27 14:36:31 +01:00
Andy Wilkinson e265825653 Merge branch '2.5.x'
Closes gh-27506
2021-07-27 11:03:00 +01:00
Andy Wilkinson 08e26c97aa Merge branch '2.4.x' into 2.5.x
Closes gh-27505
2021-07-27 11:02:20 +01:00
Andy Wilkinson 031a036c9f Customize security filter registration in separate management context
Fixes gh-27372
2021-07-27 10:57:38 +01:00
Stephane Nicoll 6d0f5d5f21 Upgrade to Spring Integration 5.4.9
Closes gh-27500
2021-07-27 08:48:10 +02:00
Stephane Nicoll d31653e3c3 Upgrade to Spring Kafka 2.6.10
Closes gh-27501
2021-07-27 08:47:52 +02:00
Andy Wilkinson 4247131192 Start building against Spring Integration 5.4.9 snapshots
See gh-27500
2021-07-26 19:53:51 +01:00
Andy Wilkinson 04dc62904f Merge branch '2.4.x' into 2.5.x
Closes gh-27495
2021-07-26 15:23:17 +01:00
Andy Wilkinson 5d9da7206e Limit use of deprecated mainClassName in Gradle plugin tests
Closes gh-27320
2021-07-26 15:21:44 +01:00
Andy Wilkinson 11fc231cc9 Merge branch '2.5.x'
Closes gh-27491
2021-07-26 13:53:44 +01:00
Andy Wilkinson 1bf466702b Merge branch '2.4.x' into 2.5.x
Closes gh-27490
2021-07-26 13:53:31 +01:00
Andy Wilkinson 0326fa47b7 Make DataJpaTestSchemaCredentialsIntegrationTests create the schema
Closes gh-26106
2021-07-26 13:51:23 +01:00
Andy Wilkinson 621844abda Polish "Use MessageSource to interpolate bean validation messages"
See gh-17530
2021-07-26 12:10:15 +01:00
Dmytro Nosan bbb8367afb Use MessageSource to interpolate bean validation messages
See gh-17530
2021-07-26 12:10:15 +01:00
Andy Wilkinson ea9b155776 Remove dependency management for org.jboss:jboss-transaction-spi
Closes gh-26574
2021-07-26 11:43:43 +01:00
Andy Wilkinson 5163bdab22 Merge branch '2.5.x'
Closes gh-27489
2021-07-26 11:26:39 +01:00
Andy Wilkinson a71d19bce7 Merge branch '2.4.x' into 2.5.x
Closes gh-27488
2021-07-26 11:26:08 +01:00
Andy Wilkinson 388068cdff Polish "Sanitize URIs with non-alpha characters in their schemes"
See gh-27482
2021-07-26 11:13:58 +01:00
Billy Tobon bafa9c4784 Sanitize URIs with non-alpha characters in their schemes
See gh-27482
2021-07-26 11:03:18 +01:00
Andy Wilkinson 681df90d33 Generate metadata for records using implicit constructor binding
Closes gh-27216
2021-07-26 09:43:32 +01:00
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
Madhura Bhave cdd80e660a Merge branch '2.5.x' into main
Closes gh-27358
2021-07-15 16:16:31 -07:00
anvithabs e48efa158b Fix reference to a configuration property in cloud.adoc
See gh-27357
2021-07-15 16:14:55 -07:00
Madhura Bhave 7bae960d78 Polish "Support comma-separated basePackage values in EntityScan"
See gh-27355
2021-07-15 15:42:42 -07:00
Saraswathy Hariharakrishnan 00b9a8811d Support comma-separated basePackage values in EntityScan
See gh-27355
2021-07-15 15:41:50 -07:00
izeye 198e40c72e Remove Flyway references from DependsOn BFPPs for Liquibase
See gh-27348
2021-07-15 20:18:27 +01:00
Andy Wilkinson 3e0baf1bfd Merge branch '2.5.x'
Closes gh-27353
2021-07-15 19:45:32 +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 969ca71af3 Update version property for Prometheus to reflect its scope
Closes gh-27350
2021-07-15 19:31:49 +01:00
Andy Wilkinson 13fc16b29b Merge branch '2.5.x'
Closes gh-27351
2021-07-15 19:27:05 +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 800957e5a3 Upgrade to Spring HATEOAS 1.4.0-M1
Closes gh-27185
2021-07-15 17:05:00 +01:00
Andy Wilkinson 1b130c572c Remove dependency management for org.webjars:hal-browser
Closes gh-26192
2021-07-15 14:56:51 +01:00
Andy Wilkinson 84455f86fd Polish "Add properties for Dynatrace metrics API v2 ingest with Micrometer" 2021-07-15 13:07:37 +01:00
Georg Pirklbauer 3161164912 Add properties for Dynatrace metrics API v2 ingest with Micrometer 2021-07-15 11:57:58 +01:00
Andy Wilkinson 6f0b23502e Merge branch '2.5.x'
Closes gh-27347
2021-07-15 11:51:48 +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 f119716cab Upgrade to Micrometer 1.8.0-M1
Closes gh-27169
2021-07-15 09:23:51 +02:00
Stephane Nicoll 2d71658ed1 Upgrade to MongoDB 4.3.0
Closes gh-27344
2021-07-15 09:05:27 +02:00
Stephane Nicoll 73647c395f Upgrade to Lettuce 6.1.4.RELEASE
Closes gh-27343
2021-07-15 09:05:26 +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
Stephane Nicoll 52996e139e Upgrade to Micrometer 1.6.9
Closes gh-27340
2021-07-15 08:50:47 +02:00
Stephane Nicoll 6f949a1744 Upgrade to Lettuce 6.0.7.RELEASE
Closes gh-27339
2021-07-15 08:50:46 +02:00
Andy Wilkinson e1049a55ff Avoid retrieving values from Record beyond session boundary
See gh-27294
2021-07-14 19:42:10 +01:00
Andy Wilkinson c00e885ac4 Work around compile warnings from Data Neo4j's use of API Guardian
See gh-27170
2021-07-14 18:28:24 +01:00
Andy Wilkinson 8540bc0d12 Polish restoration of ConfigFileApplicationListener
See gh-27303
2021-07-14 18:01:34 +01:00
Andy Wilkinson 9f9c89a357 Polish "Use server version from database in Neo4j health details"
See gh-27294
2021-07-14 17:40:43 +01:00
Gerrit Meier f7fd0ac527 Use server version from database in Neo4j health details
See gh-27294
2021-07-14 17:37:40 +01:00
Andy Wilkinson 8db63db564 Merge branch '2.5.x'
Closes gh-27333
2021-07-14 17:19:59 +01:00
Andy Wilkinson 9a81d2fe09 Merge branch '2.4.x' into 2.5.x
Closes gh-27332
2021-07-14 17:19:39 +01:00
Andy Wilkinson c005e1de9a Rename test classes to match our naming conventions
Closes gh-27331
2021-07-14 17:19:11 +01:00
Phillip Webb be5e8b3139 Restore ConfigFileApplicationListener in deprecated form
Restore `ConfigFileApplicationListener` in a deprecated form since
Spring Cloud need it. Scheduled removal is now in 3.0.0.

See gh-27303
2021-07-14 08:30:11 -07:00
Stephane Nicoll 36beca2c7d Add ERROR-level metadata for removed properties
See gh-27303
2021-07-14 14:58:52 +02:00
Stephane Nicoll 6f4d8449be Initiate layers-2.6
See gh-27326
2021-07-14 14:48:23 +02:00
Stephane Nicoll b393031dbe Merge branch '2.5.x'
Closes gh-27326
2021-07-14 14:45:52 +02:00
Andy Wilkinson c406dda181 Deprecate AbstractDataSourceInitializer
Closes gh-27206

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-07-14 13:39:14 +01:00
Stephane Nicoll d8f9a20221 Add missing XSD version for layers configuration
Closes gh-27321
2021-07-14 14:32:08 +02:00
Stephane Nicoll 00afe3619c Upgrade to Spring Framework 5.3.9
Closes gh-27168
2021-07-14 14:16:18 +02:00
Stephane Nicoll 3c38e46c05 Upgrade to Spring Framework 5.3.9
Closes gh-27163
2021-07-14 14:15:34 +02:00
Stephane Nicoll 3511a007a2 Upgrade to Spring Framework 5.3.9
Closes gh-27160
2021-07-14 14:14:01 +02:00
Stephane Nicoll dc5acb0019 Remove deprecated code flagged for removal
Closes gh-27303
2021-07-14 11:50:01 +02:00
Stephane Nicoll de3dbaf1d5 Upgrade to Kotlin Coroutines 1.5.1
Closes gh-27317
2021-07-14 07:34:15 +02:00
Madhura Bhave 111ea31036 Merge branch '2.5.x' into main 2021-07-13 15:19:24 -07:00
Madhura Bhave ed22e4a897 Merge branch '2.4.x' into 2.5.x 2021-07-13 15:18:40 -07:00
Madhura Bhave 23b377e1a1 Fix typo 2021-07-13 15:18:17 -07:00
Andy Wilkinson 06e08e9fb5 Pass required settings into RabbitTemplateConfigurer's constructor
Closes gh-27313
2021-07-13 18:19:27 +01:00
Andy Wilkinson e6141c04f6 Pass required settings into Rabbit LCF configurer's constructor
Closes gh-27311
2021-07-13 18:17:07 +01:00
Andy Wilkinson 2c8658c24f Polish "Add Rabbit connection factory configurers"
See gh-26982
2021-07-13 17:44:56 +01:00
bono007 a96b3ef101 Add Rabbit connection factory configurers
See gh-26982
2021-07-13 17:44:56 +01:00
Andy Wilkinson 9ccd6a6f2f Merge branch '2.5.x'
Closes gh-27307
2021-07-13 15:56:32 +01:00
Andy Wilkinson 705feeed6a Polish "Allow additional JVM args when running tests via toolchain"
See gh-27089
2021-07-13 15:28:04 +01:00
dreis2211 01b0156fed Allow additional JVM args when running tests via toolchain
See gh-27089
2021-07-13 15:24:45 +01:00
Andy Wilkinson 75fdd89be4 Polish "Add resource labels to Stackdriver metrics configuration properties"
See gh-26961
2021-07-13 15:02:42 +01:00
Mikolaj Stefaniak 4e3958e5aa Add resource labels to Stackdriver metrics configuration properties
Using resource labels is mandatory for most Stackdriver resources other
than 'Global', i.e. k8s_pod. Configuring valid resource type along with
related labels makes it possible to use given metric in a wider set of
GCP solutions, i.e. custom metric based GKE pod horizontal autoscaler.

See gh-26961
2021-07-13 15:02:22 +01:00
Andy Wilkinson 9b82836f0e Merge branch '2.5.x'
Closes gh-27305
2021-07-13 14:56:36 +01:00
Andy Wilkinson 685b78f504 Merge branch '2.4.x' into 2.5.x
Closes gh-27304
2021-07-13 14:56:26 +01:00
Andy Wilkinson 49baacbc1c Polish "Mark Redis as down when cluster_state is fail"
See gh-27300
2021-07-13 14:56:01 +01:00
Hoan Vu Hong f31141de09 Mark Redis as down when cluster_state is fail
See gh-27300
2021-07-13 14:35:59 +01:00
Andy Wilkinson d21f8df1ad Polish "Auto-configure Jetty connection and SSL metrics"
See gh-26418
2021-07-13 14:01:15 +01:00
bono007 e6c43a32c8 Auto-configure Jetty connection and SSL metrics
See gh-26418
2021-07-13 14:01:15 +01:00
Andy Wilkinson c36476ed16 Merge branch '2.5.x'
Closes gh-27167
2021-07-13 13:59:03 +01:00
Andy Wilkinson 7332b43a9e Merge branch '2.4.x' into 2.5.x
Closes gh-27162
2021-07-13 13:53:45 +01:00
Andy Wilkinson 96e58d815d Upgrade to Reactor 2020.0.9
Closes gh-27159
2021-07-13 13:52:00 +01:00
Andy Wilkinson 5c9f2668a5 Merge branch '2.5.x'
See gh-27168
2021-07-13 13:13:58 +01:00
Andy Wilkinson 6ed7e692a9 Merge branch '2.4.x' into 2.5.x
See gh-27163
2021-07-13 13:13:36 +01:00
Andy Wilkinson 1341ca99db Align with Framework's deprecation of getLastModified
See gh-27160
2021-07-13 13:12:45 +01:00
Andy Wilkinson d7fd675f58 Merge branch '2.5.x'
Closes gh-27302
2021-07-13 12:18:26 +01:00
Andy Wilkinson d9e525c326 Merge branch '2.4.x' into 2.5.x
Closes gh-27301
2021-07-13 12:18:07 +01:00
Andy Wilkinson 2354dd5ccb Include Jetty metrics in list of supported metrics
Closes gh-27299
2021-07-13 12:06:28 +01:00
Stephane Nicoll fb8c8afc85 Upgrade to Hibernate 5.5.3.Final
Closes gh-27298
2021-07-13 11:49:08 +02:00
Andy Wilkinson 4d76660f17 Polish "Remove default spring.mongodb.embedded.version"
See gh-27108
2021-07-13 10:46:46 +01:00
bono007 d16ecab24b Remove default spring.mongodb.embedded.version
See gh-27108
2021-07-13 10:13:54 +01:00
Stephane Nicoll a3c7a7d440 Add additional bomr metadata 2021-07-12 15:07:55 +02:00
Stephane Nicoll 025e3372b7 Upgrade to REST Assured 4.4.0
Closes gh-27293
2021-07-12 14:25:25 +02:00
Stephane Nicoll 24488f162c Add a note for Pooled JMS 2.x as it requires Java 11 2021-07-12 13:57:58 +02:00
Stephane Nicoll 0740fadb20 Upgrade to Liquibase 4.4.1
Closes gh-27291
2021-07-12 10:10:09 +02:00
Stephane Nicoll 8b732a9c33 Upgrade to Flyway 7.11.1
Closes gh-27290
2021-07-12 09:43:55 +02:00
Stephane Nicoll 58aac6c4dc Upgrade to WebJars Locator Core 0.47
Closes gh-27288
2021-07-12 09:13:12 +02:00
Stephane Nicoll adbccdddcc Upgrade to SQLite JDBC 3.36.0.1
Closes gh-27286
2021-07-12 09:13:11 +02:00
Stephane Nicoll e590a9f940 Upgrade to Spring Session Bom 2021.0.1
Closes gh-27285
2021-07-12 09:13:11 +02:00
Stephane Nicoll 0a5263910e Upgrade to SnakeYAML 1.29
Closes gh-27284
2021-07-12 09:13:11 +02:00
Stephane Nicoll 1ea6995770 Upgrade to SLF4J 1.7.31
Closes gh-27283
2021-07-12 09:13:11 +02:00
Stephane Nicoll a5bf57aef3 Upgrade to Selenium HtmlUnit 2.51.0
Closes gh-27282
2021-07-12 09:13:11 +02:00
Stephane Nicoll caf2c70ece Upgrade to Prometheus PushGateway 0.11.0
Closes gh-27281
2021-07-12 09:13:11 +02:00
Stephane Nicoll 4bdd75cfb5 Upgrade to Postgresql 42.2.23
Closes gh-27280
2021-07-12 09:13:10 +02:00
Stephane Nicoll 6d4dfd63b7 Upgrade to Netty tcNative 2.0.40.Final
Closes gh-27279
2021-07-12 09:13:10 +02:00
Stephane Nicoll c16ef0a006 Upgrade to Neo4j Java Driver 4.3.3
Closes gh-27278
2021-07-12 09:13:10 +02:00
Stephane Nicoll ee347768dc Upgrade to Mockito 3.11.2
Closes gh-27277
2021-07-12 09:13:10 +02:00
Stephane Nicoll 7c020b8f34 Upgrade to Maven Javadoc Plugin 3.3.0
Closes gh-27276
2021-07-12 09:13:10 +02:00
Stephane Nicoll 643427e5e1 Upgrade to Maven Dependency Plugin 3.2.0
Closes gh-27275
2021-07-12 09:13:09 +02:00
Stephane Nicoll f4cdb484c1 Upgrade to Lettuce 6.1.3.RELEASE
Closes gh-27274
2021-07-12 09:13:09 +02:00
Stephane Nicoll 5c73696202 Upgrade to Kotlin Coroutines 1.5.0-native-mt
Closes gh-27273
2021-07-12 09:13:09 +02:00
Stephane Nicoll 7e5fc5a992 Upgrade to Json Path 2.6.0
Closes gh-27272
2021-07-12 08:46:19 +02:00
Stephane Nicoll 4bfdbbb4a2 Upgrade to jOOQ 3.14.12
Closes gh-27271
2021-07-12 08:46:19 +02:00
Stephane Nicoll 9394d4e547 Upgrade to Johnzon 1.2.14
Closes gh-27270
2021-07-12 08:46:19 +02:00
Stephane Nicoll 213be50899 Upgrade to Jetty 9.4.43.v20210629
Closes gh-27269
2021-07-12 08:46:18 +02:00
Stephane Nicoll 845998bc94 Upgrade to Jetty Reactive HTTPClient 1.1.10
Closes gh-27268
2021-07-12 08:46:18 +02:00
Stephane Nicoll 88ff1fc298 Upgrade to Jetty EL 9.0.48
Closes gh-27267
2021-07-12 08:46:18 +02:00
Stephane Nicoll dbc6b87fd4 Upgrade to Jersey 2.34
Closes gh-27266
2021-07-12 08:46:18 +02:00
Stephane Nicoll cdf1b42bb5 Upgrade to Jedis 3.6.1
Closes gh-27265
2021-07-12 08:46:18 +02:00
Stephane Nicoll 697b048623 Upgrade to Jackson Bom 2.12.4
Closes gh-27264
2021-07-12 08:46:18 +02:00
Stephane Nicoll 4fb77d8a89 Upgrade to Infinispan 12.1.6.Final
Closes gh-27263
2021-07-12 08:46:18 +02:00
Stephane Nicoll b993fd2a9e Upgrade to HttpClient5 5.1
Closes gh-27262
2021-07-12 08:46:17 +02:00
Stephane Nicoll 9f4a6af93a Upgrade to HtmlUnit 2.51.0
Closes gh-27261
2021-07-12 08:46:17 +02:00
Stephane Nicoll f5b75c702d Upgrade to Hazelcast 4.2.1
Closes gh-27260
2021-07-12 08:46:17 +02:00
Stephane Nicoll 4be169ae64 Upgrade to Elasticsearch 7.13.3
Closes gh-27259
2021-07-12 08:46:17 +02:00
Stephane Nicoll 108616bf48 Upgrade to Dropwizard Metrics 4.2.2
Closes gh-27258
2021-07-12 08:46:17 +02:00
Stephane Nicoll 1397e11e5f Upgrade to DB2 JDBC 11.5.6.0
Closes gh-27257
2021-07-12 08:46:17 +02:00
Stephane Nicoll f4cc3010de Upgrade to Commons Pool2 2.10.0
Closes gh-27256
2021-07-12 08:46:16 +02:00
Stephane Nicoll b73a2e3e73 Upgrade to Cassandra Driver 4.12.0
Closes gh-27255
2021-07-12 07:55:28 +02:00
Stephane Nicoll a4709f0979 Upgrade to Caffeine 2.9.2
Closes gh-27254
2021-07-12 07:55:28 +02:00
Stephane Nicoll 6f09109a73 Upgrade to Byte Buddy 1.11.6
Closes gh-27253
2021-07-12 07:55:28 +02:00
Stephane Nicoll 580e01283a Upgrade to Awaitility 4.1.0
Closes gh-27252
2021-07-12 07:55:27 +02:00
Stephane Nicoll 69ac69050c Upgrade to AssertJ 3.20.2
Closes gh-27251
2021-07-12 07:55:27 +02:00
Stephane Nicoll 49134f870e Upgrade to AspectJ 1.9.7
Closes gh-27250
2021-07-12 07:55:27 +02:00
Stephane Nicoll 4c3847d3f1 Switch bomr to any policy 2021-07-12 07:41:15 +02:00
Stephane Nicoll c5bf56d87f Upgrade to Kafka 2.8.0
As part of the upgrade, a switch to Spring Kafka 2.8.0-SNAPSHOT is
required, see gh-27177

Closes gh-27247
2021-07-11 18:28:41 +02:00
Stephane Nicoll 895a2ed013 Upgrade to Postgresql 42.2.23
Closes gh-27244
2021-07-11 08:12:08 +02:00
Stephane Nicoll bed528f203 Upgrade to jOOQ 3.14.12
Closes gh-27243
2021-07-11 08:12:07 +02:00
Stephane Nicoll 5811b22554 Upgrade to Johnzon 1.2.14
Closes gh-27242
2021-07-11 08:12:07 +02:00
Stephane Nicoll 3c6db2bc28 Upgrade to Jetty 9.4.43.v20210629
Closes gh-27241
2021-07-11 08:12:06 +02:00
Stephane Nicoll 58b03ac56f Upgrade to Jetty Reactive HTTPClient 1.1.10
Closes gh-27240
2021-07-11 08:12:05 +02:00
Stephane Nicoll 88e0916ad6 Upgrade to DB2 JDBC 11.5.6.0
Closes gh-27239
2021-07-11 08:12:04 +02:00
Stephane Nicoll 2d671021d9 Upgrade to AspectJ 1.9.7
Closes gh-27238
2021-07-11 08:12:02 +02:00
Stephane Nicoll d67089cdfe Merge branch '2.5.x'
Closes gh-27236
2021-07-10 17:38:44 +02:00
dreis2211 dacfe27350 Fix tests for multi-release JARs on JDK 17
See gh-27229
2021-07-10 17:38:16 +02:00
Andy Wilkinson 9469bfa8c5 Upgrade to Querydsl 5.0.0.M1
Closes gh-26956
2021-07-10 16:23:43 +01:00
Andy Wilkinson 7b0cc3afb5 Merge branch '2.5.x'
Closes gh-27227
2021-07-09 15:05:44 +01:00
Andy Wilkinson 1cd3a54e88 Rework Quartz DB init dependencies to use a detector
Closes gh-27222
2021-07-09 15:02:15 +01:00
Andy Wilkinson 7a1c923fec Merge branch '2.5.x'
Closes gh-27226
2021-07-09 14:18:18 +01:00
Andy Wilkinson 3de58c2340 Detect JdbcIndexedSessionRepository as depending on DB init
Fixes gh-27220
2021-07-09 14:17:23 +01:00
Andy Wilkinson 0b604f5e3b Merge branch '2.5.x'
Closes gh-27224
2021-07-09 13:47:41 +01:00
Stephane Nicoll 7a7901f0c5 Start building against Spring Security 5.6.0-M1 snapshots
See gh-27173
2021-07-09 13:48:40 +02:00
Stephane Nicoll 8d4f3e722f Start building against Micrometer 1.8.0-M1 snapshots
See gh-27169
2021-07-09 13:48:39 +02:00
Stephane Nicoll b20fdd6ea8 Start building against Spring Integration 5.5.2 snapshots
See gh-27174
2021-07-09 13:48:39 +02:00
Stephane Nicoll 3191b814e0 Start building against Spring AMQP 2.4.0-M1 snapshots
See gh-27171
2021-07-09 13:48:39 +02:00
Stephane Nicoll 4f322411a5 Start building against Spring Data 2021.1.0-M1 snapshots
See gh-27170
2021-07-09 13:48:39 +02:00
Stephane Nicoll 1827d559fb Start building against Spring HATEOAS 1.4.0 snapshots
See gh-27185
2021-07-09 13:48:39 +02:00
Stephane Nicoll cd79a47a3d Start building against Spring Framework 5.3.9 snapshots
See gh-27168
2021-07-09 13:48:39 +02:00
Stephane Nicoll 5981eba4f3 Start building against Reactor 2020.0.9 snapshots
See gh-27167
2021-07-09 13:48:39 +02:00
Andy Wilkinson f008228f1a Polish "Detect JobRepository as depending on DB init"
See gh-27221
2021-07-09 12:36:30 +01:00
Henning Pöttker cf69785393 Detect JobRepository as depending on DB init
See gh-27221
2021-07-09 12:36:19 +01:00
Andy Wilkinson d8d98e615b Merge branch '2.5.x'
Closes gh-27223
2021-07-09 12:22:33 +01:00
Andy Wilkinson 94f94f30f5 Polish "Detect AbstractDataSourceInitializers as DB initializers"
See gh-27215
2021-07-09 12:05:56 +01:00
Henning Pöttker 433f3d6bc4 Detect AbstractDataSourceInitializers as DB initializers
See gh-27215
2021-07-09 12:04:17 +01:00
Andy Wilkinson 7b94b40a19 Ensure that Session JDBC schema is in place before DB is accessed
Fixes gh-27208
2021-07-09 11:12:52 +01:00
Andy Wilkinson 4b1b2d6603 Consider Flyway and Liquibase as possible Batch DB initializers
This is a follow-on from 3fec4110 which only considered
BatchDataSourceInitializer as a possible initializer of Batch's
database schema. Flyway and Liquibase are now also considered.

Closes gh-27193
2021-07-09 10:29:50 +01:00
Andy Wilkinson 3fec41104e Ensure that Batch schema is in place before DB is accessed
Fixes gh-27193
2021-07-09 09:47:48 +01:00
Stephane Nicoll 5bb6188f6d Merge branch '2.5.x'
Closes gh-27218
2021-07-09 10:44:40 +02:00
Stephane Nicoll 25fe6a107a Fix visibility of a type exposed as a bean
Closes gh-27189
2021-07-09 10:40:00 +02:00
Scott Frederick 18c7c0af22 Add Paketo image building system tests
A new system test plugin is being made available for running test
suites that should be run less frequently than with every commit, such
as tests that verify Spring Boot compatibility with external
projects. CI pipeline configuration for running system tests is also
provided.

The first system tests verify the behavior of the Spring Boot image
building plugins when building images using Paketo buildpacks.

Closes gh-25824
2021-07-08 17:02:43 -05:00
Madhura Bhave d82b46b718 Merge branch '2.5.x' into main
Closes gh-27212
Closes gh-27213
2021-07-08 13:05:46 -07:00
Madhura Bhave 0f70c46746 Merge branch '2.4.x' into 2.5.x
Closes gh-27210
Closes gh-27211
2021-07-08 13:04:48 -07:00
Madhura Bhave 42e556dd73 Handle file with name matching an optional wildcard location
Previously, the presence of a file with the same name
as an optional wildcard location would cause a failure. With
this change the pattern is resolved only if the resource is a
directory.

Additionally, if an optional wildcard search location that was a file
would also fail with an exception. This commit fixes that so that those
locations are not resolved.

Fixes gh-27120
Fixes gh-27209
2021-07-08 13:01:15 -07:00
Phillip Webb cf5fc04ec5 Merge branch '2.5.x'
Closes gh-27205
2021-07-08 11:36:37 -07:00
Phillip Webb f32f4a2e3d Merge branch '2.4.x' into 2.5.x
Closes gh-27204
2021-07-08 11:36:25 -07:00
Phillip Webb 84110a22bc Don't change case of 'Sec-WebSocket-Key'
Polish commit 5ca687c9a6 had an accidental side-effect of changing
the 'Sec-WebSocket-Key' header value to lowercase. This breaks
connections since the value needs to be echoed unchanged in the
"Sec-WebSocket-Accept" header.

Fixes gh-27147
2021-07-08 11:29:29 -07:00
Andy Wilkinson b50cefbf8b Upgrade to Postgresql 42.2.23
Closes gh-27202
2021-07-08 18:44:11 +01:00
Andy Wilkinson bce7b9c711 Upgrade to jOOQ 3.14.12
Closes gh-27201
2021-07-08 18:44:09 +01:00
Andy Wilkinson 2c7105965d Upgrade to Johnzon 1.2.14
Closes gh-27200
2021-07-08 18:44:08 +01:00
Andy Wilkinson 81a68651dc Upgrade to Jetty 9.4.43.v20210629
Closes gh-27199
2021-07-08 18:44:07 +01:00
Andy Wilkinson d52117014f Upgrade to Jackson Bom 2.12.4
Closes gh-27198
2021-07-08 18:44:06 +01:00
Andy Wilkinson c96ee0d448 Upgrade to Infinispan 12.1.6.Final
Closes gh-27197
2021-07-08 18:44:04 +01:00
Andy Wilkinson 958c6649f4 Upgrade to DB2 JDBC 11.5.6.0
Closes gh-27196
2021-07-08 18:44:03 +01:00
Andy Wilkinson 4b965ac1ef Upgrade to Caffeine 2.9.2
Closes gh-27195
2021-07-08 18:44:02 +01:00
Andy Wilkinson bcbc742a0e Upgrade to AspectJ 1.9.7
Closes gh-27194
2021-07-08 18:44:00 +01:00
Andy Wilkinson 5ebe2f4539 Merge branch '2.5.x'
Closes gh-27192
2021-07-08 18:08:39 +01:00
dreis2211 00d3330c9a Avoid illegal reflective access on ZipEntry.xdostime
See gh-27100
2021-07-08 18:05:16 +01:00
Andy Wilkinson 87591d94ee Merge branch '2.5.x'
Closes gh-27188
2021-07-08 10:45:57 +01:00
Andy Wilkinson ff79787def Avoid using deprecated API to get Kotlin Plugin's version
Closes gh-27090
2021-07-08 10:45:09 +01:00
Andy Wilkinson bd1b73be94 Merge branch '2.5.x'
Closes gh-27186
2021-07-08 09:18:45 +01:00
Andy Wilkinson 283b4a6ed2 Improve error message for non-options-capable ConnectionFactory
Fixes gh-26977
2021-07-08 09:17:55 +01:00
Stephane Nicoll 7eb6cf71f6 Start building against Spring Integration 5.5.2 snapshots
See gh-27166
2021-07-08 08:52:18 +02:00
Stephane Nicoll e426ff6196 Start building against Spring Kafka 2.7.4 snapshots
See gh-27165
2021-07-08 08:51:55 +02:00
Stephane Nicoll 745b79714f Start building against Spring Data 2021.0.3 snapshots
See gh-27164
2021-07-08 08:51:29 +02:00
Stephane Nicoll 36f5d6762b Start building against Spring HATEOAS 1.3.3 snapshots
See gh-27184
2021-07-08 08:51:04 +02:00
Stephane Nicoll 3119179c62 Start building against Spring Framework 5.3.9 snapshots
See gh-27163
2021-07-08 08:50:32 +02:00
Stephane Nicoll 74a0354bf1 Start building against Reactor 2020.0.9 snapshots
See gh-27162
2021-07-08 08:50:06 +02:00
Stephane Nicoll 815ccd14b5 Start building against Spring Data 2020.0.11 snapshots
See gh-27161
2021-07-08 08:45:17 +02:00
Stephane Nicoll 434d4a6f76 Start building against Spring HATEOAS 1.2.8 snapshots
See gh-27183
2021-07-08 08:44:52 +02:00
Stephane Nicoll 861f87911c Start building against Spring Framework 5.3.9 snapshots
See gh-27160
2021-07-08 08:44:23 +02:00
Stephane Nicoll 74d5fdbcd0 Start building against Reactor 2020.0.9 snapshots
See gh-27159
2021-07-08 08:43:53 +02:00
Andy Wilkinson 7c744db0e9 Merge branch '2.5.x'
Closes gh-27180
2021-07-07 17:57:25 +01:00
Andy Wilkinson c21791e671 Test our Gradle plugin against Gradle 7.1.1
Closes gh-27142
2021-07-07 17:57:14 +01:00
Stephane Nicoll fa1eb544c1 Merge branch '2.5.x'
Closes gh-27155
2021-07-06 09:10:13 +02:00
Stephane Nicoll 888393d63b Merge branch '2.4.x' into 2.5.x
Closes gh-27154
2021-07-06 09:10:03 +02:00
Stephane Nicoll 5ec0c7ed12 Polish "Fix duration to microseconds conversion"
See gh-27149
2021-07-06 09:07:48 +02:00
marckchr a406a46fa1 Fix duration to microseconds conversion
See gh-27149
2021-07-06 09:07:47 +02:00
Madhura Bhave ce1dff86df Merge branch '2.5.x' into main
See gh-27140
2021-07-02 15:44:13 -07:00
Madhura Bhave c6acce569f Merge branch '2.4.x' into 2.5.x
See gh-27139
2021-07-02 15:43:15 -07:00
Madhura Bhave 877f618a69 Clarify that HATEOAS can be used with Webflux without starter
Closes gh-26897
2021-07-02 15:36:39 -07:00
Madhura Bhave 1dc8fa14c9 Merge branch '2.5.x' into main
Closes gh-27140
2021-07-01 16:02:35 -07:00
Madhura Bhave 503d50f39e Merge branch '2.4.x' into 2.5.x
Closes gh-27139
2021-07-01 15:59:12 -07:00
Madhura Bhave 6c4273b5c9 Document spring hateoas is spring mvc specific
Closes gh-26897
2021-07-01 15:54:01 -07:00
Madhura Bhave 1f3b32c3b9 Merge branch '2.5.x' into main
Closes gh-27138
2021-07-01 15:46:21 -07:00
Madhura Bhave 55593a7ac1 Merge branch '2.4.x' into 2.5.x
Closes gh-27137
2021-07-01 15:46:00 -07:00
Madhura Bhave eb4144eb97 Add clarification on when @DevaultValue is used during binding
Closes gh-26742
2021-07-01 15:39:16 -07:00
Madhura Bhave 32a1644cca Split spring boot features into multiple sections
See gh-27132
2021-06-30 22:17:48 -07:00
Stephane Nicoll 786d7cdb6e Merge branch '2.5.x'
Closes gh-27118
2021-06-29 09:09:14 +02:00
Stephane Nicoll ddf76c32c6 Update copyright year of updated file
See gh-27085
2021-06-29 08:28:08 +02:00
dreis2211 c852961011 Avoid reflection in tests
See gh-27085
2021-06-29 08:25:45 +02:00
Stephane Nicoll 573ca50333 Merge branch '2.5.x'
Closes gh-27117
2021-06-29 08:22:13 +02:00
Nurlan Tembayev e57970393c Remove unnecessary unit for spring.datasource.tomcat.max-active
See gh-27103
2021-06-29 08:21:50 +02:00
Stephane Nicoll 53fe7b71f6 Merge branch '2.5.x'
Closes gh-27116
2021-06-29 08:17:30 +02:00
biergit 79638a8f63 Fix anchor rewrites containing a question mark
See gh-27107
2021-06-29 08:09:45 +02:00
Stephane Nicoll 0f20c236da Merge branch '2.5.x'
Closes gh-27112
2021-06-28 08:07:31 +02:00
Cèsar Ordiñana 0c38449851 Fix typo in section title
See gh-27102
2021-06-28 08:06:57 +02:00
Brian Clozel f23fa2821c Merge branch '2.5.x'
Closes gh-27106
2021-06-25 19:38:39 +02:00
Brian Clozel 4db53601b5 Fix spring.netty.leak-detection metadata
Fixes gh-27104
2021-06-25 19:38:07 +02:00
Phillip Webb d00db60bab Merge branch '2.5.x' 2021-06-24 14:06:25 -07:00
Phillip Webb dfbd82b838 Fix Kotlin 1.5.20 classpath issues
See gh-27086
2021-06-24 14:05:36 -07:00
Phillip Webb 716e8ab717 Merge branch '2.5.x' 2021-06-24 11:31:33 -07:00
Phillip Webb d44207161f Suppress Kotlin 1.5.20 deprecation warning
See gh-27086
2021-06-24 11:30:58 -07:00
Andy Wilkinson 8b9991fcc7 Merge branch '2.5.x'
Closes gh-27076
2021-06-24 14:07:17 +01:00
Andy Wilkinson 5a9fa3c8f1 Only close context that is active
Previously, SpringApplicationShutdownHook would call close() on any
registered application context even if it wasn't active as it had
already been closed. This could lead to deadlock if the context was
closed and System.exit was called during application context refresh.

This commit updates SpringApplicationShutdownHook so that it only
calls close() on active contexts. This prevents deadlock as it avoids
trying to sychronize on the context's startupShutdownMonitor on
the shutdown hook thread while it's still held on the main thread
which called System.exit and is waiting for all of the shutdown hooks
to complete.

Fixes gh-27049
2021-06-24 14:07:02 +01:00
Andy Wilkinson d56ddb0f60 Merge branch '2.5.x'
See gh-27050
2021-06-24 11:21:30 +01:00
Andy Wilkinson 4572ae5430 Use reflection to extract Netty's default level
See gh-27046
2021-06-24 11:20:56 +01:00
Andy Wilkinson 9b91c18163 Merge branch '2.5.x'
See gh-27073
2021-06-24 09:53:20 +01:00
Andy Wilkinson e2d68aa8b2 Merge branch '2.4.x' into 2.5.x
See gh-27072
2021-06-24 09:53:04 +01:00
Andy Wilkinson a7872f47da Minimize Instantiator's public API
See gh-27043
2021-06-24 09:27:08 +01:00
Phillip Webb 6686a49b1f Merge branch '2.5.x'
Closes gh-27074
2021-06-24 00:04:44 -07:00
Phillip Webb b093db104c Pass ResourceLoader.getClassLoader() to Instantiator
Update calls to `Instantiator` to that they also include
`ResourceLoader.getClassLoader()`.

Closes gh-27071
2021-06-24 00:03:16 -07:00
Phillip Webb fe34bcdd52 Merge branch '2.5.x'
Closes gh-27073
2021-06-23 23:33:18 -07:00
Phillip Webb 641dfbdf98 Merge branch '2.4.x' into 2.5.x
Fixes gh-27072
2021-06-23 23:32:50 -07:00
Phillip Webb 5088927f80 Pass ClassLoader to Instantiator
Update `Instantiator` so that it can accept a `ClassLoader` when
creating instances and rework `EnvironmentPostProcessorsFactory` to
use the new methods.

Prior to this commit we would use the `ClassLoader` to get the class
names from `SpringFactories` but not when actually creating the
instances.

Fixes gh-27043
2021-06-23 23:30:53 -07:00
Stephane Nicoll 7d8e7468bf Merge branch '2.5.x'
See gh-27065
2021-06-24 08:22:02 +02:00
Stephane Nicoll d079db1dce Polish
See gh-26978
2021-06-24 08:20:11 +02:00
Stephane Nicoll 57f5030397 Upgrade to Netty tcNative 2.0.40.Final
Closes gh-27070
2021-06-24 07:49:33 +02:00
Stephane Nicoll 43f6393e9a Upgrade to Hazelcast 4.1.4
Closes gh-27069
2021-06-24 07:49:32 +02:00
Stephane Nicoll 6889d2adda Upgrade to Nimbus JOSE JWT 8.22
Closes gh-27068
2021-06-24 07:27:08 +02:00
Stephane Nicoll d4039648c7 Upgrade to OAuth2 OIDC SDK 8.36.2
Closes gh-27067
2021-06-24 07:27:06 +02:00
Stephane Nicoll 1f53e93b8d Upgrade to Netty tcNative 2.0.40.Final
Closes gh-27066
2021-06-24 07:27:05 +02:00
Stephane Nicoll d4fa46f1b9 Polish startup endpoint description in reference doc
Closes gh-26978
2021-06-24 07:19:58 +02:00
Stephane Nicoll 32d6b52980 Upgrade to Spring Integration 5.5.1
Closes gh-26974
2021-06-24 06:40:59 +02:00
Stephane Nicoll dd63f98fcf Upgrade to Spring Kafka 2.7.3
Closes gh-26973
2021-06-24 06:40:34 +02:00
Stephane Nicoll b5cdc84273 Upgrade to Spring AMQP 2.3.9
Closes gh-26972
2021-06-24 06:40:03 +02:00
Stephane Nicoll 006995fef7 Upgrade to Spring Integration 5.4.8
Closes gh-26967
2021-06-24 06:39:11 +02:00
Stephane Nicoll 6804ae849d Upgrade to Spring AMQP 2.3.9
Closes gh-26966
2021-06-24 06:38:42 +02:00
Phillip Webb cb3a41c4db Merge branch '2.5.x'
Closes gh-27064
2021-06-23 21:36:28 -07:00
dreis2211 7a25e4edb8 Avoid illegal reflective access in CLI tests
See gh-26930
2021-06-23 21:34:54 -07:00
Phillip Webb 6b241d04c0 Merge branch '2.5.x'
Closes gh-27063
2021-06-23 21:13:18 -07:00
Phillip Webb 093e7f7e3b Merge branch '2.4.x' into 2.5.x
Closes gh-27062
2021-06-23 21:13:08 -07:00
Phillip Webb 1a7569056b Fix 'spring.datasource.name' property description
Closes gh-27026
2021-06-23 21:12:59 -07:00
Phillip Webb 6102f10639 Merge branch '2.5.x' 2021-06-23 21:02:36 -07:00
Phillip Webb 2c518f1dff Merge branch '2.4.x' into 2.5.x 2021-06-23 21:02:05 -07:00
Phillip Webb a76e5c043e Update copyright year of changed files 2021-06-23 21:01:45 -07:00
Phillip Webb b141fcf51d Merge branch '2.5.x'
Closes gh-27061
2021-06-23 21:01:05 -07:00
Phillip Webb 84fab65b9a Merge branch '2.4.x' into 2.5.x
Closes gh-27060
2021-06-23 21:00:46 -07:00
Phillip Webb ea62967ef4 Improve "reason" message in BindFailureAnalyzer
Update `BindFailureAnalyzer` so that the "Reason" message includes
the root cause exception type and message.

Closes gh-27028
2021-06-23 20:54:01 -07:00
Phillip Webb 0e28e24123 Rethrow ConverterNotFoundException when possible
Update `BindConverter` to throw the first `ConversionFailedException`
rather than always throwing `ConverterNotFoundException`.

See gh-27028
2021-06-23 20:53:35 -07:00
Phillip Webb fe95c2a80c Merge branch '2.5.x'
Closes gh-27059
2021-06-23 17:47:19 -07:00
Phillip Webb a77e116c03 Merge branch '2.4.x' into 2.5.x
Closes gh-27058
2021-06-23 17:47:08 -07:00
Phillip Webb 93d316ddd1 Add additional ConfigDataProperties tests
Add more `isActive` tests to cover negative cases.

See gh-27017
2021-06-23 17:46:23 -07:00
fengyuanwei b91c66b823 Fix typo in ConfigDataPropertiesTests
See gh-27017
2021-06-23 17:38:46 -07:00
Phillip Webb e85b0c7012 Merge branch '2.5.x' 2021-06-23 17:29:41 -07:00
Phillip Webb fd83158fa5 Merge branch '2.4.x' into 2.5.x 2021-06-23 17:28:31 -07:00
Phillip Webb 63ed921554 Restore simple Library constructor
See gh-15808
2021-06-23 17:27:26 -07:00
Phillip Webb 5fc0e1ca81 Merge branch '2.5.x'
Closes gh-27057
2021-06-23 17:23:25 -07:00
Phillip Webb af37f59136 Merge branch '2.4.x' into 2.5.x
Closes gh-27056
2021-06-23 17:13:13 -07:00
Madhura Bhave b790c82732 Apply exclusions to existing war entries
Update `RepackageMojo` and supporting classes so that `exclusions`
on the repackage goal apply to both the contributed libraries and any
existing jar entries already contained in the original war.

Prior to this commit, exclusions would apply to contributed jars (for
example, those in `WEB-INF/lib-provided`) but not jars that were
packaged directly into `WEB-INF/lib` by the war plugin

Fixes gh-15808

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-06-23 15:08:31 -07:00
Brian Clozel 7d720a63a5 Merge branch '2.5.x'
Closes gh-27050
2021-06-23 19:39:03 +02:00
Brian Clozel bf17f50a1f Align NettyProperties with Netty's defaults
Prior to this commit, `NettyProperties` would use `DISABLED` as the
default level for leak detection in Netty. This is not the default value
enforced by Netty, which is `SIMPLE`.

This commit changes the default configuration property value and ensures
that both stay in sync.

Fixes gh-27046
2021-06-23 19:36:40 +02:00
Andy Wilkinson 01f8cb7639 Merge branch '2.4.x' into 2.5.x
Closes gh-27048
2021-06-23 18:07:33 +01:00
Andy Wilkinson 3746155916 Align Nimbus dependency versions with Spring Security
Closes gh-26820
2021-06-23 17:53:09 +01:00
Stephane Nicoll e0e64e69c0 Upgrade to Micrometer 1.7.1
Closes gh-27015
2021-06-23 17:45:25 +02:00
Stephane Nicoll d0f12392ab Upgrade to Micrometer 1.6.8
Closes gh-27014
2021-06-23 17:41:25 +02:00
Stephane Nicoll 6c2fc8471a Upgrade to Spring Session 2021.0.1
Closes gh-26971
2021-06-23 15:56:28 +02:00
Stephane Nicoll fb2ed6076f Upgrade to Spring Session 2020.0.5
Closes gh-26964
2021-06-23 15:55:57 +02:00
Stephane Nicoll 254a29f9be Upgrade to Nimbus JOSE JWT 9.10
Closes gh-27039
2021-06-23 10:40:06 +02:00
Stephane Nicoll 4a28e21047 Upgrade to OAuth2 OIDC SDK 9.9
Closes gh-27038
2021-06-23 10:39:48 +02:00
Stephane Nicoll f89675a3f1 Upgrade to Neo4j Java Driver 4.2.7
Closes gh-27037
2021-06-23 08:22:15 +02:00
Stephane Nicoll 1a9e3bcbd6 Upgrade to Lettuce 6.1.3.RELEASE
Closes gh-27036
2021-06-23 08:22:14 +02:00
Stephane Nicoll 763870bd45 Upgrade to Dropwizard Metrics 4.1.24
Closes gh-27035
2021-06-23 08:22:12 +02:00
Stephane Nicoll fb1cd82061 Upgrade to OAuth2 OIDC SDK 8.36.2
Closes gh-27034
2021-06-23 07:58:19 +02:00
Stephane Nicoll ded6b26ea5 Upgrade to Neo4j Java Driver 4.1.4
Closes gh-27033
2021-06-23 07:58:18 +02:00
Stephane Nicoll 6db9fe2e36 Upgrade to Lettuce 6.0.6.RELEASE
Closes gh-27032
2021-06-23 07:58:17 +02:00
Stephane Nicoll 9bc1c4dff2 Upgrade to Dropwizard Metrics 4.1.24
Closes gh-27031
2021-06-23 07:58:16 +02:00
Stephane Nicoll 9281dcf751 Upgrade to Spring Data 2021.0.2
Closes gh-26970
2021-06-22 19:22:51 +02:00
Stephane Nicoll 47a9a94376 Upgrade to Spring HATEOAS 1.3.2
Closes gh-26969
2021-06-22 19:22:28 +02:00
Stephane Nicoll 7e09c1d8dc Upgrade to Spring Data 2020.0.10
Closes gh-26963
2021-06-22 19:21:42 +02:00
Stephane Nicoll 58320c6af9 Upgrade to Spring HATEOAS 1.2.7
Closes gh-27013
2021-06-22 19:21:12 +02:00
Stephane Nicoll c309f3428c Upgrade to Reactor 2020.0.8
Closes gh-27027
2021-06-22 14:54:30 +02:00
Stephane Nicoll 7ca9794f3c Upgrade to Reactor 2020.0.8
Closes gh-26968
2021-06-22 14:53:10 +02:00
Stephane Nicoll c21099b142 Upgrade to Reactor 2020.0.8
Closes gh-26962
2021-06-22 14:52:39 +02:00
Andy Wilkinson 4290193a65 Merge branch '2.5.x'
Closes gh-27025
2021-06-22 13:20:11 +01:00
Andy Wilkinson 051638631b Merge branch '2.4.x' into 2.5.x
Closes gh-27024
2021-06-22 13:02:06 +01:00
Andy Wilkinson ba9244b2d4 Polish "Update docs to use @SpringBootConfiguration not @Configuration"
See gh-26937
2021-06-22 12:55:25 +01:00
Yanming Zhou a5f077cf79 Update docs to use @SpringBootConfiguration not @Configuration
See gh-26937
2021-06-22 12:55:25 +01:00
Andy Wilkinson 515072b2e1 Merge branch '2.5.x'
Closes gh-27018
2021-06-22 10:29:42 +01:00
Andy Wilkinson cf940fd374 Disable Log4j2's shutdown hook by default
Previously, Log4j2's own shutdown hook was only disabled when Log4j2
detected javax.servlet.Servlet on the classpath and, therefore,
determined that it was running in a web application. In an application
without Servlet on the classpath, this could lead to both Log4j2's shut
down hook and and logging system's shutdown handler both stopping
Log4j2. This could result in a failure as the second attempt at stopping
would result in reinitialization which would fail as the JVM is already
shutting down.

This commit introduces a new Log4j2 PropertySource implementation,
registered via META-INF/services, that sets the
log4j.shutdownHookEnabled property to false. This will ensure that
Log4j2's own shutdown hook is disabled by default whenever Spring Boot
is on the classpath and not just in Servlet-based web applications.

Fixes gh-26953
2021-06-22 10:17:25 +01:00
Stephane Nicoll 0a2fe3562d Start building against Micrometer 1.7.1 snapshots
See gh-27015
2021-06-22 09:53:48 +02:00
Stephane Nicoll b8a5d9b882 Start building against Micrometer 1.6.8 snapshots
See gh-27014
2021-06-22 09:35:36 +02:00
Stephane Nicoll 9ab8c625e5 Start building against Spring HATEOAS 1.2.7 snapshots
See gh-27013
2021-06-22 08:31:44 +02:00
Stephane Nicoll 49951e8be1 Merge branch '2.5.x'
Closes gh-27012
2021-06-22 08:26:33 +02:00
dreis2211 03cd6bec6e Avoid illegal reflective access in RabbitAutoConfigurationTests
See gh-26954
2021-06-22 08:22:48 +02:00
Stephane Nicoll 142a68292c Merge branch '2.5.x'
Closes gh-27011
2021-06-22 08:21:41 +02:00
Stephane Nicoll 168478f68c Merge branch '2.4.x' into 2.5.x
Closes gh-27010
2021-06-22 08:21:31 +02:00
Sviatoslav Hryb 2252deb69b Document uuid support in RandomValuePropertySource
See gh-26975
2021-06-22 08:16:55 +02:00
Stephane Nicoll abd5c76570 Merge branch '2.5.x'
Closes gh-27009
2021-06-22 07:57:18 +02:00
Stephane Nicoll 0b54424433 Revert "Avoid duplicate crypto classes when depending on spring-security-core"
Closes gh-26588
2021-06-22 07:56:00 +02:00
Stephane Nicoll 8668e55631 Revert "Avoid dependency on Kotlin when depending on spring-security-config"
Closes gh-26728
2021-06-22 07:55:47 +02:00
Stephane Nicoll 5044137658 Revert "Avoid duplicate crypto classes when depending on spring-security-core"
Closes gh-26588
2021-06-22 07:55:11 +02:00
Stephane Nicoll 038617e97f Merge branch '2.5.x'
Closes gh-27007
2021-06-22 07:54:23 +02:00
Stephane Nicoll c67c09df32 Upgrade to Spring Security 5.5.1
Closes gh-26945
2021-06-22 07:54:00 +02:00
Stephane Nicoll 333c7a7cd8 Upgrade to Spring Security 5.4.7
Closes gh-26965
2021-06-22 07:39:35 +02:00
Phillip Webb 86dc156162 Merge branch '2.5.x'
Closes gh-27006
2021-06-21 18:37:43 -07:00
Phillip Webb f914dc15fc Merge branch '2.4.x' into 2.5.x
Closes gh-27005
2021-06-21 18:37:08 -07:00
Phillip Webb 8189e82c02 Allow nested profile-specific resolution
Effectively revert commit 0da0d2d46 so that the `resolveProfileSpecific`
method of `ConfigDataLocationResolver` is again called when resolving
imports declared in a profile-specific file.

Fixes gh-26960
2021-06-21 18:30:03 -07:00
Andy Wilkinson 752a92960c Merge branch '2.5.x'
Closes gh-27001
2021-06-21 18:20:18 +01:00
Andy Wilkinson 07e7398d10 Include 6.9.x in version requirements message
Fixes gh-26952
2021-06-21 18:20:08 +01:00
Stephane Nicoll 5dc1065876 Revert "Upgrade to Dropwizard Metrics 4.1.23"
This reverts commit ce24270271.

See gh-26983
2021-06-21 16:53:34 +02:00
Stephane Nicoll 3ef7ba7f9b Upgrade to SLF4J 1.7.31
Closes gh-26995
2021-06-21 16:40:34 +02:00
Stephane Nicoll 68cd28a481 Upgrade to Postgresql 42.2.22
Closes gh-26994
2021-06-21 16:40:34 +02:00
Stephane Nicoll b3b2d9a095 Upgrade to Jetty EL 9.0.48
Closes gh-26993
2021-06-21 16:40:33 +02:00
Stephane Nicoll fc5d781cfc Upgrade to Jedis 3.6.1
Closes gh-26992
2021-06-21 16:40:33 +02:00
Stephane Nicoll 2a190f3589 Upgrade to Cassandra Driver 4.11.2
Closes gh-26990
2021-06-21 16:40:33 +02:00
Andy Wilkinson 9025529dcf Merge branch '2.5.x'
Closes gh-26998
2021-06-21 14:34:24 +01:00
Andy Wilkinson 8405df10b8 Merge branch '2.4.x' into 2.5.x
Closes gh-26997
2021-06-21 14:34:11 +01:00
Andy Wilkinson e18eb08222 Fix additional metadata locations with config cache
Previously, a project with a dependency on Spring Boot's configuration
processor would fail to build when the configuration cache is enabled
due to it accessing the Project during task execution.

Instead of accessing the project during task execution, this commit
updates the code to retrieve the resource locations from the matching
source set in advance. The locations are then stored in the action
that configures the compile task when needed.

Closes gh-26880
2021-06-21 14:31:04 +01:00
Stephane Nicoll c99d1dae08 Start building against Spring Integration 5.5.1 snapshots
See gh-26974
2021-06-21 13:26:01 +02:00
Stephane Nicoll d015464a7e Start building against Spring Kafka 2.7.3 snapshots
See gh-26973
2021-06-21 13:26:01 +02:00
Stephane Nicoll 516228730f Start building against Spring Session 2021.0.1 snapshots
See gh-26971
2021-06-21 13:26:01 +02:00
Stephane Nicoll 1aa99b1549 Start building against Spring Data 2021.0.2 snapshots
See gh-26970
2021-06-21 13:26:00 +02:00
Stephane Nicoll a487bd6423 Start building against Spring HATEOAS 1.3.2 snapshots
See gh-26969
2021-06-21 13:26:00 +02:00
Andy Wilkinson a983a4ae07 Merge branch '2.5.x'
Closes gh-26989
2021-06-21 12:07:06 +01:00
Andy Wilkinson 580b1b81ab Fix HTTP/2 over TLS with Jetty 10
Fixes gh-26988
2021-06-21 12:06:10 +01:00
Stephane Nicoll 1374491305 Upgrade to SLF4J 1.7.31
Closes gh-26986
2021-06-21 08:46:27 +02:00
Stephane Nicoll 799f6b0bdd Upgrade to Postgresql 42.2.22
Closes gh-26985
2021-06-21 08:46:26 +02:00
Stephane Nicoll c9a787c7ac Upgrade to Jetty EL 8.5.68
Closes gh-26984
2021-06-21 08:46:25 +02:00
Stephane Nicoll ce24270271 Upgrade to Dropwizard Metrics 4.1.23
Closes gh-26983
2021-06-21 08:46:24 +02:00
Stephane Nicoll cc6c53f040 Start building against Spring Integration 5.4.8 snapshots
See gh-26967
2021-06-18 18:22:42 +02:00
Stephane Nicoll 9477231c51 Start building against Spring AMQP 2.3.9 snapshots
See gh-26966
2021-06-18 18:21:36 +02:00
Stephane Nicoll fa37fb0a69 Start building against Spring Security 5.4.7 snapshots
See gh-26965
2021-06-18 18:21:08 +02:00
Stephane Nicoll 2f30449d11 Start building against Spring Session 2020.0.5 snapshots
See gh-26964
2021-06-18 18:20:41 +02:00
Stephane Nicoll b462feaa58 Start building against Spring Data 2020.0.10 snapshots
See gh-26963
2021-06-18 18:20:02 +02:00
Stephane Nicoll 22c4c6ea80 Start building against Reactor 2020.0.8 snapshots
See gh-26962
2021-06-18 18:19:01 +02:00
Stephane Nicoll 63fe89f641 Merge branch '2.5.x'
Closes gh-26957
2021-06-18 08:29:36 +02:00
Yanming Zhou 12a6e4c231 Add missing space for asciidoc ordered list
See gh-26955
2021-06-18 08:27:45 +02:00
Scott Frederick fffe2e4f97 Include caller info in NoSuchMethodError failure analysis
Fixes gh-26895
2021-06-17 13:46:51 -05:00
Andy Wilkinson b1c04e91d7 Merge branch '2.5.x'
Closes gh-26951
2021-06-17 19:43:57 +01:00
Andy Wilkinson 5d20edc666 Allow BFPP to modify database initialization ordering
Fixes gh-26899
2021-06-17 18:08:39 +01:00
Andy Wilkinson 897a7196c0 Merge branch '2.5.x'
Closes gh-26948
2021-06-17 17:28:07 +01:00
Andy Wilkinson a2772e288a Merge branch '2.4.x' into 2.5.x
Closes gh-26947
2021-06-17 17:27:56 +01:00
Andy Wilkinson cd808d2f18 Only get Kotlin plugin's version once we know we need it
Fixes gh-26946
2021-06-17 17:27:03 +01:00
Andy Wilkinson 69b730521a Merge branch '2.5.x'
See gh-26936
2021-06-17 11:55:26 +01:00
Andy Wilkinson 566a642ce7 Merge branch '2.4.x' into 2.5.x
See gh-26935
2021-06-17 11:54:54 +01:00
Andy Wilkinson 204dd29c51 Fix test on Windows
See gh-26821
2021-06-17 11:54:24 +01:00
Andy Wilkinson 2d44119894 Merge branch '2.5.x'
Closes gh-26943
2021-06-17 11:43:15 +01:00
Andy Wilkinson 7ee3b287e1 Catch isEmbedded failure and treat database as not embedded
Fixes gh-26926
2021-06-17 11:42:26 +01:00
Andy Wilkinson fb8f7afce5 Merge branch '2.5.x'
Closes gh-26942
2021-06-17 11:24:28 +01:00
Andy Wilkinson 7cd2d6474c Only check database's type when there are scripts to apply
Fixes gh-26925
2021-06-17 09:55:33 +01:00
Phillip Webb ad8ce2aa05 Merge branch '2.5.x' 2021-06-16 23:43:14 -07:00
Phillip Webb 5c65b1bcde Fix asciidoctor anchor references
See gh-26939
2021-06-16 23:42:29 -07:00
Phillip Webb 7bd6611e4c Merge branch '2.5.x'
Closes gh-26940
2021-06-16 22:43:52 -07:00
Phillip Webb c3b873c11d Merge branch '2.4.x' into 2.5.x
Closes gh-26939
2021-06-16 22:43:13 -07:00
Phillip Webb b5c92d5174 Allow indirect standard profile-specific imports
Effectively revert commit d1b256a169 so that profile-specific imports
can again be used with or without a parent import.

Fixes gh-26858
2021-06-16 22:30:29 -07:00
Scott Frederick 256a523e84 Merge branch '2.5.x'
Closes gh-26936
2021-06-16 16:00:09 -05:00
Scott Frederick 79f47b150a Merge branch '2.4.x' into 2.5.x
Closes gh-26935
2021-06-16 15:59:38 -05:00
Scott Frederick 5147fcacdf Improve BeanNotOfRequiredTypeFailureAnalyzer output
This commit modifies the output of BeanNotOfRequiredTypeFailureAnalyzer
to include type information for both the actual and the required types
and to remove ambiguity.

Fixes gh-26821
2021-06-16 14:44:11 -05:00
Andy Wilkinson 76ac18f282 Merge branch '2.5.x'
Closes gh-26929
2021-06-16 13:06:44 +01:00
Andy Wilkinson bc7004d9c6 Fix WebSocket support with Jetty 10.0.x
Fixes gh-26847
2021-06-16 12:38:33 +01:00
Andy Wilkinson 1c49ca6ff2 Merge branch '2.5.x'
Closes gh-26924
2021-06-16 08:28:17 +01:00
Andy Wilkinson d635e1e779 Merge branch '2.4.x' into 2.5.x
Closes gh-26923
2021-06-16 08:28:05 +01:00
Andy Wilkinson fe078c8afc Avoid capturing URI template when interceptor won't use it
Previously, the URI template handler installed by the client metrics
interceptor would always capture the URI template and push it onto the
deque, irrespective of whether auto timing was enabled. When
auto-timing is disabled the deque is never polled so this led to its
unrestricted growth.

This commit updates the URI template handler so that a URI template is
only pushed onto the deque when the auto timing configuration enables
the interceptor.

Fixes gh-26915
2021-06-16 08:27:51 +01:00
Phillip Webb 18dc99dadb Merge branch '2.5.x'
Closes gh-26920
2021-06-15 17:31:21 -07:00
Phillip Webb b75c79cc7c Merge branch '2.4.x' into 2.5.x
Closes gh-26919
2021-06-15 17:30:31 -07:00
Phillip Webb 5ca687c9a6 Polish 'Make livereload websocket headers case insensitive'
See gh-26813

Closes gh-26813
2021-06-15 17:29:45 -07:00
Francis Lavoie 8755512719 Make livereload websocket headers case insensitive
Update livereload `Connection` handling code so that websocket headers
are no longer case sensitive.

See gh-26813
2021-06-15 16:50:34 -07:00
Andy Wilkinson 63976367be Merge branch '2.5.x'
Closes gh-26918
2021-06-15 22:21:34 +01:00
Andy Wilkinson 2c2ab69315 Merge branch '2.4.x' into 2.5.x
Closes gh-26917
2021-06-15 22:20:52 +01:00
Andy Wilkinson a1e279f736 Make Flyway and Liquibase auto-config back off without spring-jdbc
The auto-config requires Spring JDBC for DataSource creation from
spring.flyway.url or spring.liquibase.url, checking Flyway migrations
exist, etc. Without it, the application fails to start due to missing
spring-jdbc classes.

This commit updates the auto-config so that it backs off in the
absence of spring-jdbc.

Closes gh-26849
2021-06-15 22:00:11 +01:00
Andy Wilkinson e0d0be97c5 Merge branch '2.5.x'
See gh-26902
2021-06-15 20:01:35 +01:00
Andy Wilkinson 44187bc6bf Merge branch '2.4.x' into 2.5.x
See gh-26901
2021-06-15 20:01:01 +01:00
Andy Wilkinson 7ba575d392 Prevent RestarterTests.testRestart from triggering unwanted restarts
See gh-26900
2021-06-15 19:59:37 +01:00
Stephane Nicoll a1a86e75ac Merge branch '2.5.x'
Closes gh-26912
2021-06-15 08:38:51 +02:00
Stephane Nicoll 96029dbd8a Polish "Add Azure info to the cloud deployment docs"
See gh-26910
2021-06-15 08:35:56 +02:00
Andy Clement 8321faaf16 Add Azure info to the cloud deployment docs
See gh-26910
2021-06-15 08:34:29 +02:00
Stephane Nicoll caa87f1a90 Merge branch '2.5.x'
Closes gh-26911
2021-06-15 08:24:30 +02:00
izeye eeefaf4314 Fix Javadoc deprecated since
See gh-26907
2021-06-15 08:23:13 +02:00
Stephane Nicoll 52fedb2bb4 Add support for InfluxDB 2.x
Closes gh-25891
2021-06-15 08:21:37 +02:00
Andy Wilkinson 043cf88687 Merge branch '2.5.x'
Closes gh-26905
2021-06-14 21:02:19 +01:00
Andy Wilkinson 6a51c272b9 Test our Gradle plugin against Gradle 7.1
Closes gh-26904
2021-06-14 21:01:06 +01:00
Andy Wilkinson 3b613a4f2d Merge branch '2.5.x'
Closes gh-26902
2021-06-14 19:16:52 +01:00
Andy Wilkinson 017ba504d7 Merge branch '2.4.x' into 2.5.x
Closes gh-26901
2021-06-14 19:16:10 +01:00
Andy Wilkinson 32effdba0a Try to stabilize RestarterTests.testRestart
Closes gh-26900
2021-06-14 19:15:09 +01:00
Madhura Bhave aa873d3a22 Reorder documentation overview section
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
2021-06-14 10:48:49 -07:00
Madhura Bhave 91ca9763e0 Reorder documentation overview section
The documentation overview sections is supposed to provide a map
for the rest of the reference document. The getting help and upgrading
sections were moved to align with that.
2021-06-14 10:25:01 -07:00
Andy Wilkinson 0ec598c99d Merge branch '2.5.x' 2021-06-14 13:36:37 +01:00
Andy Wilkinson 9e2339b5d0 Merge branch '2.4.x' into 2.5.x 2021-06-14 13:36:29 +01:00
Andy Wilkinson 16bfa669e1 Polish authors separators 2021-06-14 13:35:30 +01:00
Andy Wilkinson bc715c64b1 Merge branch '2.5.x'
Closes gh-26892
2021-06-14 13:33:19 +01:00
Andy Wilkinson 5f26fd9ccb Merge branch '2.4.x' into 2.5.x
Closes gh-26891
2021-06-14 13:28:54 +01:00
Andy Wilkinson f6b7730dac Use Asciidoctor's revision line to provide document's version
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.

Closes gh-26851
2021-06-14 13:24:01 +01:00
Andy Wilkinson 6982bbdc2b Merge branch '2.5.x'
Closes gh-26890
2021-06-14 11:06:44 +01:00
Andy Wilkinson 5de5390ef9 Merge branch '2.4.x' into 2.5.x
Closes gh-26889
2021-06-14 11:05:53 +01:00
Andy Wilkinson c89430e174 Try to stabilize httpConnectionsAreClosedAfterLongPollTimeout
Closes gh-26888
2021-06-14 11:04:23 +01:00
Andy Wilkinson 06c6eee7c5 Merge branch '2.5.x'
Closes gh-26887
2021-06-14 10:53:42 +01:00
Andy Wilkinson 3858c6299d Merge branch '2.4.x' into 2.5.x
Closes gh-26886
2021-06-14 10:52:53 +01:00
Andy Wilkinson 7a14a53250 Try to stabilize TunnelClientTests.addListener()
Closes gh-26885
2021-06-14 10:52:12 +01:00
Stephane Nicoll e7df0a8bf2 Remove dependency management for Nimbus
Closes gh-26819
2021-06-14 10:18:26 +02:00
Stephane Nicoll a0cf1eed41 Add support for customizing the auto-configured ClientResources
Closes gh-26792
2021-06-14 09:32:43 +02:00
Stephane Nicoll f8555b9071 Add metrics for task execution and scheduling
Closes gh-23818
2021-06-14 09:07:40 +02:00
Stephane Nicoll 6505e03cb2 Polish "Add auto-configuration for Spring Data Envers"
See gh-22610
2021-06-14 08:28:17 +02:00
Stefano Cordio 91da8c9fc6 Add auto-configuration for Spring Data Envers
See gh-22610
2021-06-14 08:28:16 +02:00
Stephane Nicoll d17c475504 Polish "Enable Redis connection pool if commons-pool2 is available"
See gh-26326
2021-06-14 08:25:21 +02:00
weixsun 55ff163018 Enable Redis connection pool if commons-pool2 is available
See gh-26326
2021-06-14 08:25:21 +02:00
Stephane Nicoll 05acfaa690 Polish "Upgrade to Flyway 7.9.2"
See gh-26456
2021-06-14 08:22:09 +02:00
Kedar Joshi e6236b76bb Upgrade to Flyway 7.9.2
See gh-26456
2021-06-14 08:22:01 +02:00
Stephane Nicoll d5d23d73e7 Polish "Allow SpringApplicationBuilder to specify a ResourceLoader"
See gh-26690
2021-06-14 08:17:52 +02:00
Jamin Hitchcock 7b0ba35025 Allow SpringApplicationBuilder to specify a ResourceLoader
See gh-26690
2021-06-14 08:17:02 +02:00
Stephane Nicoll fc0438eda8 Polish "Allow direct use of exposed WebSessionIdResolver bean"
See gh-26437
2021-06-14 08:13:58 +02:00
weixsun 65ce1454e0 Allow direct use of exposed WebSessionIdResolver bean
See gh-26437
2021-06-14 08:13:58 +02:00
Stephane Nicoll b7f126020e Update copyright year of change file
See gh-26422
2021-06-12 18:00:24 +02:00
Marcus Klimstra 10ffaffb7b Improve configuration of Start and Stop goals
See gh-26422
2021-06-12 18:00:24 +02:00
Stephane Nicoll 6b4efcce11 Polish "Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder"
See gh-26341
2021-06-12 17:51:57 +02:00
nguyensach 850c653862 Apply RSocketConnectorConfigurer beans to RSocketRequester.Builder
See gh-26341
2021-06-12 17:51:57 +02:00
Stephane Nicoll 69c2621a14 Polish "Add support for @Value annotation"
See gh-26337
2021-06-12 17:40:34 +02:00
Mark Jeffrey 14d86034a1 Add support for @Value annotation
This commit adds support for `@Value` from project Lombok for metadata
generation. This is very similar to the existing `@Data` support.

See gh-26337
2021-06-12 17:40:34 +02:00
Stephane Nicoll d847f4c69e Polish "Add configuration property for Tomcat's rejectIllegalHeader"
See gh-26311
2021-06-12 17:27:11 +02:00
David Byron e5a539d80e Add configuration property for Tomcat's rejectIllegalHeader
See gh-26311
2021-06-12 17:27:10 +02:00
Stephane Nicoll a1183c4641 Polish "Reproducible build for spring-boot-maven-plugin:build-info"
See gh-26221
2021-06-12 17:11:14 +02:00
Slawomir Jaranowski 2dec6dd552 Reproducible build for spring-boot-maven-plugin:build-info
See gh-26221
2021-06-12 17:11:14 +02:00
Andy Wilkinson 2bea21ed4f Merge branch '2.5.x'
Closes gh-26874
2021-06-11 19:53:32 +01:00
Andy Wilkinson 866f1e34c1 Merge branch '2.4.x' into 2.5.x
Closes gh-26873
2021-06-11 19:53:05 +01:00
Andy Wilkinson 37d395bad2 Try to stabilize flaky MetricsWebClientFilterFunction test
Closes gh-26855
2021-06-11 19:48:34 +01:00
Stephane Nicoll a90c7181b7 Polish "Add auto-configuration for DiskSpaceMetrics"
See gh-26001
2021-06-11 17:01:36 +02:00
bono007 e3f03dd50a Add auto-configuration for DiskSpaceMetrics
See gh-26001
2021-06-11 17:01:36 +02:00
Andy Wilkinson 151e0eb2b6 Merge branch '2.5.x'
Closes gh-26871
2021-06-11 15:55:42 +01:00
Andy Wilkinson 0ab7144bf1 Merge branch '2.4.x' into 2.5.x
Closes gh-26870
2021-06-11 15:55:31 +01:00
Andy Wilkinson 608c4509f8 Try to stabilise SocketTargetServerConnectionTests
Closes gh-26857
2021-06-11 15:55:01 +01:00
Andy Wilkinson 5123d7c937 Merge branch '2.4.x'
Closes gh-26869
2021-06-11 15:50:33 +01:00
Andy Wilkinson 00b9e7f498 Merge branch '2.4.x' into 2.5.x
Closes gh-26868
2021-06-11 15:49:57 +01:00
Andy Wilkinson 186658cc12 Attempt to stabilize stopTriggersTunnelClose
Closes gh-26856
2021-06-11 15:48:50 +01:00
Stephane Nicoll 9e46061aa6 Allow to chain ContextConsumer implementations
Closes gh-26723
2021-06-11 16:04:34 +02:00
Andy Wilkinson f3f119b111 Don't shutdown logging system before contexts
Add `SpringApplicationShutdownHook` to manage orderly application
shutdown, specifically around the `LoggingSystem`. `SpringApplication`
now offers a `getShutdownHandlers()` method that can be used to add
handlers that are guaranteed to only run after the `ApplicationContext`
has been closed and is inactive.

Fixes gh-26660
2021-06-10 07:56:48 -07:00
Andy Wilkinson 39aa27e13c Make DB init back off without DatabasePopulator
Fixes gh-26850
2021-06-10 11:27:25 +01:00
Phillip Webb 2835085ffb Polish 2021-06-10 00:21:38 -07:00
Phillip Webb 17671980dc Merge branch '2.4.x' 2021-06-10 00:15:48 -07:00
Phillip Webb 7c4f178c17 Merge branch '2.3.x' into 2.4.x 2021-06-10 00:15:28 -07:00
Phillip Webb 3b48526732 Polish 2021-06-10 00:12:34 -07:00
Stephane Nicoll 18eb88b281 Upgrade to Git Commit ID Plugin 4.0.5
Closes gh-26845
2021-06-10 08:38:38 +02:00
Stephane Nicoll f79f2b1594 Upgrade to Spring AMQP 2.3.8
Closes gh-26764
2021-06-10 07:58:19 +02:00
Stephane Nicoll ab90a948be Polish "Fix Optaplanner starter url"
See gh-26816
2021-06-10 07:53:07 +02:00
Geoffrey De Smet 736b0678e5 Fix Optaplanner starter url
See gh-26816
2021-06-10 07:52:35 +02:00
Stephane Nicoll a7c538faa0 Upgrade to RSocket 1.1.1
Closes gh-26839
2021-06-10 07:46:17 +02:00
Stephane Nicoll 2201315556 Upgrade to Jetty 9.4.42.v20210604
Closes gh-26838
2021-06-10 07:46:17 +02:00
Stephane Nicoll 5cb1bd8245 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26837
2021-06-10 07:46:17 +02:00
Madhura Bhave 2e2d1fe8d3 Merge branch '2.4.x' into main 2021-06-09 14:46:36 -07:00
Madhura Bhave e3042b38f5 Merge branch '2.3.x' into 2.4.x 2021-06-09 14:45:23 -07:00
Madhura Bhave 63806d5bac Remove duplicate copyright notice from docs 2021-06-09 14:44:44 -07:00
Andy Wilkinson d79b3597bb Upgrade to Spring AMQP 2.3.8
Closes gh-26762
2021-06-09 21:39:24 +01:00
Andy Wilkinson d4200a7c56 Upgrade to Spring Integration 5.3.8.RELEASE
Closes gh-26772
2021-06-09 21:20:14 +01:00
Andy Wilkinson 03e1b255ea Upgrade to Spring AMQP 2.2.18.RELEASE
Closes gh-26770
2021-06-09 21:18:37 +01:00
Andy Wilkinson 9fb7cf49e4 Upgrade to Spring Kafka 2.7.2
Closes gh-26765
2021-06-09 19:43:37 +01:00
Andy Wilkinson 4a11c6a135 Upgrade to Spring Kafka 2.6.9
Closes gh-26763
2021-06-09 19:29:23 +01:00
Andy Wilkinson 53068a2489 Upgrade to Spring Kafka 2.5.14.RELEASE
Closes gh-26771
2021-06-09 19:15:08 +01:00
Andy Wilkinson 46d7999b1d Lower spring.sql.init.enabled's deprecation level to warning
See gh-26682
2021-06-09 19:11:20 +01:00
Andy Wilkinson de410b7621 Merge branch '2.4.x'
Closes gh-26828
2021-06-09 18:01:32 +01:00
Andy Wilkinson a1c5fcca58 Move common Asciidoctor configuration into our conventions
Closes gh-26620
2021-06-09 18:00:45 +01:00
Stephane Nicoll 6a7a11ba59 Upgrade to RSocket 1.1.1
Closes gh-26836
2021-06-09 15:24:13 +02:00
Stephane Nicoll 66ae421f74 Upgrade to Neo4j Java Driver 4.1.3
Closes gh-26835
2021-06-09 15:24:12 +02:00
Stephane Nicoll f9a0b0308d Upgrade to Jetty 9.4.42.v20210604
Closes gh-26834
2021-06-09 15:24:11 +02:00
Stephane Nicoll 6cdbed7dc3 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26833
2021-06-09 15:24:09 +02:00
Stephane Nicoll 872ec0bf00 Upgrade to RSocket 1.0.5
Closes gh-26832
2021-06-09 15:00:55 +02:00
Stephane Nicoll f73e7bcc0c Upgrade to Neo4j OGM 3.2.24
Closes gh-26831
2021-06-09 15:00:54 +02:00
Stephane Nicoll 1ef0068b38 Upgrade to Jetty 9.4.42.v20210604
Closes gh-26830
2021-06-09 15:00:53 +02:00
Stephane Nicoll 0563955324 Upgrade to Jetty Reactive HTTPClient 1.1.9
Closes gh-26829
2021-06-09 15:00:51 +02:00
Stephane Nicoll 8590eccac4 Polish
See gh-26682
2021-06-09 14:47:54 +02:00
Stephane Nicoll d23b07a166 Upgrade to Spring Framework 5.3.8
Closes gh-26761
2021-06-09 12:21:45 +02:00
Stephane Nicoll e9592229fc Upgrade to Spring Framework 5.3.8
Closes gh-26760
2021-06-09 12:01:55 +02:00
Andy Wilkinson 03f8a46c80 Test our Gradle plugin against 7.1-rc-2
Closes gh-26825
2021-06-09 09:41:25 +01:00
Andy Wilkinson c5728c9560 Merge branch '2.4.x'
Closes gh-26827
2021-06-09 09:13:21 +01:00
Andy Wilkinson 303edac6bb Merge branch '2.3.x' into 2.4.x
Closes gh-26826
2021-06-09 09:13:06 +01:00
Andy Wilkinson d1e1796f76 Consider overridden getRootUri() when getting root URI
Fixes gh-26812
2021-06-09 09:12:37 +01:00
Phillip Webb 850088de32 Merge branch '2.4.x'
Closes gh-26823
2021-06-08 18:17:33 -07:00
Phillip Webb d5264664e6 Merge branch '2.3.x' into 2.4.x
Closes gh-26822
2021-06-08 18:17:18 -07:00
Phillip Webb 1f6983c4c9 Make CompositeHealth.getDetails() public
Change `CompositeHealth.getDetails()` to public so that it serializes
correctly when `MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS` is
disabled.

Fixes gh-26797
2021-06-08 18:17:09 -07:00
Phillip Webb f798f26596 Merge branch '2.4.x' 2021-06-08 18:05:50 -07:00
Phillip Webb 4d62e47c5d Merge branch '2.3.x' into 2.4.x 2021-06-08 18:05:12 -07:00
Phillip Webb 9e1c78da99 Update copyright year of changed files 2021-06-08 18:03:46 -07:00
Phillip Webb 703eaa71f4 Remove main class configuration fallback
Remove fallback code since we now require Gradle 6.8 and can depend
on the `getMainClass` method being present.

Closes gh-26794
2021-06-08 18:00:50 -07:00
Phillip Webb b7ac1e6cd7 Rename derivefrom to align with DataSourceBuilder
Rename the `derivefrom` method in `ConnectionFactoryBuilder` to
`derivedFrom` to align with `DataSourceBuilder`.

Fixes gh-26810
2021-06-08 15:44:01 -07:00
Phillip Webb f8c3e0e5aa Respect custom username/password properties
Fix a bug in `DataSourceInitializationConfiguration` and in
`R2dbcInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
2021-06-08 14:58:39 -07:00
Phillip Webb d19b2681ab Rework build-image-customization table in docs
Collapse parameter name and user property into a single column to give
a little more room for the description and default value.

Closes gh-25739
2021-06-08 14:46:53 -07:00
Phillip Webb 6ab2df5698 Order DataSourceScriptDatabaseInitializer last
Change the order of `DataSourceScriptDatabaseInitializerDetector` so
that it always runs last. This update allows script initialization to
be combined with a high-level migration tool such as Flyway.

Closes gh-26692
2021-06-08 14:10:59 -07:00
Phillip Webb dafd511284 Support DatabaseInitializerDetector ordering
Update `DatabaseInitializationDependencyConfigurer` so that depends-on
ordering is applied based on the `DatabaseInitializerDetector` order.

Prior to this commit, if multiple DatabaseInitializer beans were
detected the order in which they were initialized was not defined.

See gh-26692
2021-06-08 14:10:55 -07:00
Scott Frederick fba5ffc626 Fix FilePermissionsTests on Windows
See gh-26658
2021-06-08 15:58:03 -05:00
Andy Wilkinson 8df6392ca5 Polish
The use of the file's absolute path caused test failures on Windows.

See gh-26682
2021-06-08 18:28:09 +01:00
Andy Wilkinson c52143727a Reinstate mode for controlling DB initialization
Closes gh-26682
2021-06-08 15:13:55 +01:00
Andy Wilkinson 1a0e008a8c Prevent Netty tcNative from loading classes with wrong class loader
In our tests, the JNI code in Netty tcNative can cause some of its
classes to be loaded using a ModifiedClassPathClassLoader. When the
wrong class loader is used, SSL-related tests fail, for example due
to the same Netty tcNative classes being loaded by two different
ClassLoders and no longer being the same. This appears to be
dependent upon the order in which tests are executed and results in
intermittent test failures.

It looks like this should be addressed in Netty tcNative 2.0.40 which
preloads all of its classes. In the meantime, this commit updates
ModifiedClassPathClassLodaer to ignore Netty tcNative classes so that
they're only ever loaded by the system class loader.

Closes gh-26749
2021-06-08 11:20:02 +01:00
Stephane Nicoll faeda6f917 Polish 2021-06-08 10:32:50 +02:00
Stephane Nicoll 4c71e8124d Upgrade to Undertow 2.2.8.Final
Closes gh-26809
2021-06-08 08:24:55 +02:00
Stephane Nicoll 11d31edf0a Upgrade to Neo4j Java Driver 4.2.6
Closes gh-26808
2021-06-08 08:24:54 +02:00
Stephane Nicoll 88b9b88cd9 Upgrade to jOOQ 3.14.11
Closes gh-26807
2021-06-08 08:24:53 +02:00
Stephane Nicoll b755eacd86 Upgrade to Johnzon 1.2.13
Closes gh-26806
2021-06-08 08:24:51 +02:00
Stephane Nicoll 3d5caf0863 Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26805
2021-06-08 08:24:50 +02:00
Stephane Nicoll a74fb0c2f0 Upgrade to Infinispan 12.1.4.Final
Closes gh-26804
2021-06-08 08:24:50 +02:00
Stephane Nicoll b4d0c3df6d Upgrade to Hibernate 5.4.32.Final
Closes gh-26803
2021-06-08 08:24:49 +02:00
Stephane Nicoll 7ea263548c Upgrade to Gson 2.8.7
Closes gh-26802
2021-06-08 08:24:48 +02:00
Stephane Nicoll e2a877ca07 Upgrade to Ehcache3 3.9.4
Closes gh-26801
2021-06-08 08:24:47 +02:00
Stephane Nicoll 5a18553b50 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26800
2021-06-08 08:24:45 +02:00
Stephane Nicoll b9d29130fb Upgrade to Couchbase Client 3.1.6
Closes gh-26799
2021-06-08 08:24:44 +02:00
Stephane Nicoll cd8a9d3705 Upgrade to AppEngine SDK 1.9.89
Closes gh-26798
2021-06-08 08:24:43 +02:00
Phillip Webb f5b93da90f Fix conversion failures when using DefaultResolver
Update `ConfigurationPropertySourcesPropertyResolver` so that calls to
the `DefaultResolver` do not attempt conversion.

Prior to this commit, the delegate resolver was accidentally called
with the target type which could cause a `ConversionFailedException`
to be thrown. We should have always used `Object.class` and let the
`convertValueIfNecessary` method perform conversion.

Fixes gh-26732
2021-06-07 22:07:22 -07:00
Phillip Webb be23a29651 Polish 2021-06-07 20:44:23 -07:00
Andy Wilkinson 87d35250a5 Test our Gradle plugin against 7.1-rc-1
7.1-rc-1 deprecates JavaExec's main property in favor of mainClass
which was introduced in Gradle 6.4. This commit updates some tests
to use mainClass rather than main that would otherwise have failed
due to deprecation warnings in their output.

Closes gh-26793
2021-06-07 13:35:52 +01:00
Stephane Nicoll bac89a3919 Upgrade to Undertow 2.2.8.Final
Closes gh-26791
2021-06-07 07:57:54 +02:00
Stephane Nicoll d6f22f0802 Upgrade to jOOQ 3.14.11
Closes gh-26790
2021-06-07 07:57:53 +02:00
Stephane Nicoll 99169af57c Upgrade to Johnzon 1.2.13
Closes gh-26789
2021-06-07 07:57:52 +02:00
Stephane Nicoll fe249dd772 Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26788
2021-06-07 07:57:51 +02:00
Stephane Nicoll 5be4a9ab50 Upgrade to Hibernate 5.4.32.Final
Closes gh-26787
2021-06-07 07:57:50 +02:00
Stephane Nicoll e496d2e321 Upgrade to Gson 2.8.7
Closes gh-26786
2021-06-07 07:57:49 +02:00
Stephane Nicoll 16ff9318b5 Upgrade to Ehcache3 3.9.4
Closes gh-26785
2021-06-07 07:57:48 +02:00
Stephane Nicoll 90f96e2d48 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26784
2021-06-07 07:57:47 +02:00
Stephane Nicoll cfaab0904b Upgrade to AppEngine SDK 1.9.89
Closes gh-26783
2021-06-07 07:57:46 +02:00
Phillip Webb abd926788f Merge branch '2.4.x'
Closes gh-26782
2021-06-06 21:53:10 -07:00
Phillip Webb 7396e1e743 Fix property ordering within '.' and '/config'
Allow groups to be used with standard locations so that order of
profile-specific files is consistent.

Prior to this commit, the default search locations considered for
application properties/yaml files was the following:

	optional:classpath:/
	optional:classpath:/config/
	optional:file:./
	optional:file:./config/
	optional:file:./config/*/

Each of these locations was independent which could cause confusion
if certain combinations were used. For example, if profile-specific
files were added to `classpath:/` and `classpath:/config/` then the
latter would always override the former regardless of the profile
ordering.

This commit updates `StandardConfigDataLocationResolver` so that a
group of locations can be specified for each item. This allows us to
define the following set of search locations which provide more logical
ordering for profile-specific files

	optional:classpath:/;optional:classpath:/config/
	optional:file:./;optional:file:./config/;optional:file:./config/*/

Closes gh-26593
2021-06-06 21:05:54 -07:00
Stephane Nicoll 1e680241ed Upgrade to Johnzon 1.2.13
Closes gh-26781
2021-06-06 20:25:54 +02:00
Stephane Nicoll 3a0794da4b Upgrade to JBoss Logging 3.4.2.Final
Closes gh-26780
2021-06-06 20:25:52 +02:00
Stephane Nicoll 84a4693dcf Upgrade to Hibernate 5.4.32.Final
Closes gh-26779
2021-06-06 20:25:51 +02:00
Stephane Nicoll 790a8c1f47 Upgrade to Gson 2.8.7
Closes gh-26778
2021-06-06 20:25:50 +02:00
Stephane Nicoll 7ccbe3c5f8 Upgrade to Dropwizard Metrics 4.1.22
Closes gh-26777
2021-06-06 20:25:48 +02:00
Stephane Nicoll f3049e8e94 Upgrade to AppEngine SDK 1.9.89
Closes gh-26776
2021-06-06 20:25:47 +02:00
Stephane Nicoll 5391f028a7 Start building against Spring Kafka 2.7.2 snapshots
See gh-26765
2021-06-06 20:23:37 +02:00
Stephane Nicoll caacee5f1c Start building against Spring AMQP 2.3.8
See gh-26764
2021-06-06 20:23:11 +02:00
Stephane Nicoll c435f6337c Start building against Spring Framework 5.3.8 snapshots
See gh-26761
2021-06-06 20:22:45 +02:00
Stephane Nicoll 39f259554b Start building against Spring Integration 5.3.8 snapshots
See gh-26772
2021-06-05 18:24:22 +02:00
Stephane Nicoll 37625854b6 Start building against Spring Kafka 2.5.14 snapshots
See gh-26771
2021-06-05 18:23:57 +02:00
Stephane Nicoll 323d1e224d Start building against Spring AMQP 2.2.18 snapshots
See gh-26770
2021-06-05 18:23:27 +02:00
Stephane Nicoll de06bbb4dc Start building against Spring Kafka 2.6.9 snapshots
See gh-26763
2021-06-04 17:50:30 +02:00
Stephane Nicoll 4c31ccb576 Start building against Spring AMQP 2.3.8 snapshots
See gh-26762
2021-06-04 17:50:30 +02:00
Stephane Nicoll d2fe417bbb Start building against Spring Framework 5.3.8 snapshots
See gh-26760
2021-06-04 17:50:30 +02:00
Stephane Nicoll 5ac5038176 Merge branch '2.4.x' 2021-06-04 17:49:52 +02:00
Stephane Nicoll aea8597114 Merge branch '2.3.x' into 2.4.x 2021-06-04 17:49:40 +02:00
Stephane Nicoll 6490edc16d Polish 2021-06-04 17:46:42 +02:00
Stephane Nicoll aff1366731 Polish "Fix typo in 'Reacting to the Maven plugin' title"
See gh-26751
2021-06-04 09:51:48 +02:00
Abel Salgado Romero 9eea502c3e Fix typo in 'Reacting to the Maven plugin' title
See gh-26751
2021-06-04 09:46:47 +02:00
Phillip Webb e73062aefa Merge branch '2.4.x'
Closes gh-26755
2021-06-03 22:24:17 -07:00
Phillip Webb 0da0d2d469 Prevent nested profile-specific resolution
Update the `ConfigDataEnvironment` so that the `resolveProfileSpecific`
method of `ConfigDataLocationResolver` is no longer called when
resolving imports declared in a profile-specific file.

Fixes gh-26753
2021-06-03 22:24:01 -07:00
Phillip Webb 3c7a0d3bf2 Merge branch '2.4.x'
Closes gh-26754
2021-06-03 22:23:27 -07:00
Phillip Webb d1b256a169 Prevent indirect standard profile-specific imports
Update `StandardConfigDataLocationResolver` so that profile-specific
imports can only be used when there is no parent import.

Prior to this commit, given the following application.properties file:

	spring.profiles.active=p1,p2
	spring.config.import=other.properties

We would attempt to import `other.properties`, `other-p1.properties`
and `other-p2.properties`. This seems quite confusing and when we really
only need to support profile-specific properties for the initial root
set of locations.

Fixes gh-26752
2021-06-03 22:22:44 -07:00
Stephane Nicoll 75f31f6bc4 Merge branch '2.4.x'
Closes gh-26748
2021-06-03 09:27:01 +02:00
Stephane Nicoll ad99aa2f4a Merge branch '2.3.x' into 2.4.x
Closes gh-26747
2021-06-03 09:26:38 +02:00
dreis2211 f470151535 Remove reference to surefirebooter JAR
See gh-26737
2021-06-03 09:24:56 +02:00
Phillip Webb 02494d63d2 Merge branch '2.4.x'
Closes gh-26744
2021-06-02 17:26:05 -07:00
Phillip Webb 1cda557d03 Merge branch '2.3.x' into 2.4.x
Closes gh-26743
2021-06-02 17:25:51 -07:00
Phillip Webb 1beee5700c Don't close early when SecurityManager present
Update `JarFile` and `JarFileWrapper` classes so that they no longer
close the `JarFile` early if a `SecurityManager` is in use.

Prior to this commit, the closed `JarFile` would cause (an ultimately
swallowed) NPE in `ZipFile` which manifested itself as a
`ClassNotFoundException` when starting the app.

Closes gh-25538
2021-06-02 17:24:05 -07:00
Madhura Bhave 554cf9d7c7 Merge branch '2.4.x' into main
Closes gh-26741
2021-06-02 12:24:36 -07:00
Madhura Bhave 2ff3fe22e5 Merge branch '2.3.x' into 2.4.x
Closes gh-26740
2021-06-02 12:20:02 -07:00
Madhura Bhave d0e2925dcc Fix link to Spring Data JPA docs
Fixes gh-26736
2021-06-02 12:18:57 -07:00
Scott Frederick f560e86f03 Write buildpack directories to builder layer
When a custom buildpack is provided for image building, the contents
of the buildpack directory, tgz file, or image are copied as tar
entries to a new layer in the ephemeral builder image. Prior to this
commit, only file entries from the buildpack source were copied as
builder layer tar entries; intermediate directory entries from the
source were not copied. This results in directories being created in
the builder container using default permissions. This worked on most
Linux-like OSs where the default permissions allow others-read
access. On some OSs like Arch Linux where the default directory
permissions do not allow others-read, this prevented the lifecycle
processes from reading the buildpack files.

This commit explicitly creates all intermediate directory tar entries
in the builder image layer to ensure that the buildpack directories
and files can be read by the lifecycle processes.

Fixes gh-26658
2021-06-02 14:09:53 -05:00
Madhura Bhave e2cba40db0 Merge branch '2.4.x' into main
Closes gh-26739
2021-06-02 12:02:53 -07:00
Madhura Bhave b102fdd392 Merge branch '2.3.x' into 2.4.x
Closes gh-26738
2021-06-02 12:02:11 -07:00
Madhura Bhave 15324956a8 Align int and long in RandomValuePropertySource
This commit aligns int and long so that a random number is generated
by delegating to ints/longs in the JDK's Random API. In the case of a
single bound value, it needs to be greater than 0 because 0 is used as
the lower bound.

Fixes gh-26628
2021-06-02 12:00:25 -07:00
Stephane Nicoll e9ed92a305 Polish 2021-06-02 14:14:04 +02:00
Stephane Nicoll 1f95989e85 Merge branch '2.4.x'
Closes gh-26735
2021-06-02 13:56:13 +02:00
Stephane Nicoll 363c43e315 Merge branch '2.3.x' into 2.4.x
Closes gh-26734
2021-06-02 13:52:03 +02:00
Stephane Nicoll 3f23b9265d Clarify when a connection pool is created for Redis
Closes gh-26733
2021-06-02 13:49:16 +02:00
Stephane Nicoll 7b490f003c Avoid dependency on Kotlin when depending on spring-security-config
Closes gh-26727
2021-06-01 17:45:14 +02:00
Stephane Nicoll 97c5a08ca5 Merge branch '2.4.x'
Closes gh-26725
2021-06-01 15:38:48 +02:00
Stephane Nicoll c8959180fe Merge branch '2.3.x' into 2.4.x
Closes gh-26724
2021-06-01 15:38:27 +02:00
Stephane Nicoll 7e4defbcba Properly guard LogbackLoggingSystem
Previously, LoggingSystem#get would chose Logback by the sole presence
of a class in logback-core, with the assumption that logback-classic is
also on the classpath. An app that only had the former would therefore
fail.

This commit updates the condition to check for a class in
logback-classic instead.

Closes gh-26711
2021-06-01 15:35:22 +02:00
Stephane Nicoll d0185e7531 Merge branch '2.4.x'
Closes gh-26717
2021-05-31 07:47:59 +02:00
Stephane Nicoll 897fd63faf Merge branch '2.3.x' into 2.4.x
Closes gh-26716
2021-05-31 07:47:45 +02:00
weixsun 4b3bf75a4c Remove redudant space
See gh-26713
2021-05-31 07:47:07 +02:00
Phillip Webb d3f0f04f05 Merge branch '2.4.x'
Closes gh-26703
2021-05-28 14:53:27 -07:00
Phillip Webb 49d3ecc2b2 Merge branch '2.3.x' into 2.4.x
Closes gh-26702
2021-05-28 14:53:12 -07:00
Phillip Webb 617f7b9587 Improve ImageName/ImageReference parse performance
Update `ImageName` and `ImageReference` to use distinct regex patterns
to parse specific parts of the value. Prior to this commit a single
regex pattern was used which could hang given certain input strings.

Fixes gh-23115
2021-05-28 14:52:27 -07:00
Madhura Bhave 54c3194164 Merge branch '2.4.x' into main
Closes gh-26701
2021-05-28 14:38:28 -07:00
Madhura Bhave 5314bda48d Merge branch '2.3.x' into 2.4.x
Closes gh-26700
2021-05-28 14:30:44 -07:00