Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,621 Commits 23 Branches 0 Tags
ff1352ff0c2c8a7bacf4867cb919671c61572251
Commit Graph

35621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
ff1352ff0c Merge branch '2.5.x' into 2.6.x 2022-03-10 09:32:20 +01:00
Stephane Nicoll
c8d2a41c54 Upgrade Ubuntu version in CI images 
Closes gh-30144
 2022-03-10 09:32:07 +01:00
Stephane Nicoll
2f7feee672 Upgrade Ubuntu version in CI images 
Closes gh-30146
 2022-03-10 09:31:03 +01: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
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
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
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
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
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
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
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
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
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
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
be85f317d3 Fix anchor tag for Spring HATEOAS section 
Closes gh-30106
 2022-03-09 08:25:10 +01: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
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
9c437c6cd9 Merge branch '2.5.x' into 2.6.x 
Closes gh-30109
 2022-03-08 17:40:52 -08:00
Madhura Bhave
d240e293db Document how to obtain ServletContext with an embedded container setup 
Closes gh-24561
 2022-03-08 17:34:35 -08:00
Andy Wilkinson
5b2cc74f71 Merge branch '2.5.x' into 2.6.x 
Closes gh-30100
 2022-03-08 14:09:35 +00:00
Andy Wilkinson
708e57eafb Register metrics for wrapped R2DBC ConnectionPools 
Closes gh-30090
 2022-03-08 13:55:34 +00:00
Andy Wilkinson
119a713f09 Merge branch '2.5.x' into 2.6.x 
Closes gh-30098
 2022-03-08 13:52:25 +00:00
Andy Wilkinson
e7705f4f71 Improve condition message produced by @ConditionalOnSingleCandidate 
Closes gh-30073
 2022-03-08 13:51:38 +00:00
Madhura Bhave
d131003456 Merge branch '2.5.x' into 2.6.x 
Closes gh-30093
 2022-03-07 21:53:44 -08:00
Madhura Bhave
480ccc6175 Clarify devtools documentation when using with build plugins 
Closes gh-17851
 2022-03-07 21:52:43 -08:00
Madhura Bhave
27bf068091 Merge branch '2.5.x' into 2.6.x 2022-03-07 20:22:42 -08:00
Madhura Bhave
9b073c825b Fix checkstyle 2022-03-07 20:22:27 -08:00
Madhura Bhave
ac04be75f8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30091
 2022-03-07 18:23:19 -08:00
Madhura Bhave
ed8f8d59ef Document how to structure configurations for efficient slice tests 
Closes gh-16088
 2022-03-07 18:21:12 -08:00
Andy Wilkinson
344f71c75a Merge branch '2.5.x' into 2.6.x 
Closes gh-30087
 2022-03-07 14:57:20 +00:00
Andy Wilkinson
4bcb7e2f77 Prevent ActiveProfilesTests from binding to 8080 
Due to gh-29695, smoketest.profile.ActiveProfilesTests starts a web
server bound to the default port (8080) despite the test setting
`webEnvironment` to `NONE`.

This commit works around the problem by running the tests with
server.port set to zero.

Closes gh-30086
 2022-03-07 14:55:00 +00:00
Moritz Halbritter
e980a53399 Merge branch '2.5.x' into 2.6.x 2022-03-07 14:11:11 +01:00
Moritz Halbritter
f3eb90046f Remove @Repeatable support for @DisabledOnOs 
We'll add it back again when we need it, and delay the naming issue.

See gh-30082
 2022-03-07 14:10:13 +01:00
Moritz Halbritter
564555347f Merge branch '2.5.x' into 2.6.x 
Closes gh-30083
 2022-03-07 13:22:34 +01:00