Commit Graph

46797 Commits

Author SHA1 Message Date
Andy Wilkinson
b14c4ef643 Upgrade to Spring Framework 6.1.3
Closes gh-38982
2024-01-11 13:23:05 +00:00
Andy Wilkinson
5047048c10 Upgrade to Reactor Bom 2023.0.2
Closes gh-38980
2024-01-11 13:23:04 +00:00
Andy Wilkinson
f249916381 Merge branch '3.1.x' into 3.2.x 2024-01-11 13:17:25 +00:00
Andy Wilkinson
c1495bca33 Upgrade to Spring Framework 6.0.16
Closes gh-39069
2024-01-11 13:17:16 +00:00
Andy Wilkinson
f103586a13 Upgrade to Reactor Bom 2022.0.15
Closes gh-38976
2024-01-11 13:17:15 +00:00
Andy Wilkinson
7087897507 Merge branch '3.1.x' into 3.2.x
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson
45c32854a5 Fix Checkstyle upgrade
Closes gh-38746
2024-01-10 15:37:38 +00:00
Andy Wilkinson
d3b93f5d70 Merge branch '3.1.x' into 3.2.x
Closes gh-39084
2024-01-10 15:33:44 +00:00
Andy Wilkinson
4699923b68 Upgrade to Spring Java Format 0.0.41
Closes gh-39082
2024-01-10 13:56:25 +00: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
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
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
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
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
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
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
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
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
2acb90cbb5 Prohibit upgrades to Jetty Reactive HTTPClient 4.0.2
Closes gh-39010
2024-01-05 10:33:23 +00:00
Andy Wilkinson
d94661f91b Start building against Spring Pulsar 1.0.2 snapshots
See gh-38994
2024-01-04 14:16:53 +00:00
Andy Wilkinson
2fb6a2eef4 Consider snapshots when upgrading Spring Pulsar
Closes gh-38992
2024-01-04 14:15:35 +00:00
Andy Wilkinson
4c0f631d93 Start building against Spring Framework 6.1.3 snapshots
See gh-38982
2024-01-04 13:25:45 +00:00
Andy Wilkinson
d7fc9a66b4 Start building against Spring Data Bom 2023.1.2 snapshots
See gh-38981
2024-01-04 13:25:40 +00:00
Andy Wilkinson
6b59c01003 Start building against Reactor Bom 2023.0.2 snapshots
See gh-38980
2024-01-04 13:25:36 +00:00
Andy Wilkinson
44f5a8bfe9 Start building against Micrometer Tracing 1.2.2 snapshots
See gh-38979
2024-01-04 13:25:31 +00:00
Andy Wilkinson
e589606112 Start building against Micrometer 1.12.2 snapshots
See gh-38978
2024-01-04 13:25:26 +00:00
Andy Wilkinson
ec37b11f9c Merge branch '3.1.x' into 3.2.x 2024-01-04 13:22:39 +00:00
Andy Wilkinson
d5d4ec99da Start building against Spring Data Bom 2023.0.8 snapshots
See gh-38977
2024-01-04 12:34:13 +00:00
Andy Wilkinson
905e2a623e Start building against Reactor Bom 2022.0.15 snapshots
See gh-38976
2024-01-04 12:34:09 +00:00
Andy Wilkinson
694b418f59 Start building against Micrometer Tracing 1.1.9 snapshots
See gh-38975
2024-01-04 12:34:04 +00:00
Andy Wilkinson
e9f086ff86 Start building against Micrometer 1.11.8 snapshots
See gh-38974
2024-01-04 12:33:59 +00:00
Andy Wilkinson
433f8a6fd9 Prepare 3.2.x branch 2024-01-04 10:50:34 +00:00
Andy Wilkinson
735df3597f Merge branch '3.1.x'
Closes gh-38963
2024-01-03 15:13:27 +00:00
Andy Wilkinson
c10f78ec5a Improve handling of Throwable from logging system init
Closes gh-38885
2024-01-03 15:13:05 +00:00