Commit Graph
35144 Commits
Author SHA1 Message Date
Stephane Nicoll ef4915ee55 Start building against Spring AMQP 2.4.2 snapshots
See gh-29318
2022-01-11 17:24:49 +01:00
Stephane Nicoll b05f435b27 Start building against Spring Data 2021.1.1 snapshots
See gh-29317
2022-01-11 17:24:49 +01:00
Stephane Nicoll 2da271a240 Start building against Micrometer 1.8.2 snapshots
See gh-29316
2022-01-11 17:24:48 +01:00
Stephane Nicoll 17b0ac61aa Upgrade to Reactor 2020.0.15
Closes gh-29315
2022-01-11 17:24:46 +01:00
Andy Wilkinson a6d8ff4677 Merge branch '2.5.x' into 2.6.x
Closes gh-29268
2022-01-05 11:58:03 +00:00
Andy Wilkinson 41b01cc289 Only write parent entries when entry is new
Previously, when writing a repackaged jar, an attempt to write all of
an entry's parent directories would always be made, irrespective of
whether or not the entry itself had already been written. This was
inefficient as, due to the way that the jar is written, once an entry
itself has been written, we know that all of its parent directories
will also have been written.

This commit updates the jar writer so that no attempt is made to
write parent directory entries if the entry itself has already been
written.

Fixes gh-29175
2022-01-05 11:49:48 +00:00
Phillip Webb 99a683dffb Merge branch '2.5.x' into 2.6.x 2022-01-04 12:24:02 -08:00
Phillip Webb 9a6f35cd8e Update copyright year of changed files 2022-01-04 12:23:53 -08:00
Phillip Webb 81266ca806 Merge branch '2.5.x' into 2.6.x 2022-01-04 12:17:35 -08:00
Phillip Webb 0fcdab3936 Update copyright year of changed files 2022-01-04 12:17:10 -08:00
Phillip Webb 8e583f6f73 Apply exclusion rules to child contributors
Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.

Fixes gh-29251
2022-01-04 12:12:03 -08:00
Andy Wilkinson 438b7553da Merge branch '2.5.x' into 2.6.x
Closes gh-29259
2022-01-04 17:02:09 +00:00
Andy Wilkinson ba121afd87 Upgrade to Gradle 6.9.2
Closes gh-29258
2022-01-04 17:01:12 +00:00
Stephane Nicoll c469c41127 Merge branch '2.5.x' into 2.6.x 2022-01-03 09:33:23 +01:00
Stephane Nicoll 04ce0e65cd Polish assertion 2022-01-03 09:26:22 +01:00
Stephane Nicoll 01c19ef444 Merge branch '2.5.x' into 2.6.x 2022-01-02 11:30:11 +01:00
Stephane Nicoll a0537888f5 Upgrade build to Log4j 2.17.1 2022-01-02 11:29:56 +01:00
Stephane Nicoll f54ea67ed6 Merge branch '2.5.x' into 2.6.x
Closes gh-29198
2022-01-02 11:25:46 +01:00
Stephane Nicoll e67daa5204 Merge pull request #29195 from dreis2211
* pr/29195:
  Update copyrights to 2022

Closes gh-29195
2022-01-02 11:25:40 +01:00
dreis2211 7a87d18b12 Update copyrights to 2022
See gh-29195
2022-01-02 11:24:58 +01:00
Stephane Nicoll ec730dca62 Merge pull request #29187 from izeye
* pr/29187:
  Fix default value for management.info.env.enabled in metadata

Closes gh-29187
2021-12-30 07:33:17 +01:00
izeye d234681348 Fix default value for management.info.env.enabled in metadata
See gh-29187
2021-12-30 07:32:58 +01:00
Stephane Nicoll 4082354ecd Merge branch '2.5.x' into 2.6.x 2021-12-29 11:32:00 +01:00
Stephane Nicoll b345dddec0 Upgrade to Log4j2 2.17.1
Closes gh-29184
2021-12-29 11:30:25 +01:00
Stephane Nicoll 4b6aa81687 Upgrade to Log4j2 2.17.1
Closes gh-29183
2021-12-29 11:29:25 +01:00
Stephane Nicoll 576eb50ed8 Merge pull request #29157 from izeye
* pr/29157:
  Polish

Closes gh-29157
2021-12-27 12:02:46 +01:00
izeye 7fbb5749d1 Polish
See gh-29157
2021-12-27 12:01:50 +01:00
Stephane Nicoll 8ee0640cc0 Merge branch '2.5.x' into 2.6.x
Closes gh-29172
2021-12-25 09:55:24 +01:00
Stephane Nicoll ff40f9f539 Merge pull request #29161 from izeye
* pr/29161:
  Test our Gradle plugin against Gradle 7.3.3

Closes gh-29161
2021-12-25 09:53:39 +01:00
izeye 9a6c1c531d Test our Gradle plugin against Gradle 7.3.3
See gh-29161
2021-12-25 09:52:14 +01:00
Stephane Nicoll b141827641 Merge branch '2.5.x' into 2.6.x 2021-12-24 18:24:30 +01:00
Spring Builds 2c14bd7ac4 Next development version (v2.6.3-SNAPSHOT) 2021-12-21 20:17:03 +00:00
Spring Builds d228721679 Next development version (v2.5.9-SNAPSHOT) 2021-12-21 17:51:23 +00:00
Stephane Nicoll 78ea1465dc Merge branch '2.5.x' into 2.6.x 2021-12-21 17:11:54 +01:00
Stephane Nicoll 61c978e835 Upgrade to Spring Integration 5.5.7
Closes gh-28975
2021-12-21 17:11:43 +01:00
Stephane Nicoll 369046c37d Upgrade to Spring Integration 5.5.7
Closes gh-28966
2021-12-21 17:09:38 +01:00
Stephane Nicoll c7487749de Upgrade to Spring Session 2021.1.1
Closes gh-28974
2021-12-21 16:53:54 +01:00
Stephane Nicoll 878a65d8bf Merge branch '2.5.x' into 2.6.x 2021-12-21 14:56:12 +01:00
Stephane Nicoll 2e67645fd5 Upgrade to Hazelcast 4.2.4
Closes gh-29146
2021-12-21 14:55:32 +01:00
Stephane Nicoll f3621702fb Upgrade to Hazelcast 4.1.8
Closes gh-29145
2021-12-21 14:24:50 +01:00
Stephane Nicoll a6350f2307 Upgrade to Spring Session 2021.0.4
Closes gh-28965
2021-12-21 14:00:18 +01:00
Stephane Nicoll ed5ea950a4 Merge branch '2.5.x' into 2.6.x 2021-12-21 10:02:04 +01:00
Stephane Nicoll b1ab3b8898 Revert "Upgrade to Spring Kafka 2.7.10"
See gh-29114
2021-12-21 09:30:44 +01:00
Stephane Nicoll 55a20e8a16 Merge branch '2.5.x' into 2.6.x 2021-12-21 09:10:49 +01:00
Stephane Nicoll 669710efe0 Upgrade to Spring Security 5.6.1
Closes gh-28973
2021-12-21 09:06:49 +01:00
Stephane Nicoll af77ee007a Upgrade to Spring Kafka 2.8.1
Closes gh-29017
2021-12-21 09:06:22 +01:00
Stephane Nicoll 66c43685f5 Upgrade to Spring AMQP 2.4.1
Closes gh-28995
2021-12-21 09:05:46 +01:00
Stephane Nicoll 44a9145bf8 Upgrade to Spring Security 5.5.4
Closes gh-28964
2021-12-21 09:04:47 +01:00
Stephane Nicoll 6f8e1166c6 Upgrade to Spring Kafka 2.7.10
Closes gh-29114
2021-12-21 09:04:05 +01:00
Stephane Nicoll b2c2e6d0ca Upgrade to Spring AMQP 2.3.13
Closes gh-28994
2021-12-21 09:03:40 +01:00