Stephane Nicoll
8517ef03df
Upgrade Ubuntu version in CI images
...
Closes gh-30145
2022-03-10 09:33:14 +01: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
3c80049ccc
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30138
2022-03-09 15:51:12 +00:00
Andy Wilkinson
a31135ebfc
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30137
2022-03-09 15:50:56 +00:00
Andy Wilkinson
0e627b00b3
Remove --illegal-access=warn from toolchain configuration
...
As of Java 17, it is ignored. Our Toolchain-based builds use at least
Java 17 so specifying it no longer has any effect.
Closes gh-30122
2022-03-09 15:49:18 +00:00
Andy Wilkinson
f488db9e49
Merge branch '2.6.x' into 2.7.x
2022-03-09 15:37:47 +00:00
Andy Wilkinson
0d4d225ebb
Merge branch '2.5.x' into 2.6.x
2022-03-09 15:37:40 +00:00
Andy Wilkinson
a58cd050e5
Disable LoaderIntegrationTests when all runtimes are incompatible
...
See gh-29524
2022-03-09 15:36:53 +00:00
Andy Wilkinson
0ecb96035b
Merge branch '2.6.x' into 2.7.x
2022-03-09 15:22:50 +00:00
Andy Wilkinson
6324495e70
Merge branch '2.5.x' into 2.6.x
2022-03-09 15:22:42 +00:00
Andy Wilkinson
abcc246a38
Polish
2022-03-09 15:22:24 +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
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
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
Andy Wilkinson
e828fb11ba
Merge branch '2.6.x' into 2.7.x
2022-03-09 12:25:26 +00:00
Andy Wilkinson
cf872caa96
Merge branch '2.5.x' into 2.6.x
2022-03-09 12:24:34 +00:00
Andy Wilkinson
429167e71f
Align CI image generation mirrors with 2.6.x
...
Closes gh-25135
2022-03-09 12:03:14 +00:00
Moritz Halbritter
af08336f1a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30126
2022-03-09 12:10:40 +01: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
e84e5174be
Merge pull request #30085 from stokpop
...
* pr-30085:
Polish "Tweak performance for Prometheus scraping endpoint"
Tweak performance for Prometheus scraping endpoint
Closes gh-30085
2022-03-09 12:09:32 +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
f0053d2f7e
Merge pull request #"Tweak performance for Prometheus scraping endpoint"\n\nSee gh-30085 from
...
* 2.6.x-prometheus-performance:
Polish "Tweak performance for Prometheus scraping endpoint"\n\nSee gh-30085
Tweak performance for Prometheus scraping endpoint\n\nCloses gh-"Tweak performance for Prometheus scraping endpoint"\n\nSee gh-30085
2022-03-09 11:32:15 +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
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
Stephane Nicoll
fb45b2bb62
Merge pull request #30118 from fml2
...
* pr/30118:
Fix typo
Closes gh-30118
2022-03-09 08:29:02 +01:00
fml2
80b90ed386
Fix typo
...
See gh-30118
2022-03-09 08:28:44 +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
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
ee291dc36f
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30112
2022-03-08 18:13:14 -08:00
Madhura Bhave
b86ad89523
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30111
2022-03-08 18:13:01 -08:00
Madhura Bhave
7d63faac7c
Document the scalar types supported by MapBinder
...
Closes gh-27581
2022-03-08 18:12:21 -08:00
Madhura Bhave
ba7ba08811
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30110
2022-03-08 17:41:12 -08:00
Madhura Bhave
9c437c6cd9
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30109
2022-03-08 17:40:52 -08:00