Moritz Halbritter
e3d7c23dfb
Fix forward merge script
2024-06-21 11:26:20 +02:00
Moritz Halbritter
0859150136
Merge branch '3.3.x'
...
Closes gh-41193
2024-06-21 11:10:52 +02:00
Moritz Halbritter
72e9ea986b
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41192
2024-06-21 11:10:39 +02:00
Moritz Halbritter
013a4dd2b7
Document tracing support for RestClient
...
Closes gh-41182
2024-06-21 11:03:54 +02:00
Andy Wilkinson
57333c99f0
Merge branch '3.3.x'
2024-06-21 10:02:13 +01:00
Andy Wilkinson
b593734edd
Merge branch '3.2.x' into 3.3.x
...
Closes gh-41191
2024-06-21 10:01:22 +01:00
Moritz Halbritter
760a85a137
Merge branch '3.3.x'
...
Closes gh-41190
2024-06-21 10:41:45 +02:00
Moritz Halbritter
78f9d6d973
Remove incorrect note about zipkin-sender-urlconnection
...
Closes gh-41181
2024-06-21 10:41:35 +02:00
Moritz Halbritter
f900d0ba4e
Add properties to enable/disable tracing per exporter
...
There are now three new properties, which control the trace exporting on
a more fine-grained level:
- management.otlp.tracing.export.enabled
- management.wavefront.tracing.export.enabled
- management.zipkin.tracing.export.enabled
They default to null, and if set, take precedence over the global
management.metrics.enabled property.
Closes gh-34620
2024-06-21 09:05:04 +02:00
Moritz Halbritter
6c0c9b9a80
Add properties to specify arguments to Docker Compose commands
...
These new properties take a List<String>:
- spring.docker.compose.start.arguments
- spring.docker.compose.stop.arguments
Closes gh-38763
2024-06-21 08:54:14 +02:00
Stéphane Nicoll
17ca0421e7
Upgrade to HtmlUnit 4.2.0 and Selenium HtmlUnit 4.20
...
Closes gh-41178
Closes gh-41179
2024-06-20 20:18:23 +01:00
Andy Wilkinson
6d9977087a
Merge branch 'framework-6.2'
...
Closes gh-41177
2024-06-20 20:18:13 +01:00
Stéphane Nicoll
fe4c34d226
Adapt test to include MappingJackson2CborHttpMessageConverter
...
See spring-projects/spring-framework#32428
See gh-41177
2024-06-20 20:18:08 +01:00
Brian Clozel
74a2144a37
Adapt to Task and ScheduledTask changes in Framework
...
Spring Framework wraps `Task` and `ScheduledTask` runnables to collect
and share metadata about task execution and scheduling.
The `ScheduledTasksEndpoint` descriptors were relying on the fact that
tasks would never be wrapped. Spring Framework already wrapped runnables
in various cases, for methods returning `Callable` or reactive types.
This commit makes use of the `toString()` method to describe the
runnable. Runnable implementations can override this method for
displaying purposes on the actuator endpoint.
See spring-projects/spring-framework#24560
See gh-41177
2024-06-20 20:18:08 +01:00
Stéphane Nicoll
305bfb1641
Adapt to Mockito support in the Test Context Framework
...
This commit updates MockitoTestExecutionListener to not handle mocks
as this is already done in the listener provided by the core framework,
and registration can only happen once.
Integration tests have been left as-is to validate that the presence
of both listeners doesn't have an unwanted side effect.
See gh-41177
2024-06-20 20:18:07 +01:00
Stéphane Nicoll
2053e13c09
Adapt to new Placeholder resolution API
...
See gh-41177
2024-06-20 20:18:07 +01:00
Andy Wilkinson
762434c85f
Upgrade to Spring Framework 6.2.0-M4
...
See gh-41177
2024-06-20 20:18:07 +01:00
Andy Wilkinson
9016695746
Prohibit Jakarta EE 11 spec upgrades
...
Closes gh-41176
2024-06-20 20:17:56 +01:00
Andy Wilkinson
e97bd37798
Merge branch '3.3.x'
2024-06-20 19:50:46 +01:00
Andy Wilkinson
23597cc744
Start work on Spring Boot 3.4
2024-06-20 19:50:32 +01:00
Andy Wilkinson
7c6d40f777
Prepare 3.3.x branch
2024-06-20 19:46:14 +01:00
Andy Wilkinson
6110e0ff43
Merge branch '3.2.x'
...
Closes gh-41184
2024-06-20 19:30:12 +01:00
Stéphane Nicoll
e9eeac9028
Use Spring Framework's NoOpResponseErrorHandler
...
See spring-projects/spring-framework#32750
Closes gh-41183
2024-06-20 18:28:36 +01:00
Moritz Halbritter
908f0912a9
Next development version (v3.3.2-SNAPSHOT)
2024-06-20 13:44:18 +02:00
Moritz Halbritter
3ef5254d93
Merge branch '3.2.x'
2024-06-20 11:22:53 +02:00
Moritz Halbritter
b65aae4530
Next development version (v3.2.8-SNAPSHOT)
2024-06-20 11:22:26 +02:00
Moritz Halbritter
8e405c0224
Merge branch '3.2.x'
...
Closes gh-41172
2024-06-20 08:48:11 +02:00
Moritz Halbritter
c2f21e9fcd
Don't execute @DockerComposeTests if docker is not running
...
Closes gh-41171
2024-06-20 08:47:56 +02:00
Moritz Halbritter
e7ffeb3dc9
Use Tomcat's new setter for max queue size
...
Closes gh-41093
Closes gh-40957
Closes gh-40945
2024-06-20 08:39:03 +02:00
Phillip Webb
fb9d779aeb
Merge pull request #41162 from mateusscheper
...
* pr/41162:
Polish 'Improve readability of documentation'
Improve readability of documentation
Improving readability
Closes gh-41162
2024-06-19 22:59:27 -07:00
Phillip Webb
955fe1868b
Polish 'Improve readability of documentation'
...
See gh-41162
2024-06-19 22:59:06 -07:00
Mateus Scheper
cf8ed63dde
Improve readability of documentation
...
See gh-41162
2024-06-19 22:58:02 -07:00
Mateus Scheper
6c34c02acf
Improving readability
...
Improving readability by adding ",".
2024-06-19 22:57:59 -07:00
Phillip Webb
dfa7359977
Don't use versioned micrometer documentation links
...
Closes gh-40916
2024-06-19 22:56:39 -07:00
Phillip Webb
9dda006a18
Merge branch '3.2.x'
2024-06-19 22:55:00 -07:00
Phillip Webb
2a4582b084
Update copyright year of changed files
2024-06-19 22:54:40 -07:00
Phillip Webb
9ab086d2b4
Merge branch '3.2.x'
...
Closes gh-41169
2024-06-19 22:53:38 -07:00
Andy Wilkinson
126e87e44d
Fix appending of JDBC parameters to SQL Server JDBC URL
...
Fixes gh-41146
2024-06-19 22:51:40 -07:00
Phillip Webb
f2c778a5a0
Merge branch '3.2.x'
...
Closes gh-41168
2024-06-19 22:44:12 -07:00
Andy Wilkinson
43cd24102f
Rework Docker Compose integration tests
...
This commit introduces a new annotation, `@DockerComposeTest`,
that allows a test class to have multiple tests, each of which
uses a different Docker Compose YAML file.
Closes gh-41154
2024-06-19 22:34:38 -07:00
Phillip Webb
905d6b96d0
Merge branch '3.2.x'
...
Closes gh-41166
2024-06-19 22:30:58 -07:00
Andy Wilkinson
491f34d25c
Improve container test code
...
Replace `DockerImageNames` with a enum and relocate it from the
`testcontainers` to `container` package. The enum now also
becomes a common location that we can use to apply container
configuration such as timeouts.
Closes gh-41164
Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2024-06-19 20:10:03 -07:00
Andy Wilkinson
0d56b0d64e
Upgrade to Tomcat 10.1.25
...
Closes gh-41161
2024-06-19 20:42:49 +01:00
Andy Wilkinson
e530eeec00
Upgrade to Spring Session 3.3.1
...
Closes gh-41041
2024-06-19 20:42:44 +01:00
Andy Wilkinson
4edf5da94d
Upgrade to Spring Integration 6.3.1
...
Closes gh-41036
2024-06-19 20:42:43 +01:00
Andy Wilkinson
33575b7079
Upgrade to Spring GraphQL 1.3.1
...
Closes gh-41035
2024-06-19 20:42:42 +01:00
Andy Wilkinson
fae73b7f44
Upgrade to Spring Framework 6.1.10
...
Closes gh-41150
2024-06-19 20:42:41 +01:00
Andy Wilkinson
cd922daab9
Upgrade to Spring Authorization Server 1.3.1
...
Closes gh-41032
2024-06-19 20:42:40 +01:00
Andy Wilkinson
3496aa6cfa
Upgrade to Maven Jar Plugin 3.4.2
...
Closes gh-41160
2024-06-19 20:42:39 +01:00
Andy Wilkinson
821a17df9d
Upgrade to Infinispan 15.0.5.Final
...
Closes gh-41159
2024-06-19 20:42:35 +01:00