Commit Graph

47180 Commits

Author SHA1 Message Date
Moritz Halbritter f3ec5dab13 Merge pull request #38703 from JohnNiang
* pr/38703:
  Support configuring maximum number of sessions for reactive server

Closes gh-38703
2024-01-10 11:04:09 +01:00
John Niang 49c6bacd44 Support configuring maximum number of sessions for reactive server
Signed-off-by: John Niang <johnniang@foxmail.com>

See gh-38703
2024-01-10 11:03:55 +01:00
Andy Wilkinson d2a3c8703a Add missing since javadoc to acceptTasksAfterContextClose
See gh-38968
2024-01-10 09:58:23 +00:00
Moritz Halbritter 5c465115ac Merge pull request #38968 from quaff
* pr/38968:
  Polish "Add configuration property "spring.task.execution.pool.shutdown.accept-tasks-after-context-close""
  Add configuration property "spring.task.execution.pool.shutdown.accept-tasks-after-context-close"

Closes gh-38968
2024-01-10 10:39:05 +01:00
Moritz Halbritter 1c411c2fc3 Polish "Add configuration property "spring.task.execution.pool.shutdown.accept-tasks-after-context-close""
See gh-38968
2024-01-10 10:38:28 +01:00
Yanming Zhou 0e53c0098f Add configuration property "spring.task.execution.pool.shutdown.accept-tasks-after-context-close"
ExecutorConfigurationSupport::setAcceptTasksAfterContextClose is
introduced since Spring Framework 6.1

See gh-38968
2024-01-10 10:37:15 +01:00
Moritz Halbritter 5650a547cf Merge branch '3.2.x'
Closes gh-39080
2024-01-10 10:31:33 +01:00
Moritz Halbritter 47564ccea1 Merge pull request #39052 from okohub
* pr/39052:
  Polish "Fix Jetty ConnectionLimit configuration"
  Fix Jetty ConnectionLimit configuration

Closes gh-39052
2024-01-10 10:18:01 +01:00
Moritz Halbritter 66dc72da46 Polish "Fix Jetty ConnectionLimit configuration"
See gh-39052
2024-01-10 10:17:38 +01:00
Onur Kagan Ozcan 7113c10b08 Fix Jetty ConnectionLimit configuration
See gh-39052
2024-01-10 10:12:27 +01:00
Moritz Halbritter d610955b9d Merge branch '3.2.x'
Closes gh-39079
2024-01-10 09:58:24 +01:00
Moritz Halbritter 793801b9cb Merge branch '3.1.x' into 3.2.x
Closes gh-39078
2024-01-10 09:53:45 +01:00
Moritz Halbritter fd10c69c16 Merge pull request #39072 from BenchmarkingBuffalo
* pr/39072:
  Move autoStartup property

Closes gh-39072
2024-01-10 09:52:44 +01:00
BenchmarkingBuffalo 56f00c4c21 Move autoStartup property
Move the property 'autoStartup' from BaseContainer to AmqpContainer.

See gh-39072
2024-01-10 09:52:28 +01:00
Moritz Halbritter ffe31cfe55 Merge branch '3.2.x'
Closes gh-39077
2024-01-10 09:49:54 +01:00
Moritz Halbritter 45d2c3b0ca Merge pull request #38924 from skcskitano
* pr/38924:
  Fix connection leak in SqlDialectLookup

Closes gh-38924
2024-01-10 09:49:44 +01:00
skcskitano dc8b55c0ef Fix connection leak in SqlDialectLookup
See gh-38924
2024-01-10 09:46:39 +01:00
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 Halbritter 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