Commit Graph
17131 Commits
Author SHA1 Message Date
Andy Wilkinson f97bf544bf Polish 2022-03-10 17:11:50 +00:00
Andy Wilkinson faf7a35425 Merge branch '2.7.x' 2022-03-10 16:51:56 +00:00
Andy Wilkinson 6494a9f08a Merge branch '2.6.x' into 2.7.x
Closes gh-30165
2022-03-10 16:51:43 +00:00
Andy Wilkinson 7c3c5d3d3e Merge branch '2.5.x' into 2.6.x
Closes gh-30164
2022-03-10 16:51:33 +00:00
Andy Wilkinson bbdef2b026 Increase timeouts in tests that use Cassandra
Closes gh-30163
2022-03-10 16:50:39 +00:00
Andy Wilkinson 14128ffc27 Merge branch '2.7.x' 2022-03-10 16:31:52 +00:00
Andy Wilkinson 085fb0766f Merge branch '2.6.x' into 2.7.x
Closes gh-30162
2022-03-10 16:31:21 +00:00
Andy Wilkinson 0958498a47 Merge branch '2.5.x' into 2.6.x
Closes gh-30161
2022-03-10 16:31:09 +00:00
Andy Wilkinson 6eacc07de0 Fix handling of Flux responses from Actuator endpoints
Closes gh-30095
2022-03-10 16:10:39 +00:00
Andy Wilkinson ab74bfcf65 Merge branch '2.7.x' 2022-03-10 13:26:01 +00:00
Andy Wilkinson 9075849143 Upgrade to Hazelcast 5.1
Closes gh-30154
2022-03-10 12:34:26 +00:00
Madhura Bhave 44f71a46aa Merge branch '2.7.x' into main 2022-03-09 15:55:18 -08:00
Madhura Bhave 24c48f0b43 Merge branch '2.6.x' into 2.7.x
Closes gh-30150
2022-03-09 15:54:49 -08:00
Madhura Bhave bdcc2509f5 Merge branch '2.5.x' into 2.6.x
Closes gh-30149
2022-03-09 15:52:56 -08:00
Madhura Bhave d0883ba6ef Document the WebSocket-related exclusions that are required to use Jetty 10
Closes gh-29275
2022-03-09 15:40:01 -08:00
Andy Wilkinson 2600bf4719 Merge branch '2.6.x' into 2.7.x
Closes gh-30142
2022-03-09 18:39:45 +00:00
Andy Wilkinson 382c6972ec Merge branch '2.5.x' into 2.6.x
Closes gh-30141
2022-03-09 18:39:32 +00:00
Andy Wilkinson 5264fb3d1e Test our Gradle Plugin against Gradle 7.4.1
Closes gh-30139
2022-03-09 18:09:07 +00:00
Andy Wilkinson abcc246a38 Polish 2022-03-09 15:22:24 +00:00
Andy Wilkinson e9d2ec507e Merge branch '2.7.x' 2022-03-09 15:17:25 +00:00
Andy Wilkinson f5ca568014 Remove versions less than 17 from JavaVersion enum
Closes gh-29503
2022-03-09 15:16:59 +00:00
Andy Wilkinson 813c2a5b1e Merge branch '2.6.x' into 2.7.x
Closes gh-30135
2022-03-09 14:45:55 +00:00
Andy Wilkinson 3cb1629f45 Merge branch '2.5.x' into 2.6.x
Closes gh-30134
2022-03-09 14:44:51 +00:00
Andy Wilkinson da1eb25e4b Remove redundant JRE-based enabled and disabled annotations from tests
Closes gh-29693
2022-03-09 14:41:13 +00:00
Andy Wilkinson a031c0c659 Merge branch '2.7.x' 2022-03-09 14:28:44 +00:00
Andy Wilkinson 881f2788ae Merge branch '2.6.x' into 2.7.x
Closes gh-30133
2022-03-09 14:28:31 +00:00
Andy Wilkinson b1be6ac271 Merge branch '2.5.x' into 2.6.x
Closes gh-30132
2022-03-09 14:28:01 +00:00
Andy Wilkinson 314acd3407 Add EIGHTEEN to JavaVersion
Closes gh-29524
2022-03-09 14:26:19 +00:00
Andy Wilkinson d552f49128 Merge branch '2.7.x' 2022-03-09 12:53:15 +00:00
Andy Wilkinson 83de1995c7 Merge branch '2.6.x' into 2.7.x
Closes gh-30130
2022-03-09 12:44:53 +00:00
Andy Wilkinson b0e4cabdd8 Merge branch '2.5.x' into 2.6.x
Closes gh-30123
2022-03-09 12:37:45 +00:00
Andy Wilkinson 20d21d4e58 Set up CI with JDK 18
Closes gh-30104
2022-03-09 12:28:34 +00:00
Moritz Halbritter 16f069ef47 Merge branch '2.5.x' into 2.6.x
Closes gh-30125
2022-03-09 12:10:05 +01:00
Moritz Halbritter d14980ed5e Polish "Tweak performance for Prometheus scraping endpoint"
See gh-30085
2022-03-09 12:08:55 +01:00
Peter Paul Bakker fb3f3c52cf Tweak performance for Prometheus scraping endpoint
Reduce the number of times capacity growth is needed inside the StringWriter.
A typical default SpringBoot Prometheus page has more than 11k characters.
Best performance results when no capacity growth is needed at all, so base
it on previous metrics page size plus some room for possible extra metric info.

See gh-30085
2022-03-09 12:08:26 +01:00
Moritz Halbritter 2816fc37a8 Merge branch '2.7.x' 2022-03-09 11:32:58 +01:00
Moritz Halbritter 93f31ee063 Polish "Tweak performance for Prometheus scraping endpoint"\n\nSee gh-30085 2022-03-09 11:31:23 +01:00
Peter Paul Bakker e2ebb56911 Tweak performance for Prometheus scraping endpoint
Reduce the number of times capacity growth is needed inside the StringWriter.
A typical default SpringBoot Prometheus page has more than 11k characters.
Best performance results when no capacity growth is needed at all, so base
it on previous metrics page size plus some room for possible extra metric info.

See gh-30085
2022-03-09 11:22:20 +01:00
Stephane Nicoll e5cdcdadd5 Merge branch '2.7.x' 2022-03-09 08:29:23 +01:00
Stephane Nicoll a71d9f5088 Merge branch '2.6.x' into 2.7.x
Closes gh-30121
2022-03-09 08:29:16 +01:00
Stephane Nicoll 069c328075 Merge branch '2.5.x' into 2.6.x
Closes gh-30120
2022-03-09 08:29:07 +01:00
fml2 80b90ed386 Fix typo
See gh-30118
2022-03-09 08:28:44 +01:00
Stephane Nicoll 06321d4e55 Merge branch '2.7.x' 2022-03-09 08:26:30 +01:00
Stephane Nicoll b66bf393e4 Merge branch '2.6.x' into 2.7.x
Closes gh-30119
2022-03-09 08:26:20 +01:00
Stephane Nicoll be85f317d3 Fix anchor tag for Spring HATEOAS section
Closes gh-30106
2022-03-09 08:25:10 +01:00
Madhura Bhave 5368ed98ef Merge branch '2.7.x' into main 2022-03-08 22:03:08 -08:00
Madhura Bhave 06496d85cd Merge branch '2.6.x' into 2.7.x
Closes gh-30115
Closes gh-30116
2022-03-08 22:02:27 -08:00
Madhura Bhave 09dc4e5ce3 Merge branch '2.5.x' into 2.6.x
Closes gh-30113
Closes gh-30114
2022-03-08 22:01:26 -08:00
Madhura Bhave ef7d7487fa Document when config data properties are invalid
This commit also reinstates documentation for
`spring.profiles.include`

Closes gh-25849
Closes gh-28451
2022-03-08 21:58:43 -08:00
Madhura Bhave 70efe7d384 Fix javax import 2022-03-08 19:02:20 -08:00