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
Andy Wilkinson
944e746fe3
Merge branch '3.1.x'
...
Closes gh-38962
2024-01-03 14:06:01 +00:00
Andy Wilkinson
6755a937a2
Merge pull request #38855 from dependabot[bot]
...
* gh-38855:
Bump actions/upload-artifact from 3 to 4
Closes gh-38855
2024-01-03 14:05:51 +00:00
dependabot[bot]
bb474b4db2
Bump actions/upload-artifact from 3 to 4
...
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact ) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases )
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/upload-artifact
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
See gh-38855
2024-01-03 14:05:33 +00:00
Andy Wilkinson
8c93567654
Merge branch '3.1.x'
...
Closes gh-38961
2024-01-03 13:55:11 +00:00
Andy Wilkinson
5d4572bdce
Merge pull request #38928 from dependabot[bot]
...
* gh-38928:
Bump gradle/gradle-build-action from 2.10.0 to 2.11.1
Closes gh-38928
2024-01-03 13:54:51 +00:00
dependabot[bot]
6c6ddd11c4
Bump gradle/gradle-build-action from 2.10.0 to 2.11.1
...
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action ) from 2.10.0 to 2.11.1.
- [Release notes](https://github.com/gradle/gradle-build-action/releases )
- [Commits](87a9a15658...982da8e78c
)
---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
See gh-38928
2024-01-03 13:54:31 +00:00
Andy Wilkinson
00cf1a6d13
Remove unnecessary configuration of idle timeout
...
Fixes gh-38960
2024-01-03 11:37:01 +00:00
Phillip Webb
7216d2b031
Merge branch '3.1.x'
...
Closes gh-38916
2023-12-22 10:43:46 -08:00
Phillip Webb
95a8fa561c
Correctly order @AutoConfigureAfter values when sorting
...
Update `AutoConfigurationSorter` so that `getClassesRequestedAfter()`
results are sorted to match the earlier name/order sorting. Prior to
this commit the order of items added via `@AutoConfigureAfter` was in
an undetermined order which could cause very subtle `@ConditionalOnBean`
bugs.
Thanks very much to Alexandre Baron for their help in diagnosing and
reproducing this issue.
Fixes gh-38904
2023-12-22 08:20:25 -08:00
Spring Builds
a42f549612
Next development version (v3.2.2-SNAPSHOT)
2023-12-21 12:36:09 +00:00
Brian Clozel
7d1982fc94
Merge branch '3.1.x'
2023-12-21 12:14:37 +01:00
Spring Builds
53528d3285
Next development version (v3.1.8-SNAPSHOT)
2023-12-21 10:11:48 +00:00
Phillip Webb
3222458007
Merge branch '3.1.x'
...
Closes gh-38893
2023-12-20 18:22:15 -08:00
Phillip Webb
66e9c777af
Upgrade Ubuntu version in CI images
...
Closes gh-38894
2023-12-20 18:20:09 -08:00
Phillip Webb
f31ffbf927
Don't duplicate META-INF entries in nested directory jars
...
Update `ZipContent` so that `META-INF` entries are no longer duplicated
in nested jars created from directory entries. This aligns with the
behavior of the classic loader and prevents the same META-INF file from
being discovered twice.
Fixes gh-38862
2023-12-20 17:36:06 -08:00
Phillip Webb
b2185282d4
Merge branch '3.1.x'
2023-12-20 09:55:12 -08:00
Phillip Webb
20529ea90c
Drop Netty restriction
2023-12-20 09:54:59 -08:00
Phillip Webb
bf7d1e4f7a
Merge branch '3.1.x'
2023-12-20 09:18:38 -08:00
Phillip Webb
e754c91f50
Upgrade to Spring WS 4.0.9
...
Closes gh-38892
2023-12-20 09:17:52 -08:00
Phillip Webb
1abc0827f8
Upgrade to Netty 4.1.104.Final
...
Closes gh-38891
2023-12-20 09:17:48 -08:00
Phillip Webb
7dfddce1ac
Upgrade to jOOQ 3.18.8
...
Closes gh-38890
2023-12-20 09:17:42 -08:00