Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
43,425 Commits 20 Branches 322 Tags 258 MiB
50d8b20d6c
Commit Graph

43425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
1de7edb615 Remove accidentally committed code 2023-06-16 15:21:03 -07:00
Phillip Webb
23eb7ec1f8 Merge branch '3.1.x' 2023-06-16 14:35:44 -07:00
Phillip Webb
5d6a507142 Merge branch '3.0.x' into 3.1.x 2023-06-16 14:35:23 -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
Phillip Webb
854b29b8fb Polish 2023-06-16 14:32:14 -07:00
Scott Frederick
fe927f0e06 Merge branch '3.1.x' 2023-06-16 16:11:00 -05:00
Scott Frederick
e8301a065f Merge branch '3.0.x' into 3.1.x 
Closes gh-35932
 2023-06-16 16:10:48 -05:00
Scott Frederick
fbba2df7bf Enable Gradle plugin tests on Java 20 
Closes gh-35931
 2023-06-16 16:10:24 -05:00
Phillip Webb
13f16da716 Merge branch '3.1.x' 2023-06-16 14:00:12 -07:00
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
85934c3919
Merge branch '3.1.x' 
Closes gh-35930
 2023-06-16 13:03:08 -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
Moritz Halbritter
3664df61eb Polish API of SpanExporters and SpanProcessors 2023-06-16 14:54:44 +02:00
Stephane Nicoll
fe65806582 Merge branch '3.1.x' 2023-06-16 14:32:39 +02: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
Moritz Halbritter
27add2bbe3 Rework @AutoConfigureObservability and tracing auto-configurations 
@ConditionalOnEnabledTracing is now applied to the minimal amount of
beans. The beans which are annotated with it are beans that will lead
to span sending to backends.

This leaves the majority of the Micrometer Tracing, Brave and
OpenTelemetry infrastructure untouched in tests.

Closes gh-35354
 2023-06-16 14:09:10 +02:00
Andy Wilkinson
fb4b26a842 Merge branch '3.1.x' 2023-06-16 10:45:44 +01: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
4a34015c54 Merge branch '3.1.x' 2023-06-16 10:00:36 +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
Moritz Halbritter
c25b084391 Polish 2023-06-16 10:36:33 +02:00
Moritz Halbritter
929283f4dc Support overriding OTel SpanExporters 
See gh-35596
 2023-06-16 10:24:45 +02:00
Moritz Halbritter
d51559956f Support overriding default OTel SpanProcessor 
Also makes it easier to set the MeterProvider used in the default
SpanProcessor.

Closes gh-35560
 2023-06-16 09:54:27 +02:00
Phillip Webb
0439b630d1 Merge branch '3.1.x' 
Closes gh-35923
 2023-06-15 14:27:11 -07: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
c033484815 Merge branch '3.1.x' 2023-06-15 15:50:34 +01: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
2b57ac2903 Merge branch '3.1.x' 2023-06-15 16:10:01 +02: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
91fdae45b6 Merge branch '3.1.x' 2023-06-15 14:47:32 +01: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