Commit Graph

14162 Commits

Author SHA1 Message Date
Andy Wilkinson d47260637b Merge branch '2.4.x' into 2.5.x
Closes gh-28262
2021-10-08 12:39:17 +01:00
Andy Wilkinson c5d45585d9 Remove unnecessary overrides of finalize
Closes gh-28209
2021-10-08 12:39:00 +01:00
Stephane Nicoll c0605ffc71 Start building against Spring Batch 4.3.4 snapshots
See gh-28250
2021-10-08 07:52:56 +02:00
Stephane Nicoll 98bc8e711d Start building against Spring Integration 5.5.5 snapshots
See gh-28249
2021-10-08 07:52:12 +02:00
Stephane Nicoll b0aa1cdb00 Start building against Spring Session 2021.0.3 snapshots
See gh-28248
2021-10-08 07:51:20 +02:00
Stephane Nicoll a9513ccf07 Start building against Spring Security 5.5.3 snapshots
See gh-28247
2021-10-08 07:51:19 +02:00
Stephane Nicoll 5396a980c3 Start building against Spring Kafka 2.7.8 snapshots
See gh-28246
2021-10-08 07:49:29 +02:00
Stephane Nicoll 123e93f1d5 Start building against Spring AMQP 2.3.11 snapshots
See gh-28245
2021-10-08 07:48:38 +02:00
Stephane Nicoll bbdb74bff0 Start building against Spring Data 2021.0.6 snapshots
See gh-28244
2021-10-08 07:47:37 +02:00
Stephane Nicoll 70b0fa4512 Start building against Spring HATEOAS 1.3.5 snapshots
See gh-28243
2021-10-08 07:46:51 +02:00
Stephane Nicoll 69e7fe1c57 Start building against Micrometer 1.7.5 snapshots
See gh-28242
2021-10-08 07:46:04 +02:00
Stephane Nicoll 737cea0d73 Start building against Spring Framework 5.3.11 snapshots
See gh-28241
2021-10-08 07:45:15 +02:00
Stephane Nicoll 24ada6f240 Start building against Reactor 2020.0.12 snapshots
See gh-28240
2021-10-08 07:44:35 +02:00
Stephane Nicoll 33ffae8e74 Start building against Spring Batch 4.3.4 snapshots
See gh-28230
2021-10-07 09:07:50 +02:00
Stephane Nicoll 092d3fa81e Start building against Spring Session 2020.0.7 snapshots
See gh-28229
2021-10-07 09:07:22 +02:00
Stephane Nicoll 41eded4b8b Start building against Spring Security 5.4.9 snapshots
See gh-28228
2021-10-07 09:06:54 +02:00
Stephane Nicoll f8d6d76410 Start building against Spring Kafka 2.6.11 snapshots
See gh-28227
2021-10-07 09:06:24 +02:00
Stephane Nicoll 3cf1888cef Start building against Spring AMQP 2.3.11 snapshots
See gh-28226
2021-10-07 09:06:00 +02:00
Stephane Nicoll 6c801b9db9 Start building against Spring Data 2020.0.14 snapshots
See gh-28225
2021-10-07 09:05:35 +02:00
Stephane Nicoll 81da876964 Start building against Micrometer 1.6.12 snapshots
See gh-28224
2021-10-07 09:05:09 +02:00
Stephane Nicoll 9f06a5fe21 Start building against Spring Framework 5.3.11 snapshots
See gh-28223
2021-10-07 09:04:28 +02:00
Stephane Nicoll dd802ba5e0 Start building against Reactor 2020.0.12 snapshots
See gh-28222
2021-10-07 09:03:57 +02:00
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x
Closes gh-28206
2021-10-06 09:57:19 +01:00
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29
Closes gh-28205
2021-10-06 09:52:45 +01:00
Madhura Bhave 9f4cf8398b Merge branch '2.4.x' into 2.5.x
Closes gh-28201
2021-10-05 15:46:04 -07:00
Madhura Bhave 61736e9958 Polish " Update configtree docs about dot notation being correctly mapped"
See gh-28170
2021-10-05 15:43:20 -07:00
deb-von-seggern 8f91fc450d Update configtree docs about dot notation being correctly mapped
See gh-28170
2021-10-05 15:14:02 -07:00
Andy Wilkinson 437a1601ef Fix broken content negotiation for Prometheus with OpenMetrics
Update Prometheus `TextOutputFormat` so that OpenMetrics is used in
preference to text output when an appropriate accept header is found.

If the accept header contains `*/*` or is missing then the text format
will be used.

See gh-28130
2021-10-05 11:11:52 +01:00
Phillip Webb d8141e6a8d Allow Producible enums to indicate a default value
Add an `isDefault()` method to `Producible` which can be used to
indicate which of the enum values should be used when the accept header
is `*/*` or `null`.

Prior to this commit, the last enum value was always used as the
default.

See gh-28130
2021-10-05 09:39:28 +01:00
Stephane Nicoll d22167b96a Merge branch '2.4.x' into 2.5.x
Closes gh-28193
2021-10-05 08:35:24 +02:00
Pratik Gupta a3423f1edf Fix log4j2 file name reference in reference doc
See gh-28189
2021-10-05 08:32:59 +02:00
Andy Wilkinson ff3eed73ee Merge branch '2.4.x' into 2.5.x
Closes gh-28190
2021-10-04 10:21:49 +01:00
Andy Wilkinson b7a2a2d5e0 Set last access and last modified times in layertools extract
Closes gh-28167
2021-10-04 10:17:11 +01:00
Madhura Bhave 3249d05464 Merge branch '2.4.x' into 2.5.x
Closes gh-28171
2021-10-01 15:54:49 -07:00
Susmitha f94caed7e9 Update ConstructorBinding javadoc with usage information
See gh-28168
2021-10-01 15:53:43 -07:00
Andy Wilkinson d238566920 Merge branch '2.4.x' into 2.5.x
See gh-28134
2021-10-01 11:32:22 +01:00
Andy Wilkinson a73293350a Fix parsing of portless IPv6 spring.rabbitmq.addresses
Closes gh-28133
2021-10-01 11:30:11 +01:00
Stephane Nicoll 1c139b1d23 Merge branch '2.4.x' into 2.5.x
Closes gh-28159
2021-10-01 08:13:49 +02:00
Stephane Nicoll bedd749e1c Polish "Clarify use of @AutoConfigureTestEntityManager"
See gh-28086
2021-10-01 08:12:01 +02:00
Leo Li 70f64f2c26 Clarify use of @AutoConfigureTestEntityManager
This commit makes it clearer that, when using
@AutoConfigureTestEntityManager outside of @DataJpaTest, any tests using
the test entity manager must be @Transactional.

See gh-28086
2021-10-01 07:55:57 +02:00
Andy Wilkinson 9e484e2cdc Merge branch '2.4.x' into 2.5.x
Closes gh-28152
2021-09-30 17:05:39 +01:00
Andy Wilkinson 3824512357 Tighten up build's task interdependencies
Closes gh-28103
2021-09-30 15:35:39 +01:00
Phillip Webb fcb6f557f7 Merge branch '2.4.x' into 2.5.x
Closes gh-28134
2021-09-26 13:06:14 -07:00
Phillip Webb 01a39aaf6a Support IPv6 addresses in spring.rabbitmq.addresses
Refine parsing logic in `RabbitProperties` so that IPv6 addresses can
be used.

Fixes gh-28133
2021-09-26 13:05:17 -07:00
Andy Wilkinson ef18a2166d Merge branch '2.4.x' into 2.5.x
Closes gh-28119
2021-09-23 13:23:40 +01:00
Andy Wilkinson 5957dfeea4 Don't include binary jars in loader-tools source jar
Closes gh-28113
2021-09-23 13:23:29 +01:00
Stephane Nicoll 4652bb7adf Upgrade to SendGrid 4.7.5
Closes gh-28109
2021-09-23 07:34:55 +02:00
Andy Wilkinson 2ba593328f Order detector for AbstractDataSourceInitializers
Previously, the detector for AbstractDataSourceInitializers used the
default detector order. This resulted in the initializers detected
initializers running before Flyway. Constrastingly, the detector for
DataSourceScriptDatabaseInitializers uses a custom order so its
detected initializers would run after Flyway.

This commit aligns the order of the detector for
AbstractDataSourceInitializers with the order of the detector for
DataSourceScriptDatabaseInitializers. This ensures that script-based
initialization runs in the same order with respect to Flyway,
irrespective of which initializer implementation is driving it.

Fixes gh-28079
2021-09-22 18:30:44 +01:00
Stephane Nicoll 77b778ce95 Document support for Java 17
Closes gh-26767
2021-09-22 08:58:29 +02:00
Stephane Nicoll 01809eccf3 Upgrade to jOOQ 3.14.15
Closes gh-28088
2021-09-22 08:31:04 +02:00