Commit Graph

46548 Commits

Author SHA1 Message Date
Phillip Webb
4fb68d4e23 Start building against Spring Framework 6.1.2 snapshots
See gh-38666
2023-12-05 14:58:49 -08:00
Andy Wilkinson
49990afd78 Polish
See gh-38592
2023-12-05 20:49:34 +00:00
Andy Wilkinson
16c2ddb02c Merge branch '3.1.x'
Closes gh-38665
2023-12-05 20:31:17 +00:00
Andy Wilkinson
b424254587 Test Gradle plugin against Gradle 8.5
Closes gh-38664
2023-12-05 20:30:54 +00:00
Moritz Halbritter
de70b4fb4c Merge branch '3.1.x'
Closes gh-38661
2023-12-05 14:02:52 +01:00
Moritz Halbritter
3f29c7f84f Add log message if Docker Compose services are already running
Closes gh-38398
2023-12-05 14:02:16 +01:00
Andy Wilkinson
8e3f9cbc1a Upgrade to Hibernate 6.4.0.Final
Closes gh-38523
2023-12-05 12:13:43 +00:00
Moritz Halbritter
f9a1eb000e Merge branch '3.1.x'
Closes gh-38658
2023-12-05 11:51:03 +01:00
Moritz Halbritter
24886eae64 Merge pull request #38654 from cachescrubber
* pr/38654:
  Build against UCP and JDBC driver for Oracle Database variant ucp11

Closes gh-38654
2023-12-05 11:49:42 +01:00
Lars Uffmann
5981a3fd33 Build against UCP and JDBC driver for Oracle Database variant ucp11
See gh-38654
2023-12-05 11:40:35 +01:00
Moritz Halbritter
6431671a3f Merge branch '3.1.x'
Closes gh-38657
2023-12-05 11:36:31 +01:00
Moritz Halbritter
4d5a139e73 Merge pull request #38649 from dependabot[bot]
* pr/38649:
  Bump actions/setup-java from 3 to 4

Closes gh-38649
2023-12-05 11:36:12 +01:00
dependabot[bot]
b0c1db47a8 Bump actions/setup-java from 3 to 4
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

See gh-38649
2023-12-05 11:35:09 +01:00
Moritz Halbritter
02347abefb Disable propagation of traces if tracing is disabled
Closes gh-38641
2023-12-05 11:19:43 +01:00
Moritz Halbritter
a0fc2d48cd Merge branch '3.1.x' 2023-12-05 11:19:32 +01:00
Moritz Halbritter
350bc26bbe Reinstate 'management.tracing.enabled' property
See gh-38626
2023-12-05 11:18:18 +01:00
Moritz Halbritter
aad3e73b5d Merge pull request #38632 from gavlyukovskiy
* pr/38632:
  Update documentation about jetty http2 dependency

Closes gh-38632
2023-12-04 13:36:51 +01:00
Arthur Gavlyukovskiy
829bec7602 Update documentation about jetty http2 dependency
See gh-38632
2023-12-04 13:34:29 +01:00
Moritz Halbritter
89a0ac3018 Reword documentation 2023-12-01 14:47:24 +01:00
Moritz Halbritter
4d01d95fbc Merge branch '3.1.x'
Closes gh-38627
2023-12-01 14:45:53 +01:00
Moritz Halbritter
3d4d1e80ca Remove management.tracing.enabled from documentation
Closes gh-38626
2023-12-01 14:43:13 +01:00
Brian Clozel
0321a8a05b Configure ObservationRegistry on JmsListener
Prior to this commit, we set in gh-37388 the ObservationRegistry on the
auto-configured JmsTemplate bean. This enables observations and context
propagation when sending JMS messages.

This commit applies the same to the `DefaultJmsListenerContainerFactory`
and the `DefaultJmsListenerContainerFactoryConfigurer`, in order to
enable observations on `@JmsListener` annotated methods.

This commit also refactors the support implemented in gh-37388 to avoid
relying on a bean post processor and instead set the observation
registry directly in the main auto-configuration: while Micrometer core
is an actuator-only dependency, Micrometer Observation API is a compile
dependnecy for spring-jms itself and there is no need to separate
concerns there.

Fixes gh-38613
2023-12-01 09:36:00 +01:00
Moritz Halbritter
d172b22064 Escape pipe symbol in properties changelog table cells
Closes gh-38515
2023-11-30 11:37:25 +01:00
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