Commit Graph

42168 Commits

Author SHA1 Message Date
Moritz Halbritter
975e2d110c Polish CompositePropagationFactory
Remove shaded Guava import
2023-06-19 21:03:05 +02:00
Stephane Nicoll
0a23e724ee Merge branch '2.7.x' into 3.0.x 2023-06-17 17:17:31 +02:00
Stephane Nicoll
607c155d4c Upgrade to Spring Retry 2.0.2
Closes gh-35742
2023-06-17 17:14:33 +02:00
Stephane Nicoll
3194edefbd Upgrade to Spring LDAP 3.0.4
Closes gh-35741
2023-06-17 17:14:32 +02:00
Stephane Nicoll
381857b3d3 Upgrade to Spring Data Bom 2022.0.7
Closes gh-35738
2023-06-17 17:14:32 +02:00
Stephane Nicoll
33341f241d Upgrade to Spring Data Bom 2021.2.13
Closes gh-35728
2023-06-17 17:03:11 +02:00
Stephane Nicoll
b4b6477899 Upgrade to Spring AMQP 2.4.13
Closes gh-35727
2023-06-17 17:03:10 +02:00
Phillip Webb
af846da69b Merge branch '2.7.x' into 3.0.x
Closes gh-35933
2023-06-16 16:14:52 -07:00
Phillip Webb
efa072204a Don't migrate properties that cause a circular reference
Update `PropertiesMigrationReporter` so that properties are only
migrated automatically when they don't cause a circular reference.

Fixes gh-35919
2023-06-16 16:14:41 -07:00
Phillip Webb
2f39ebfe89 Polish 2023-06-16 15:23:12 -07:00
Phillip Webb
48e13af8c4 Merge branch '2.7.x' into 3.0.x 2023-06-16 14:34:54 -07:00
Phillip Webb
b8d2c279ee Update copyright year of changed files 2023-06-16 14:32:43 -07:00
Scott Frederick
fbba2df7bf Enable Gradle plugin tests on Java 20
Closes gh-35931
2023-06-16 16:10:24 -05:00
Phillip Webb
0fd1c89889 Polish 2023-06-16 13:53:33 -07:00
Phillip Webb
9b72cc41ab Polish 'Add support for multiple tracing propagation formats'
See gh-35611
2023-06-16 13:43:46 -07:00
Phillip Webb
691b549e36 Merge branch '2.7.x' into 3.0.x 2023-06-16 10:18:43 -07:00
Phillip Webb
f3f8610539 Polish 2023-06-16 10:17:08 -07:00
Andy Wilkinson
845c97fae0 Merge branch '2.7.x' into 3.0.x
Closes gh-35924
2023-06-16 09:55:52 +01:00
Andy Wilkinson
c46bef1858 Protect against unconstrained dependencies in starters
Closes gh-19775
2023-06-16 09:50:52 +01:00
Phillip Webb
4c8b93b37d Merge branch '2.7.x' into 3.0.x
Closes gh-35920
2023-06-15 14:26:36 -07:00
Phillip Webb
137f4ee451 Support reporting of custom Log4J2 log levels from the LoggersEndpoint
Support custom Log4J2 log levels by changing `LoggerConfiguration` so
that it can now report levels using a `LevelConfiguration` object
rather than the limited `LogLevel` enum.

The `Log4J2LoggingSystem` class now uses `LevelConfiguration.ofCustom`
for custom logging levels, rather than throwing an exception.

The `LoggersEndpoint` has also been updated so that it can return the
custom logger name.

Fixes gh-35227
2023-06-15 14:03:22 -07:00
Andy Wilkinson
eeea065595 Merge branch '2.7.x' into 3.0.x
Closes gh-35912
2023-06-15 15:49:36 +01:00
Andy Wilkinson
e779fb0bc4 Validate constructor bound config props that implement Validator
Closes gh-33669
2023-06-15 15:29:20 +01:00
Stephane Nicoll
19b3ce9f49 Merge branch '2.7.x' into 3.0.x 2023-06-15 16:09:31 +02:00
Stephane Nicoll
f20c0424ee Upgrade to Spring Framework 6.0.10
Closes gh-35739
2023-06-15 16:08:05 +02:00
Stephane Nicoll
836d88c9c8 Upgrade to Spring Framework 5.3.28
Closes gh-35729
2023-06-15 16:04:38 +02:00
Andy Wilkinson
7bb3caf914 Merge branch '2.7.x' into 3.0.x
Closes gh-35910
2023-06-15 14:47:01 +01:00
Andy Wilkinson
ee606db34a Update Data REST starter description to mention Spring MVC
Closes gh-35678
2023-06-15 14:46:23 +01:00
Andy Wilkinson
a5981a4dac Merge branch '2.7.x' into 3.0.x
Closes gh-35908
2023-06-15 14:38:13 +01:00
Andy Wilkinson
9feb84e234 Add DynmicPropertySource to ordered list of property sources
Closes gh-32901
2023-06-15 14:36:38 +01:00
Moritz Halbritter
b1f2bde9d9 Merge pull request #35611 from mhalbritter
* mh/35096-add-support-for-multiple-context-propagation-types-for-tracing:
  Add support for multiple tracing propagation formats

Closes gh-35611
2023-06-15 13:37:40 +02:00
Moritz Halbritter
8cd8d21720 Add support for multiple tracing propagation formats
See gh-35611
2023-06-15 13:37:33 +02:00
Andy Wilkinson
6def7252d6 Merge branch '2.7.x' into 3.0.x
Closes gh-35904
2023-06-15 12:20:27 +01:00
Andy Wilkinson
088006ff60 Use ephemeral port for Hazelcast
When Hazelcast is started on a fixed port and that port is already in
use, it does not fail to start which makes the problem hard to
detect. A symptom of the problem is that clients will not be able to
connect and will either retry indefinitely or will timeout depending
on their configuration.

This commit updates the Hazelcast client tests to start the Hazelcast
instance on an ephemeral port and to customize the client
configuration with the instance's address before use. This should
allow the client tests to work reliably in an environment where
Hazelcast's default port is already in use.

Closes gh-35903
2023-06-15 12:19:34 +01:00
Phillip Webb
4337aa6a90 Merge branch '2.7.x' into 3.0.x 2023-06-14 15:44:46 -07:00
Phillip Webb
63978978b4 Drop STS plugins from Eclipse setup 2023-06-14 15:42:57 -07:00
Scott Frederick
244bf4801b Enable Paketo builder system tests on Java 20
Closes gh-35897
2023-06-14 15:49:07 -05:00
Scott Frederick
504d9fc50b Fix validation of process args metadata in Paketo system tests
Fixes gh-35894
2023-06-14 13:49:11 -05:00
Andy Wilkinson
4694e20628 Merge branch '2.7.x' into 3.0.x 2023-06-14 18:19:43 +01:00
Andy Wilkinson
7d07c0d09c Polish configuration related to predictive test selection
Most notably, this commit splits the tests that use Spring REST Docs
out into a separate task for which predictive test selection is
disabled. This allows it to be cached and use Gradle's built-in
up-to-date checking, thereby avoiding the generation of new snippets
and the need to then run the asciidoctor and asciidoctorPdf tasks.

It also updates spring-boot-smoke-test-junit-vintage to disable
predictive test selection so that we can continue to assert that
the some tests were executed.

See gh-35869
2023-06-14 18:15:04 +01:00
Andy Wilkinson
ca5acaf1f2 Merge branch '2.7.x' into 3.0.x
Closes gh-35779
2023-06-14 14:56:47 +01:00
Andy Wilkinson
27b8ec8a3d Upgrade CI images to ubuntu:jammy-20230522
Closes gh-35778
2023-06-14 14:55:05 +01:00
Stephane Nicoll
162bba9d7c Merge branch '2.7.x' into 3.0.x 2023-06-14 09:36:13 +02:00
Stephane Nicoll
0a558c590f Upgrade to Tomcat 10.1.10
Closes gh-35882
2023-06-14 09:23:50 +02:00
Stephane Nicoll
d3ff04fa4b Upgrade to Reactor Bom 2022.0.8
Closes gh-35736
2023-06-14 09:23:44 +02:00
Stephane Nicoll
1900910008 Upgrade to Micrometer Tracing 1.0.7
Closes gh-35735
2023-06-14 09:23:44 +02:00
Stephane Nicoll
2d43f345de Upgrade to Micrometer 1.10.8
Closes gh-35734
2023-06-14 09:23:43 +02:00
Stephane Nicoll
7cf41e9e0a Upgrade to Logback 1.4.8
Closes gh-35881
2023-06-14 09:23:43 +02:00
Stephane Nicoll
10b66975dd Upgrade to Glassfish JAXB 4.0.3
Closes gh-35880
2023-06-14 09:23:38 +02:00
Stephane Nicoll
2dbfe54762 Upgrade to Couchbase Client 3.4.7
Closes gh-35879
2023-06-14 09:23:33 +02:00