Commit Graph

50613 Commits

Author SHA1 Message Date
Stephane Nicoll
0358c801d9 Polish "Fix grammar in README.adoc"
See gh-28835
2021-12-09 15:32:20 +01:00
Abhinav Vashisth
7ec3aa5e41 Fix grammar in README.adoc
See gh-28835
2021-12-09 15:29:08 +01:00
Stephane Nicoll
fcea05a4b8 Merge branch '2.7.x' 2021-12-09 15:09:53 +01:00
Stephane Nicoll
2b3827332f Merge branch '2.6.x' into 2.7.x
Closes gh-28946
2021-12-09 15:09:46 +01:00
Stephane Nicoll
646caf0f25 Merge pull request #28944 from izeye
* pr/28944:
  Add public accessor for StackdriverProperties.useSemanticMetricTypes

Closes gh-28944
2021-12-09 15:09:41 +01:00
izeye
0364353204 Add public accessor for StackdriverProperties.useSemanticMetricTypes
See gh-28944
2021-12-09 15:09:13 +01:00
Stephane Nicoll
377b58f64c Merge branch '2.7.x' 2021-12-09 15:06:36 +01:00
Stephane Nicoll
a323ff7136 Merge branch '2.6.x' into 2.7.x
Closes gh-28945
2021-12-09 15:06:26 +01:00
Stephane Nicoll
8b2b83674c Merge pull request #28911 from viktorardelean
* pr/28911:
  Polish "Add consistent quotes in YAML samples of reference doc"
  Add consistent quotes in YAML samples of reference doc

Closes gh-28911
2021-12-09 15:06:04 +01:00
Stephane Nicoll
5599e8d340 Polish "Add consistent quotes in YAML samples of reference doc"
See gh-28911
2021-12-09 15:02:47 +01:00
Viktor Ardelean
0b781d87b1 Add consistent quotes in YAML samples of reference doc
See gh-28911
2021-12-09 15:02:23 +01:00
Andy Wilkinson
d06e1d6ce2 Merge branch '2.7.x' 2021-12-09 12:53:11 +00:00
Andy Wilkinson
f5364e971a Merge branch '2.6.x' into 2.7.x
Closes gh-28943
2021-12-09 12:52:30 +00:00
Andy Wilkinson
51957f18c4 Merge branch '2.6.x' into 2.7.x
Closes gh-28942
2021-12-09 12:52:04 +00:00
Andy Wilkinson
8f3659c147 Merge branch '2.5.x' into 2.6.x
Closes gh-28941
2021-12-09 12:44:48 +00:00
Andy Wilkinson
c3e0a7905d Merge pull request #28902 from Artur-
* gh-28902:
  Make ErrorPageSecurityFilter compatible with Servlet 3.1

Closes gh-28902
2021-12-09 12:37:02 +00:00
Artur Signell
ad754abba3 Make ErrorPageSecurityFilter compatible with Servlet 3.1
See gh-28902
2021-12-09 12:36:35 +00:00
Andy Wilkinson
3b23c542a0 Test servlet 3.1 compatibility in deployment tests
Closes gh-28906
2021-12-09 12:24:43 +00:00
Andy Wilkinson
03c3ca55a6 Merge pull request #28928 from dramatist
* gh-28928:
  Upgrade Java version to 17 in spring-boot-starter-parent's pom

Closes gh-28928
2021-12-09 11:52:06 +00:00
dramatist
ac2ef33107 Upgrade Java version to 17 in spring-boot-starter-parent's pom
See gh-28928
2021-12-09 11:51:19 +00:00
Stephane Nicoll
77c8303bd0 Merge branch '2.7.x' 2021-12-09 10:46:18 +01:00
Stephane Nicoll
7af589d31a Merge branch '2.6.x' into 2.7.x
Closes gh-28937
2021-12-09 10:46:04 +01:00
Stephane Nicoll
25a2888be5 Fix default value of spring.mvc.pathmatch.matching-strategy property
Closes gh-28936
2021-12-09 10:45:21 +01:00
Andy Wilkinson
756b9b9254 Switch back to using Spring Session's bom
Closes gh-28870
2021-12-08 14:48:13 +00:00
Scott Frederick
2b7a034776 Merge branch '2.7.x' 2021-12-07 14:11:06 -06:00
Scott Frederick
3cb30cb283 Merge branch '2.6.x' into 2.7.x
Closes gh-28923
2021-12-07 14:10:46 -06:00
Scott Frederick
3555837845 Merge branch '2.5.x' into 2.6.x
Closes gh-28922
2021-12-07 14:10:28 -06:00
Scott Frederick
b0b2cd79b4 Use latest buildpack image tag when no tag is provided
Fixes gh-28921
2021-12-07 14:10:10 -06:00
Scott Frederick
33953823fc Replace usage of deprecated Spring Framework methods
See gh-28642
2021-12-06 16:12:34 -06:00
Scott Frederick
16f54d2c5c Merge branch '2.7.x' 2021-12-03 11:42:52 -06:00
Scott Frederick
61fb9f83df Merge branch '2.6.x' into 2.7.x
Closes gh-28905
2021-12-03 11:42:28 -06:00
Scott Frederick
ab0cc55e20 Merge branch '2.5.x' into 2.6.x
Closes gh-28904
2021-12-03 11:42:03 -06:00
Scott Frederick
467c092fdc Remove classpath index manifest attribute from repackaged war files
Fixes gh-28895
2021-12-03 11:41:28 -06:00
Andy Wilkinson
3478e1912c Merge branch '2.7.x' 2021-12-03 08:36:29 +00:00
Andy Wilkinson
6d18d8f922 Merge branch '2.6.x' 2021-12-02 10:31:52 +00:00
Andy Wilkinson
a3ecdcf058 Merge branch '2.6.x' into 2.7.x
Closes gh-28892
2021-12-02 10:31:11 +00:00
Andy Wilkinson
4606e17696 Merge branch '2.5.x' into 2.6.x
Closes gh-28891
2021-12-02 10:30:51 +00:00
Andy Wilkinson
af60a8a7cf Test our Gradle plugin against Gradle 7.3.1
Closes gh-28890
2021-12-02 10:29:22 +00:00
Andy Wilkinson
17d9a6bd74 Upgrade to Gradle 7.3.1
Closes gh-28889
2021-12-02 10:26:40 +00:00
Scott Frederick
f28eb073b3 Remove unnecessary exclusion from web-services starter
See gh-28648
2021-12-01 15:18:32 -06:00
Scott Frederick
1f838bf2ee Merge branch '2.7.x' 2021-12-01 14:08:26 -06:00
Scott Frederick
5f14cffea3 Add support for CNB platform API 0.5 through 0.8
Fixes gh-28850
2021-12-01 14:05:20 -06:00
Andy Wilkinson
d1403f5806 Merge branch '2.7.x' 2021-12-01 14:40:02 +00:00
Andy Wilkinson
228c23d7d3 Merge branch '2.6.x' into 2.7.x
Closes gh-28881
2021-12-01 14:39:43 +00:00
Andy Wilkinson
b6135ce919 Merge branch '2.5.x' into 2.6.x
Closes gh-28880
2021-12-01 14:39:26 +00:00
Andy Wilkinson
b2a1994f7d Make clean remove the root build folder
Closes gh-28857
2021-12-01 14:38:25 +00:00
Andy Wilkinson
91faec3917 Merge branch '2.7.x' 2021-12-01 12:17:34 +00:00
Andy Wilkinson
51e0fc4b6b Merge branch '2.6.x' into 2.7.x
See gh-28879
2021-12-01 12:17:10 +00:00
Andy Wilkinson
f0f0aa5c46 Merge branch '2.5.x' into 2.6.x
See gh-28878
2021-12-01 12:16:37 +00:00
Andy Wilkinson
8322dda8cc Fix variant selection in spring-boot-maven-plugin
See gh-28877
2021-12-01 12:16:14 +00:00