Commit Graph

35162 Commits

Author SHA1 Message Date
Stephane Nicoll 4309b78f02 Upgrade to HttpCore5 5.1.3
Closes gh-29343
2022-01-12 14:33:45 +01:00
Andy Wilkinson e5a110215c Merge branch '2.5.x' into 2.6.x
Closes gh-29330
2022-01-12 10:28:47 +00:00
Andy Wilkinson 5744724af2 Merge branch '2.5.x' into 2.6.x
Closes gh-29329
2022-01-12 10:28:27 +00:00
Andy Wilkinson ba3842b7a6 Upgrade to Gradle Enterprise plugin 3.8
Closes gh-29254
2022-01-12 09:58:57 +00:00
Andy Wilkinson 63e2ccd489 Upgrade to Gradle Enterprise Conventions 0.0.9
Closes gh-29325
2022-01-12 09:58:57 +00:00
Stephane Nicoll 8c6f5812a5 Merge branch '2.5.x' into 2.6.x 2022-01-12 09:31:33 +01:00
Stephane Nicoll c32912f05f Start building against Spring Framework 5.3.15 snapshots
See gh-29327
2022-01-12 09:30:17 +01:00
Stephane Nicoll b5407e6e8e Start building against Spring Framework 5.3.15 snapshots
See gh-29326
2022-01-12 09:29:36 +01:00
Andy Wilkinson c211aa0ac2 Start building against Spring REST Docs 2.0.6 snapshots
See gh-29322
2022-01-11 20:27:19 +00:00
Andy Wilkinson 27eaaa9442 Start building against Spring REST Docs 2.0.6 snapshots
See gh-29321
2022-01-11 20:09:39 +00:00
Stephane Nicoll e4bb08238e Merge branch '2.5.x' into 2.6.x 2022-01-11 17:32:56 +01:00
Stephane Nicoll b9716ca4ee Start building against Spring Integration 5.5.8 snapshots
See gh-29320
2022-01-11 17:24:50 +01:00
Stephane Nicoll 504421c4a5 Start building against Spring Kafka 2.8.2 snapshots
See gh-29319
2022-01-11 17:24:49 +01:00
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
Stephane Nicoll c2925f8e84 Start building against Spring Integration 5.5.8 snapshots
See gh-29314
2022-01-11 17:22:20 +01:00
Stephane Nicoll 116427c78e Start building against Spring Kafka 2.7.10 snapshots
See gh-29313
2022-01-11 17:22:20 +01:00
Stephane Nicoll 53fcf0971e Start building against Spring AMQP 2.3.14 snapshots
See gh-29312
2022-01-11 17:22:20 +01:00
Stephane Nicoll 72e72bda67 Start building against Micrometer 1.7.8 snapshots
See gh-29310
2022-01-11 17:22:19 +01:00
Stephane Nicoll 79fd0ad30a Upgrade to Reactor 2020.0.15
Closes gh-29309
2022-01-11 17:22:18 +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