spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-27 04:19:03 +00:00
Code Issues Projects Releases Wiki Activity
50,613 Commits 28 Branches 395 Tags
38d96aabef94debe6ae5647802e61b9510d88a67
Commit Graph
50613 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Moritz Halbritter 70eb941416 Merge branch '3.2.x' 
Closes gh-39076
 2024-01-10 09:41:48 +01:00
Moritz Halbritter 748a80c448 Merge branch '3.1.x' into 3.2.x 
Closes gh-39075
 2024-01-10 09:41:41 +01:00
Moritz Halbritter a0b034dfc8 Merge pull request #38944 from FBibonne 
* pr/38944:
  Polish "Fix error mark position for PatternParseException"
  Fix error mark position for PatternParseException

Closes gh-38944
 2024-01-10 09:32:35 +01:00
Moritz Halbritter 47e8f6168f Polish "Fix error mark position for PatternParseException" 
See gh-38944
 2024-01-10 09:21:03 +01:00
Fabrice Bibonne fccce54d52 Fix error mark position for PatternParseException 
PatternParseException.toDetailedString() return a String
with a mark to specify the error position in the pattern.
The mark takes place in the second line in the String
returned. Because PatternParseFailureAnalyzer.analyze
appended "Invalid mapping pattern detected:" at the
beginning of the returned String, the mark was not well
positioned.

Now, a "\n" is inserted after "Invalid mapping pattern detected:"
and the mark is well positioned

See gh-38944
 2024-01-10 09:14:04 +01:00
Moritz Halbritter eda2261665 Merge branch '3.2.x' 
Closes gh-39074
 2024-01-10 09:12:04 +01:00
Moritz Halbritter 8504b6e0a7 Merge branch '3.1.x' into 3.2.x 
Closes gh-39073
 2024-01-10 09:11:53 +01:00
Moritz Halbritter 52a4097997 Merge pull request #38946 from dreis2211 
* pr/38946:
  Update copyright year to 2024

Closes gh-38946
 2024-01-10 09:11:38 +01:00
Christoph Dreis 68b9f0c643 Update copyright year to 2024 
See gh-38946
 2024-01-10 09:11:29 +01:00
Moritz Halbritter 5bd2ec44f6 Merge pull request #38983 from dreis2211 
* pr/38983:
  Fix typos

Closes gh-38983
 2024-01-10 09:07:27 +01:00
Christoph Dreis b7c9c82180 Fix typos 
See gh-38983
 2024-01-10 09:06:45 +01:00
Moritz Halbritter 93d41497dc Merge pull request #38371 from jonatan-ivanov 
* pr/38371:
  Add ProcessInfoContributor

Closes gh-38371
 2024-01-10 08:46:47 +01:00
Jonatan Ivanov 820396fdff Add ProcessInfoContributor 
This InfoContributor exposes information about
the process of the application.

See gh-38371
 2024-01-10 08:45:49 +01:00
Phillip Webb 2d12fa073d Merge branch '3.2.x' 
Closes gh-39071
 2024-01-09 12:38:24 -08:00
Phillip Webb e5f489f338 Restore manifest support for nested directory jars 
Update `NestedJarFile` so that the `getManifest()` method returns the
manifest from the parent jar file for nested jars based on directory
entries.

This restores the previous behavior supported by Spring Boot 3.1 and
allows class methods such as `getPackage().getImplementationVersion()`
to return non `null` results.

Fixes gh-38996
 2024-01-09 12:33:10 -08:00
Andy Wilkinson 6a083f6a94 Merge branch '3.2.x' 2024-01-09 15:44:38 +00:00
Andy Wilkinson 36f00fcc33 Merge branch '3.1.x' into 3.2.x 2024-01-09 15:44:22 +00:00
Andy Wilkinson bd0a5f9879 Start building against Spring Framework 6.0.16 snapshots 
See gh-39069
 2024-01-09 15:44:12 +00:00
Moritz Halbritter 25614710d5 Fail if superfluous properties are used in property metadata 
Closes gh-37597
 2024-01-09 13:59:51 +01:00
Moritz Halbritter 970c226847 Polish 2024-01-09 13:59:14 +01:00
Andy Wilkinson ba7a85553d Merge branch '3.2.x' 2024-01-09 12:55:11 +00:00
Andy Wilkinson bef0ce244e Upgrade to Micrometer Tracing 1.2.2 
Closes gh-38979
 2024-01-09 12:54:51 +00:00
Andy Wilkinson 1f636adb34 Upgrade to Micrometer 1.12.2 
Closes gh-38978
 2024-01-09 12:54:50 +00:00
Andy Wilkinson 814ff961be Merge branch '3.1.x' into 3.2.x 2024-01-09 12:53:16 +00:00
Andy Wilkinson 284dc2070c Upgrade to Micrometer Tracing 1.1.9 
Closes gh-38975
 2024-01-09 12:52:58 +00:00
Andy Wilkinson c1a147474c Upgrade to Micrometer 1.11.8 
Closes gh-38974
 2024-01-09 12:52:58 +00:00
Andy Wilkinson c805f6ad0f Revert "Start building against Micrometer Tracing 1.3.0 snapshots" 
This reverts commit f31bbbbeaa.

See gh-38985
 2024-01-09 12:47:37 +00:00
Andy Wilkinson bfa84f2355 Revert "Start building against Micrometer 1.13.0 snapshots" 
This reverts commit 2e7e8cf61a.

See gh-38984
 2024-01-09 12:46:34 +00:00
Moritz Halbritter 2551735093 Merge pull request #37435 from adispezo 
* pr/37435:
  Adapt to changes in Brave tagged fields handling
  Add local and tagged correlation fields

Closes gh-37435
 2024-01-09 11:51:50 +01:00
Moritz Halbritter 7120dc07ae Adapt to changes in Brave tagged fields handling 
See gh-38724

See gh-37435
 2024-01-09 11:37:15 +01:00
adispezo 0ca55bf0a6 Add local and tagged correlation fields 
Local fields only work in Brave and not with OpenTelemetry.

Tagged fields work both with Brave and with OpenTelemetry.

See gh-37435
 2024-01-09 11:35:40 +01:00
Moritz HalbritterandAhmed A. Hussein 91d187ca38 Add property for max queue size for Tomcat 
Co-authored-by: Ahmed A. Hussein <ahmedhussein411@gmail.com>

Closes gh-36087
 2024-01-09 10:38:46 +01:00
Moritz Halbritter 98609e875d Include context path in reactive DefaultErrorAttributes 
Closes gh-37269
 2024-01-09 09:54:59 +01:00
Moritz Halbritter 2cce123bb5 Add property to control 'path' field inclusion in error responses 
By default it is included.

Closes gh-38619
 2024-01-09 09:33:00 +01:00
Moritz Halbritter c4be302fdb Auto-configure SpanTagAnnotationHandler 
Closes gh-38662
 2024-01-09 09:03:51 +01:00
Moritz Halbritter a7d88b69d4 Add RabbitMQ properties to enable observations 
Observations can be enabled for the simple, direct and stream listener
and on the RabbitTemplate.

Closes gh-36451
 2024-01-08 15:58:13 +01:00
Andy Wilkinson 93a2b1cda0 Remove dependency management for Dropwizard Metrics 
Closes gh-39034
 2024-01-08 09:43:37 +00:00
Andy Wilkinson 77b533b5f3 Merge pull request #38510 from quaff 
* gh-38510:
  Polish "Treat null as CloudPlatform.NONE"
  Treat null as CloudPlatform.NONE

Closes gh-38510
 2024-01-05 16:48:48 +00:00
Andy Wilkinson c3a5e7695a Polish "Treat null as CloudPlatform.NONE" 
See gh-38510
 2024-01-05 16:29:10 +00:00
Yanming Zhou 01bb806672 Treat null as CloudPlatform.NONE 
See gh-38510
 2024-01-05 16:23:39 +00:00
Andy Wilkinson 71a155677d Merge pull request #38550 from anavrotski 
* gh-38550:
  Align Health.down with Health.Builder.down

Closes gh-38550
 2024-01-05 16:06:26 +00:00
Andrei Navrotski 49e9fe66a7 Align Health.down with Health.Builder.down 
See gh-38550
 2024-01-05 15:41:50 +00:00
Andy Wilkinson ec889b2be0 Merge branch '3.2.x' 
Closes gh-39042
 2024-01-05 15:39:38 +00:00
Andy Wilkinson eda5101fa6 Merge pull request #38966 from onobc 
* gh-38966:
  Use Spring Pulsar BOM

Closes gh-38966
 2024-01-05 14:56:20 +00:00
Chris Bono af89c2bb5f Use Spring Pulsar BOM 
See gh-38966
 2024-01-05 14:55:52 +00:00
Andy Wilkinson c87c710f79 Prohibit upgrades to HttpClient5 5.3 
Closes gh-39007
 2024-01-05 11:41:47 +00:00
Andy Wilkinson 28490738ae Revert "Upgrade to HttpClient5 5.3" 
This reverts commit 31f3f31ac1.

See gh-39007
 2024-01-05 11:40:41 +00:00
Andy Wilkinson 4b89723861 Remove APIs that were deprecated for removal in 3.3.0 
Closes gh-39039
 2024-01-05 11:20:35 +00:00
Andy Wilkinson 5c88f500fe Merge branch '3.2.x' 
Closes gh-39038
 2024-01-05 10:34:12 +00:00
Andy Wilkinson 2acb90cbb5 Prohibit upgrades to Jetty Reactive HTTPClient 4.0.2 
Closes gh-39010
 2024-01-05 10:33:23 +00:00