Commit Graph

33438 Commits

Author SHA1 Message Date
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 a1c88faf46 Merge branch '2.4.x' into 2.5.x
Closes gh-28195
2021-10-05 09:08:59 +02:00
Stephane Nicoll 1fc52b65a3 Upgrade to concourse-java-scripts 0.0.4
Closes gh-23962
2021-10-05 09:08:36 +02:00
Stephane Nicoll d22167b96a Merge branch '2.4.x' into 2.5.x
Closes gh-28193
2021-10-05 08:35:24 +02:00
Stephane Nicoll 823ae77887 Merge pull request #28189 from inomag
* pr/28189:
  Fix log4j2 file name reference in reference doc

Closes gh-28189
2021-10-05 08:33:42 +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
Stephane Nicoll 71020fd70d Merge branch '2.4.x' into 2.5.x
Closes gh-28186
2021-10-03 07:07:52 +02:00
Stephane Nicoll 6d3e1734f6 Upgrade to GitHub Changelog Generator 0.0.7 in CI
Closes gh-28185
2021-10-03 07:07:30 +02:00
Madhura Bhave 3249d05464 Merge branch '2.4.x' into 2.5.x
Closes gh-28171
2021-10-01 15:54:49 -07:00
Madhura Bhave 512015c7af Merge pull request #28168 from kandulsh
* pr/28168:
  Update ConstructorBinding javadoc with usage information

Closes gh-28168
2021-10-01 15:54:05 -07:00
Susmitha f94caed7e9 Update ConstructorBinding javadoc with usage information
See gh-28168
2021-10-01 15:53:43 -07:00
Andy Wilkinson 14a57adb53 Merge branch '2.4.x' into 2.5.x
Closes gh-28165
2021-10-01 14:16:20 +01:00
Andy Wilkinson 35b16ea04e Minimize dependencies of launch script test app
Closes gh-28164
2021-10-01 14:15:52 +01: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 218bed1f8e Merge pull request #28086 from polarbear567
* pr/28086:
  Polish "Clarify use of @AutoConfigureTestEntityManager"
  Clarify use of @AutoConfigureTestEntityManager

Closes gh-28086
2021-10-01 08:12:14 +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
Andy Wilkinson 4e5da6a6ed Merge branch '2.4.x' into 2.5.x
Closes gh-28117
2021-09-23 13:18:50 +01:00
Andy Wilkinson 46b47b80aa Upgrade to NoHTTP 0.0.10
Closes gh-28112
2021-09-23 13:18:41 +01:00
Andy Wilkinson 84d332e527 Merge branch '2.4.x' into 2.5.x
Closes gh-28115
2021-09-23 11:26:37 +01:00
Andy Wilkinson b18a56f451 Upgrade CI to github-release resource 1.5.5
Closes gh-28114
2021-09-23 11:26:30 +01:00
Andy Wilkinson ec08a6c733 Merge branch '2.4.x' into 2.5.x 2021-09-23 11:22:51 +01:00
Spring Builds 21aea2f752 Next development version (v2.5.6-SNAPSHOT) 2021-09-23 07:43:12 +00:00
Spring Builds ea92fced9f Next development version (v2.4.12-SNAPSHOT) 2021-09-23 05:55:14 +00: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 90a5e34ba5 Upgrade Java 17 version in CI image
Closes gh-28105
2021-09-22 12:45:30 +02:00
Stephane Nicoll 2f8371cb67 Merge pull request #28102 from dreis2211
* pr/28102:
  Detect JDK 17 GA builds

Closes gh-28102
2021-09-22 12:41:31 +02:00
dreis2211 2546c28960 Detect JDK 17 GA builds
See gh-28102
2021-09-22 12:41:17 +02:00
Stephane Nicoll 77b778ce95 Document support for Java 17
Closes gh-26767
2021-09-22 08:58:29 +02:00
Stephane Nicoll b8fa2a9fdb Merge branch '2.4.x' into 2.5.x 2021-09-22 08:42:20 +02:00
Stephane Nicoll 1e3803e6ae Upgrade to Kotlin 1.5.31
Closes gh-28089
2021-09-22 08:31:06 +02:00
Stephane Nicoll 01809eccf3 Upgrade to jOOQ 3.14.15
Closes gh-28088
2021-09-22 08:31:04 +02:00
Stephane Nicoll 7a04966d5c Upgrade to jOOQ 3.14.15
Closes gh-28087
2021-09-22 08:29:24 +02:00
Phillip Webb 8c3db23be3 Merge branch '2.4.x' into 2.5.x
Closes gh-28083
2021-09-21 15:53:37 -07:00
Phillip Webb 4674f07c5b Merge pull request #28071 from cdalexndr
* pr/28071:
  Document that devtools restart doesn't work with AspectJ weaving

Closes gh-28071
2021-09-21 15:52:31 -07:00
cdalexndr 798b282e58 Document that devtools restart doesn't work with AspectJ weaving
See gh-28071
2021-09-21 15:51:36 -07:00
Phillip Webb a862ebc254 Merge branch '2.4.x' into 2.5.x
Closes gh-28081
2021-09-21 15:20:19 -07:00
Phillip Webb bbb4ac1542 Sanitize SPRING_APPLICATION_JSON by default
Update `Sanitizer` default keys to include `SPRING_APPLICATION_JSON`.

Fixes gh-28045
2021-09-21 15:18:50 -07:00
Phillip Webb 40d65a74dc Merge branch '2.4.x' into 2.5.x 2021-09-21 14:43:38 -07:00