root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
46,081 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

46081 Commits

Author SHA1 Message Date
Phillip Webb 7bd9989614 Fix merge conflict errors 
See gh-37999
 2023-10-23 19:40:44 -07:00
Phillip Webb 2ac69160c7 Revert "Allow PemPrivateKeyParser to parse multiple keys" 
This reverts commit 32e6ce210e.

Closes gh-37999
 2023-10-23 18:32:12 -07:00
Andy Wilkinson a9469d9c8e Adapt to changes in Framework's internals 
See gh-37995
 2023-10-23 18:07:38 +01:00
Andy Wilkinson 959311bf0e Start building against Spring Framework 6.1.0 snapshots 
See gh-37995
 2023-10-23 15:25:13 +01:00
Moritz Halbritter 34ec35f2b6 Merge pull request #37984 from izeye 
* pr/37984:
  Polish

Closes gh-37984
 2023-10-23 11:17:07 +02:00
Johnny Lim b5d4983829 Polish 
See gh-37984
 2023-10-23 11:15:27 +02:00
Moritz Halbritter 6b8c340de0 Merge pull request #37986 from onobc 
* pr/37986:
  Fix links in Spring Pulsar section of ref guide

Closes gh-37986
 2023-10-23 11:10:59 +02:00
Chris Bono ddd093f4e2 Fix links in Spring Pulsar section of ref guide 
Spring for Apache Pulsar recently moved to Antora docs which in turn
modified the base url slightly. This commmit adjusts for the move.

See gh-37986
 2023-10-23 11:06:54 +02:00
Moritz Halbritter 854adba783 Merge pull request #37987 from onobc 
* pr/37987:
  Fix links in Spring Kafka section of ref guide

Closes gh-37987
 2023-10-23 11:04:15 +02:00
Chris Bono 1571097048 Fix links in Spring Kafka section of ref guide 
Spring for Apache Kafka recently moved to Antora docs which in turn
modified the base url slightly. This commmit adjusts for the move.

See gh-37987
 2023-10-23 11:03:05 +02:00
Moritz Halbritter 9469327f04 Merge pull request #37975 from sdeleuze 
* pr/37975:
  Polish "Add JVM Checkpoint Restore documentation"
  Add JVM Checkpoint Restore documentation

Closes gh-37975
 2023-10-23 11:01:48 +02:00
Moritz Halbritter 68d8fa14bf Polish "Add JVM Checkpoint Restore documentation" 
See gh-37975
 2023-10-23 11:01:25 +02:00
Sébastien Deleuze e988bf4212 Add JVM Checkpoint Restore documentation 
See gh-37975
 2023-10-23 11:01:20 +02:00
Moritz Halbritter b11d06deb1 Merge branch '3.1.x' 
Closes gh-37991
 2023-10-23 10:42:42 +02:00
Moritz Halbritter 09821feb75 Fix container inspection for Docker Compose >= 2.23.0 
Docker Compose starting with 2.23.0 returns truncated ids in the
docker compose ps call. We now do a prefix search if an exact match
isn't found in the docker inspect response.

Closes gh-37982
 2023-10-23 10:40:20 +02:00
Phillip Webb e1bd24695d Try `@AssertFileChannelDataBlocksClosed` for Windows fix 
This updates commit dad5dc6750 to
see if @AssertFileChannelDataBlocksClosed will take care of
closing files.

See gh-7161
 2023-10-20 10:05:43 -07:00
Andy Wilkinson 3cfe2360c6 Merge branch '3.1.x' 
Closes gh-37980
 2023-10-20 16:04:27 +01:00
Andy Wilkinson 955c2bfcdf Merge branch '3.0.x' into 3.1.x 
Closes gh-37979
 2023-10-20 16:04:12 +01:00
Andy Wilkinson 99d9c3572f Update .sdkmanrc to use 17.0.9+11 
Closes gh-37961
 2023-10-20 16:03:56 +01:00
Andy Wilkinson 4ed68b9e32 Merge branch '2.7.x' into 3.0.x 2023-10-20 16:01:26 +01:00
Andy Wilkinson 313e3d59a3 Update Java version in .sdkmanrc to 8u392+9 
Closes gh-37959
 2023-10-20 16:00:56 +01:00
Andy Wilkinson d5cf588a98 Merge branch '3.1.x' 
Closes gh-37978
 2023-10-20 15:59:00 +01:00
Andy Wilkinson 9d64a11418 Merge branch '3.0.x' into 3.1.x 
Closes gh-37977
 2023-10-20 15:58:48 +01:00
Andy Wilkinson f081a0e9be Upgrade to Checkstyle 10.12.4 
Closes gh-37976
 2023-10-20 15:58:24 +01:00
Andy Wilkinson 9897576562 Polish d22969ae 
The current threads must be retrieved each time so that we can see
the keep-alive thread dying.

See gh-37736
 2023-10-20 12:57:17 +01:00
Andy Wilkinson d13d38a141 Trim multiple leading slashes in NestedLocation 
See gh-37668
 2023-10-20 11:55:35 +01:00
Andy Wilkinson 88bf3dfba2 Close byte channel created by newByteChannelReturnsByteChannel 
See gh-7161
 2023-10-20 11:22:16 +01:00
Andy Wilkinson dad5dc6750 Try to fix NestedFileSystemProviderTests on Windows 
See gh-7161
 2023-10-20 10:56:08 +01:00
Andy Wilkinson d22969ae09 Tolerate race condition in shouldStopKeepAliveThreadIfContextIsClosed 
See gh-37736
 2023-10-20 10:19:34 +01:00
Andy Wilkinson 4161eb1853 Fix path handling in NestedLocation on Windows 
See 4b495ca
See gh-37668
 2023-10-20 09:15:54 +01:00
Phillip Webb 3eeb1b2849 Merge branch '3.1.x' 2023-10-19 23:21:42 -07:00
Phillip Webb 9f3afb3636 Merge branch '3.0.x' into 3.1.x 2023-10-19 23:21:20 -07:00
Phillip Webb 7c864804d5 Merge branch '2.7.x' into 3.0.x 2023-10-19 23:21:08 -07:00
Phillip Webb d47f8bf945 Update copyright year of changed files 2023-10-19 23:20:43 -07:00
Phillip Webb 25ce0ef3fc Refine `PemContent` and PEM parsers 2023-10-19 23:19:45 -07:00
Phillip Webb 41724fc5f1 Merge branch '3.1.x' 2023-10-19 22:06:53 -07:00
Phillip Webb 1dc3ea957b Merge branch '3.0.x' into 3.1.x 2023-10-19 22:06:49 -07:00
Phillip Webb 5ab4e0d153 Merge branch '2.7.x' into 3.0.x 2023-10-19 22:06:42 -07:00
Phillip Webb 548b0ea91f Fix failing exception assertion 
See gh-37964
 2023-10-19 22:05:59 -07:00
Phillip Webb 32e6ce210e Allow PemPrivateKeyParser to parse multiple keys 
Update `PemPrivateKeyParser` so that it can parse multiple keys in a
single PEM file.

Closes gh-37970
 2023-10-19 22:01:23 -07:00
Phillip Webb deb79425ee Polish 2023-10-19 21:47:13 -07:00
Phillip Webb d638bbb0ba Merge branch '3.1.x' 
Closes gh-37967
 2023-10-19 21:25:44 -07:00
Phillip Webb 1d456e09d2 Merge branch '3.0.x' into 3.1.x 
Closes gh-37966
 2023-10-19 21:12:52 -07:00
Phillip Webb a0b999c8b4 Merge branch '2.7.x' into 3.0.x 
Closes gh-37965
 2023-10-19 20:55:51 -07:00
Phillip Webb abdad1cabe Constently use assertThatExceptionOf... assertions 
Closes gh-37964
 2023-10-19 20:17:26 -07:00
Andy Wilkinson e25886f2de Consider checkpoint restoration when logging start time and uptime 
Closes gh-37084
 2023-10-19 19:54:58 +01:00
Moritz Halbritter b883c59658 Merge branch '3.1.x' 2023-10-19 15:35:36 +02:00
Spring Builds 8b8e23f4b5 Next development version (v3.1.6-SNAPSHOT) 2023-10-19 12:40:23 +00:00
Moritz Halbritter f64359f758 Merge branch '3.1.x' 2023-10-19 13:30:54 +02:00
Moritz Halbritter e9201f1a66 Merge branch '3.0.x' into 3.1.x 2023-10-19 13:30:45 +02:00