Commit Graph

50613 Commits

Author SHA1 Message Date
Andy Wilkinson
575d83737a Merge branch '2.5.x'
Closes gh-27799
2021-08-23 13:27:22 +01:00
Andy Wilkinson
e409489859 Merge branch '2.4.x' into 2.5.x
Closes gh-27798
2021-08-23 13:26:37 +01:00
Andy Wilkinson
f8ef90813f Allow @MockBean to be used with Framework's @Repeat
Fixes gh-27693
2021-08-23 12:38:15 +01:00
Scott Frederick
f386ebe61d Remove tests that rely on an unpredictable order of repackaged libs
See gh-27436
2021-08-20 14:09:23 -05:00
Scott Frederick
40a9c4d90f Sort repackaged libraries in a reproducible Maven build
When a Maven build is configured to ensure reproducibility, any
libraries added to `BOOT-INF/lib` in a jar archive or to `WEB-INF/lib`
in a war archive by the Spring Boot plugin repackaging should be
sorted by name to ensure a stable and predictable order.

Fixes gh-27436
2021-08-20 13:00:39 -05:00
Andy Wilkinson
813fc9ea92 Merge branch '2.5.x'
Closes gh-27792
2021-08-20 15:23:31 +01:00
Andy Wilkinson
56438cf274 Merge branch '2.4.x' into 2.5.x
Closes gh-27791
2021-08-20 15:23:16 +01:00
Andy Wilkinson
02a988e055 Make secrets available to publish_gradle_plugin
Fixes gh-27774
2021-08-20 15:20:35 +01:00
Andy Wilkinson
4009d1023e Merge branch '2.5.x'
Closes gh-27790
2021-08-20 15:18:35 +01:00
Andy Wilkinson
e0e6e45523 Merge branch '2.4.x' into 2.5.x
Closes gh-27789
2021-08-20 15:18:20 +01:00
Andy Wilkinson
29c187fda9 Upgrade to Gradle 6.9.1
Closes gh-27788
2021-08-20 15:17:59 +01:00
Andy Wilkinson
69d4e273d3 Merge branch '2.5.x'
Closes gh-27787
2021-08-20 13:56:09 +01:00
Andy Wilkinson
3566e5881b Merge branch '2.4.x' into 2.5.x
Closes gh-27786
2021-08-20 13:54:02 +01:00
Andy Wilkinson
9f402f0428 Use snapshot rather than libs-snapshot when generating effective bom
Closes gh-27785
2021-08-20 13:53:34 +01:00
Stephane Nicoll
2f9dea2f1f Merge branch '2.5.x'
Closes gh-27777
2021-08-19 15:05:23 +02:00
Stephane Nicoll
2d8d0b06e5 Merge branch '2.4.x' into 2.5.x
Closes gh-27776
2021-08-19 15:04:42 +02:00
Stephane Nicoll
0a79cf76a3 Update email address used for submitting the Homebrew update
Closes gh-27775
2021-08-19 15:03:12 +02:00
Spring Buildmaster
15d98a6ccf Next development version (v2.5.5-SNAPSHOT) 2021-08-19 12:17:26 +00:00
Andy Wilkinson
aa216dd3d1 Merge branch '2.5.x'
Closes gh-27773
2021-08-19 12:12:26 +01:00
Andy Wilkinson
a5bd4e963f Merge branch '2.4.x' into 2.5.x
Closes gh-27772
2021-08-19 12:12:02 +01:00
Andy Wilkinson
6be27e2212 Download artifacts for the publish_gradle_plugin task
Closes gh-27759
2021-08-19 12:11:15 +01:00
Stephane Nicoll
bd054d7940 Merge branch '2.5.x'
Closes gh-27771
2021-08-19 12:58:43 +02:00
Stephane Nicoll
29ccbddaf4 Merge branch '2.4.x' into 2.5.x
Closes gh-27770
2021-08-19 12:58:16 +02:00
Stephane Nicoll
f2b7092073 Use token for GitHub authentication consistently
Closes gh-24458
2021-08-19 12:56:51 +02:00
Spring Buildmaster
e28115e7a2 Next development version (v2.4.11-SNAPSHOT) 2021-08-19 10:06:15 +00:00
Andy Wilkinson
cb081d2e14 Merge branch '2.5.x'
Closes gh-27766
2021-08-19 10:31:34 +01:00
Andy Wilkinson
2c18f26b4c Merge branch '2.4.x' into 2.5.x
Closes gh-27765
2021-08-19 10:31:19 +01:00
Andy Wilkinson
ea95c99b77 Update email address used for release commit
Closes gh-27764
2021-08-19 10:30:41 +01:00
Madhura Bhave
2c9945efc7 Merge pull request #27761 from dreis2211
* pr/27761:
  Fix broken links in docs

Closes gh-27761
2021-08-18 15:51:37 -07:00
dreis2211
7c8ccfc4c1 Fix broken links in docs
See gh-27761
2021-08-18 15:51:14 -07:00
Madhura Bhave
8fd9eb72d4 Allow part of a composite contributor in a health group
Closes gh-23027

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-08-18 15:44:10 -07:00
Andy Wilkinson
fd2fbcb3c6 Merge branch '2.5.x'
Closes gh-27758
2021-08-18 18:28:34 +01:00
Andy Wilkinson
6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson
ea9f8516ce Merge pull request #27736 from izeye
* gh-27736:
  Polish "Polish access modifiers for test classes"
  Polish access modifiers for test classes

Closes gh-27736
2021-08-18 17:52:59 +01:00
Andy Wilkinson
ffbd28b60a Polish "Polish access modifiers for test classes"
See gh-27736
2021-08-18 17:52:42 +01:00
izeye
8a425dedfd Polish access modifiers for test classes
See gh-27736
2021-08-18 17:38:40 +01:00
Stephane Nicoll
8662a0a5f1 Merge branch '2.5.x' 2021-08-18 16:13:20 +02:00
Stephane Nicoll
e1cacc7cf5 Merge branch '2.4.x' into 2.5.x 2021-08-18 16:12:30 +02:00
Stephane Nicoll
cdec3bf507 Upgrade to Spring Session 2021.1.0-M1
Closes gh-27612
2021-08-18 16:12:06 +02:00
Stephane Nicoll
0d44503980 Upgrade to Spring Session 2021.0.2
Closes gh-27605
2021-08-18 16:11:05 +02:00
Stephane Nicoll
2baee89971 Upgrade to Spring Session 2020.0.6
Closes gh-27599
2021-08-18 16:10:15 +02:00
Andy Wilkinson
2dfdcf5e88 Merge branch '2.5.x'
Closes gh-27754
2021-08-18 13:52:23 +01:00
Andy Wilkinson
0d904b8868 Merge branch '2.4.x' into 2.5.x
Closes gh-27753
2021-08-18 13:51:49 +01:00
Andy Wilkinson
0b99da79e0 Merge pull request #27734 from izeye
* gh-27734:
  Polish "Use 2012 for copyright beginning year"
  Use 2012 for copyright beginning year

Closes gh-27734
2021-08-18 13:48:44 +01:00
Andy Wilkinson
0b7994a679 Polish "Use 2012 for copyright beginning year"
See gh-27734
2021-08-18 13:48:29 +01:00
izeye
07da144826 Use 2012 for copyright beginning year
See gh-27734
2021-08-18 13:46:35 +01:00
Andy Wilkinson
44884cc495 Merge branch '2.5.x'
Closes gh-27752
2021-08-18 13:00:32 +01:00
Andy Wilkinson
10ceb504ae Merge branch '2.4.x' into 2.5.x
Closes gh-27751
2021-08-18 13:00:19 +01:00
Andy Wilkinson
32c184e31c Revert changes made to work around JDK-8156584
Closes gh-26848
2021-08-18 13:00:11 +01:00
Stephane Nicoll
7f0c9fbbd7 Merge branch '2.5.x' 2021-08-18 09:48:51 +02:00