Commit Graph

43211 Commits

Author SHA1 Message Date
Phillip Webb
baddf4c857 Merge branch '3.0.x' into 3.1.x 2023-06-16 13:54:01 -07: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
Jonatan Ivanov
c652a3028a
Merge pull request #35872 from izeye
* pr/35872:
  Polish

Closes gh-35872
2023-06-16 12:44:07 -07:00
Johnny Lim
06157837e5
Polish
See gh-35872
2023-06-16 12:39:03 -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
Stephane Nicoll
ca0e894dad Merge pull request #35784 from sdeleuze
* pr/35784:
  Refine SpringApplication.Augmented.with Kotlin extension

Closes gh-35784
2023-06-16 14:32:29 +02:00
Sébastien Deleuze
db8dee5aac Refine SpringApplication.Augmented.with Kotlin extension
This commit allows to specify multiple Kotlin classes.

See gh-35784
2023-06-16 14:22:18 +02:00
Andy Wilkinson
1652c27b3c Apply additional sources once when using SpringApplication.from()
Previously, when using SpringApplication.from() any additional
sources configured using with() would be applied to every
SpringApplication that was created within the scope of the call to
run(). This caused problems with Spring Cloud's bootstrap context
where the additional sources would be applied to both the user's
application and to the boostrap context's application.

This commit updates the hook that's used to apply the additional
sources so that it's only applied once. This results in the
additional sources only being added to the first SpringApplication
that is run.

Closes gh-35873
2023-06-16 10:39:20 +01:00
Andy Wilkinson
0cfc14ef6c Merge branch '3.0.x' into 3.1.x
Closes gh-35925
2023-06-16 09:58:42 +01: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
c192fb85b2 Merge branch '3.0.x' into 3.1.x
Closes gh-35922
2023-06-15 14:26:55 -07: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
3d9a308053 Merge branch '3.0.x' into 3.1.x
Closes gh-35913
2023-06-15 15:50:07 +01: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
d35a2024b5 Merge branch '3.0.x' into 3.1.x 2023-06-15 16:09:51 +02:00
Stephane Nicoll
19b3ce9f49 Merge branch '2.7.x' into 3.0.x 2023-06-15 16:09:31 +02:00
Stephane Nicoll
88a58a0933 Upgrade to Spring Framework 6.0.10
Closes gh-35751
2023-06-15 16:09:16 +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
61752184f2 Merge branch '3.0.x' into 3.1.x
Closes gh-35911
2023-06-15 14:47:21 +01: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
251b5f2d0f Merge branch '3.0.x' into 3.1.x
Closes gh-35909
2023-06-15 14:38:31 +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
be471c58fe Merge branch '3.0.x' into 3.1.x
Closes gh-35907
2023-06-15 13:49:57 +02: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
cb36df47c8 Merge branch '3.0.x' into 3.1.x
Closes gh-35905
2023-06-15 12:20:55 +01: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
805e9e53a1 Merge branch '3.0.x' into 3.1.x 2023-06-14 15:44:55 -07: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
aafaf0fab9 Merge branch '3.0.x' into 3.1.x
Closes gh-35898
2023-06-14 15:49:21 -05: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
779ac09417 Merge branch '3.0.x' into 3.1.x
Closes gh-35895
2023-06-14 13:49:54 -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
9b88128e3b Merge branch '3.0.x' into 3.1.x 2023-06-14 18:19:53 +01: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
9da1fbd3d0 Merge branch '3.0.x' into 3.1.x
Closes gh-35893
2023-06-14 14:57:13 +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
7f6dbdbe36 Merge branch '3.0.x' into 3.1.x 2023-06-14 09:36:33 +02:00