Commit Graph

46525 Commits

Author SHA1 Message Date
Moritz Halbritter
169070ea1b Merge branch '3.1.x' 2023-11-30 11:00:56 +01:00
Moritz Halbritter
f509c90c46 Try to fix flakiness of Jetty smoke test 2023-11-30 10:57:00 +01:00
Moritz Halbritter
fdbd65a2f5 Only apply awaitTerminationPeriod if awaitTermination is set
See gh-38528
2023-11-30 10:29:12 +01:00
Moritz Halbritter
6744cc2887 Apply awaitTerminationPeriod to SimpleAsyncTaskScheduler
Closes gh-38530
2023-11-30 10:25:33 +01:00
Moritz Halbritter
e454470bf9 Apply awaitTerminationPeriod to SimpleAsyncTaskExecutor
Closes gh-38528
2023-11-30 09:25:49 +01:00
Moritz Halbritter
6cb9af11e8 Merge branch '3.1.x'
Closes gh-38610
2023-11-30 09:03:27 +01:00
Moritz Halbritter
203cd542c0 Clear MeterRegistry before each test case
Closes gh-38604
2023-11-30 09:02:22 +01:00
Andy Wilkinson
8de81cb06e Disable bind on init for all Tomcat connectors
If a connector is bound on init, it won't be unbound when stop()
is called. This leaves the connector running when it should have
been stopped. We currently disable bind on init for the main
connector but not for any additional connectors. This commit
disables bind on it for all connectors unless it is been
explicitly enabled through the bindOnInit property.

Closes gh-38564

Co-authored-by: Moritz Halbritter <moritz.halbritter@broadcom.com>
2023-11-29 14:28:09 +00:00
Moritz Halbritter
62a6d384f6 Merge branch '3.1.x'
Closes gh-38600
2023-11-29 14:00:01 +01:00
Moritz Halbritter
ae0ae8234f Merge pull request #38591 from tomfrenken
* pr/38591:
  Use system properties when constructing Apache HttpClient

Closes gh-38591
2023-11-29 13:59:46 +01:00
Tom Frenken
43bc104c4e Use system properties when constructing Apache HttpClient
See gh-38591
2023-11-29 13:49:20 +01:00
Phillip Webb
6fd691af58 Allow FileSystems to be create by splitting URLs
Relax the constraint that a `NestedLocation` must have a nested entry
name specified so that URLs can be split and rebuilt.

Prior to this commit, given a URL of the following form:

	jar:nested:/myjar.jar!/nested.jar!/my/file

It was possible to create a FileSystem from
"jar:nested:/myjar.jar!/nested.jar" and from that create a path to
"my/file".

However, it wasn't possible to create a FileSystem from
"jar:nested:/myjar.jar", then create another file system from the path
"nested.jar" and then finally create a path to "/nested.jar".

This was because `nested:/myjar.jar` was not considered a value URL
because it didn't include a nested entry name.

Projects such as `JobRunr` were relying on the ability to compose file
systems, so it makes sense to remove our somewhat artificial
restriction.

Fixes gh-38592
2023-11-28 22:14:29 -08:00
Phillip Webb
9a0f95420a Update NestedByteChannel.read to read all possible data when
Update `NestedByteChannel.read` so that it loops until all
remaining data has been read into the buffer. Prior to this
commit, it was possible for to read only some bytes into the
buffer. Although it looks like this should be OK according to
the API documentation, the `ZipFileSystem` relies on all
remaining bytes being returned.

Fixes gh-38595
2023-11-28 22:14:29 -08:00
Andy Wilkinson
75a8955659 Only start management context when parent has a web server
Fixes gh-38554
2023-11-28 17:45:12 +00:00
Andy Wilkinson
3e4e59a8f0 Restore compatibility with Liquibase 4.23
Closes gh-38522
2023-11-28 17:41:47 +00:00
Moritz Halbritter
903f85cd50 Merge branch '3.1.x'
Closes gh-38586
2023-11-28 13:17:42 +01:00
Moritz Halbritter
63df0c1441 Merge pull request #38570 from aleksandrserbin
* pr/38570:
  Fix Observation Filter docs

Closes gh-38570
2023-11-28 13:17:27 +01:00
Alex Serbin
23816d6015 Fix Observation Filter docs
`WebMvcMetricsFilter` no longer exists since 3.0 and should be
replaced with `ServerHttpObservationFilter`

See gh-38570
2023-11-28 13:16:25 +01:00
Moritz Halbritter
c98c6b1ddd Merge branch '3.1.x'
Closes gh-38584
2023-11-28 11:39:44 +01:00
Moritz Halbritter
97af301262 Merge pull request #38573 from dependabot[bot]
* pr/38573:
  Bump gradle/gradle-build-action from 2.9.0 to 2.10.0

Closes gh-38573
2023-11-28 11:38:59 +01:00
dependabot[bot]
e304048668 Bump gradle/gradle-build-action from 2.9.0 to 2.10.0
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](842c587ad8...87a9a15658)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

See gh-38573
2023-11-28 11:38:28 +01:00
Moritz Halbritter
34018b1982 Reinstate testAndDevelopmentOnly in Testcontainers documentation
Closes gh-38571
2023-11-28 11:13:59 +01:00
Phillip Webb
8c7e8778a6 Fix NegativeArraySizeException caused by missing unsigned conversion
Update `ZipContent` so that `eocd.totalNumberOfCentralDirectoryEntries`
is converted from a short to an unsigned int to prevent a negative
number from being used.

This commit also updates the code to consistently use `X.toUnsigned...`
helper methods rather than using bitwise operators.

Fixed gh-38572
2023-11-27 23:33:15 -08:00
Moritz Halbritter
86c2f28cb4 Prevent keep alive thread from blocking the AOT processing
Instead of creating the thread directly in the constructor, the thread
is now created when the context is refreshed and stopped when the
context is closed.

As AOT processing never refreshes the context, the thread is never
started and can't block the AOT processing task.

Closes gh-38531
2023-11-27 13:41:02 +01:00
Phillip Webb
0856e10443 Fix IndexOutOfBoundsException exception from parseUrl with empty spec
Update jar `Handler` code so that the `parseUrl` method can accept an
empty `spec`. Prior to this commit, a `classLoader.getResource("")`
call would result in a `null` result. This breaks a number of things
including `ClassPathResource` and `PathMatchingResourcePatternResolver`.

Fixes gh-38524
2023-11-23 14:35:04 -08:00
Moritz Halbritter
7387c1c64c Merge branch '3.1.x' 2023-11-23 16:58:20 +01:00
Moritz Halbritter
07d8c99605 Switch LATEST_GA for 3.1.x to false 2023-11-23 16:57:22 +01:00
Spring Builds
3fae5516c9 Next development version (v3.2.1-SNAPSHOT) 2023-11-23 14:05:52 +00:00
Andy Wilkinson
f3d48e64a5 Set LATEST_GA to true for Homebrew and SDKMan
Closes gh-38512
2023-11-23 12:12:57 +00:00
Andy Wilkinson
1514d6fd57 Upgrade to Spring Framework 6.1.1
Closes gh-38451
2023-11-23 12:11:48 +00:00
Andy Wilkinson
0da9c64261 Merge branch '3.1.x' 2023-11-23 12:09:13 +00:00
Spring Builds
9552335c15 Next development version (v3.1.7-SNAPSHOT) 2023-11-23 11:32:11 +00:00
Brian Clozel
f54a539c86 Merge branch '3.1.x' 2023-11-23 11:45:44 +01:00
Brian Clozel
11db8c4a46 Fix final release flag in CI pipeline
Spring Boot 3.1.x should have its final OSS release before 2024-05-18.

See gh-38474
2023-11-23 11:45:07 +01:00
Moritz Halbritter
8f2d7d4cef Merge pull request #38508 from izeye
* pr/38508:
  Polish

Closes gh-38508
2023-11-23 09:41:35 +01:00
Johnny Lim
f9f73aa146 Polish
See gh-38508
2023-11-23 09:39:01 +01:00
Moritz Halbritter
f613ab89b9 Auto-configure observations for RestClients
Closes gh-38500
2023-11-23 09:28:09 +01:00
Andy Wilkinson
9c68a2ab87 Integrate child management context with parent context's lifecycle
Previously, the child management context was created when the
parent context's web server was initialized and it wasn't stopped
or closed until the parent context was closed. This resulted in
the child context being left running when the parent context was
stopped. This would then cause a failure when the parent context
was started again as another web server initialized event would be
received and a second child management context would be started.

This commit updates the initialization of the child management
context to integrate it with the lifecycle of the parent context.
The management context is now created the first time the parent
context is started. It is stopped when the parent context is
stopped and restarted if the parent context is started again.
This lifecycle management is done using a phase that ensures
that the child context is not started until the parent context's
web server has been started.

Fixes gh-38502
2023-11-22 19:50:22 +00:00
Andy Wilkinson
de8b304da4 Merge branch '3.1.x' 2023-11-22 19:50:08 +00:00
Andy Wilkinson
1707904f70 Upgrade to Spring Batch 5.0.4
Closes gh-38493
2023-11-22 19:49:53 +00:00
Andy Wilkinson
d33af60ca6 Merge branch '3.0.x' into 3.1.x 2023-11-22 19:49:47 +00:00
Andy Wilkinson
4840ee9f63 Upgrade to Spring Batch 5.0.4
Closes gh-38492
2023-11-22 19:48:42 +00:00
Phillip Webb
9f031b04e5 Merge branch '3.1.x'
Closes gh-38507
2023-11-22 11:13:12 -08:00
Phillip Webb
bc504a8a03 Fix @ConditionalOnBean with annotation early FactoryBean initialization
Update `OnBeanCondition` with a variant of `getBeanNamesForAnnotation`
that does not cause early `FactoryBean` initialization.

Fixes gh-38473
2023-11-22 11:10:59 -08:00
Andy Wilkinson
152acf8a59 Merge branch '3.1.x' 2023-11-22 18:24:03 +00:00
Andy Wilkinson
e7aeeb87cf Upgrade to Spring Integration 6.1.5
Closes gh-38303
2023-11-22 18:23:57 +00:00
Andy Wilkinson
fc00c4006a Upgrade to Spring Integration 6.2.0
Closes gh-38315
2023-11-22 18:19:47 +00:00
Andy Wilkinson
4d33676c04 Upgrade to Spring Batch 5.1.0
Closes gh-38310
2023-11-22 18:19:46 +00:00
Brian Clozel
4b21c12e12 Merge branch '3.1.x' 2023-11-22 16:32:12 +01:00
Brian Clozel
f1dc740316 Merge branch '3.0.x' into 3.1.x 2023-11-22 16:31:52 +01:00