Commit Graph

14135 Commits

Author SHA1 Message Date
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
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
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
Phillip Webb
ec12d51f30 Polish 2021-09-21 14:00:28 -07:00
Stephane Nicoll
8fe226d832 Upgrade to Spring Integration 5.5.4
Closes gh-27949
2021-09-21 20:53:04 +02:00
Stephane Nicoll
7ebf71ab66 Upgrade to Spring Integration 5.4.11
Closes gh-27948
2021-09-21 20:52:05 +02:00
Phillip Webb
5ba69634c9 Merge branch '2.4.x' into 2.5.x 2021-09-21 11:17:55 -07:00
Phillip Webb
dfd36673f7 Update copyright year of changed files 2021-09-21 11:17:19 -07:00
Phillip Webb
cfeafee826 Polish 2021-09-21 11:16:46 -07:00
Stephane Nicoll
4ee249c700 Merge branch '2.4.x' into 2.5.x
Closes gh-28072
2021-09-21 08:18:39 +02:00
Stephane Nicoll
15de85d89a Polish contribution
See gh-28061
2021-09-21 08:18:08 +02:00
Leo Li
0374c3d563 Add default value for "s.d.elasticsearch.client.reactive.endpoints"
See gh-28061
2021-09-21 08:12:21 +02:00
Andy Wilkinson
b2b691b1d0 Merge branch '2.4.x' into 2.5.x
Closes gh-28069
2021-09-20 19:04:48 +01:00
Andy Wilkinson
c2361aeb04 Make WebMvcMetricsFilter set status consistently for all exceptions
Closes gh-27988
2021-09-20 18:07:18 +01:00
Andy Wilkinson
6f555c4012 Upgrade to Spring Kafka 2.7.7
Closes gh-27918
2021-09-20 09:59:47 +01:00
Andy Wilkinson
e5cdf819a0 Upgrade to Spring Data 2021.0.5
Closes gh-27917
2021-09-20 09:59:06 +01:00
Andy Wilkinson
c0895befc2 Upgrade to Spring Data 2020.0.13
Closes gh-27912
2021-09-20 09:56:51 +01:00
Andy Wilkinson
8364840cd5 Merge branch '2.4.x' into 2.5.x
Closes gh-28047
2021-09-17 12:25:13 +01:00
Andy Wilkinson
eacb9273e3 Polish property mapping in reactive Elastic REST client auto-config
Closes gh-28038
2021-09-17 12:00:45 +01:00
Stephane Nicoll
babf43bdef Upgrade to Spring HATEOAS 1.3.4
Closes gh-27970
2021-09-16 21:39:03 +02:00
Stephane Nicoll
97348f14f7 Upgrade to Spring HATEOAS 1.2.9
Closes gh-27969
2021-09-16 21:38:28 +02:00
Andy Wilkinson
9df099e343 Polish 2021-09-16 12:11:34 +01:00
Andy Wilkinson
a4f1d32203 Register application shutdown hook lazily
Previously, SpringApplicationShutdownHook would always register a
shutdown hook, even if SpringApplication was configured not to
use a shutdown hook, such as in a war deployment. This could
result in a memory leak when the war was undeployed. The shutdown
hook registered by SpringApplicationShutdownHook would remain
registered, pinning the web application's class loader in memory.

This commit updates SpringApplicationShutdownHook so that it
registers a shutdown hook with the JVM lazily, upon registeration
of the first application context.

Fixes gh-27987
2021-09-16 10:38:29 +01:00
Andy Wilkinson
afb81f14ea Merge branch '2.4.x' into 2.5.x
Closes gh-28032
2021-09-16 09:55:45 +01:00