root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
32,014 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

13104 Commits

Author SHA1 Message Date
Andy Wilkinson 6953da2013 Merge branch '2.4.x' 
Closes gh-26257
 2021-04-27 15:19:04 +01:00
Andy Wilkinson a1138efc5f Merge branch '2.3.x' into 2.4.x 
Closes gh-26256
 2021-04-27 15:18:23 +01:00
Andy Wilkinson a470c1af3a Align documentation with main default branch name 
Closes gh-26255
 2021-04-27 15:18:00 +01:00
Andy Wilkinson 31b650093d Merge branch '2.4.x' 
Closes gh-26251
 2021-04-27 11:56:48 +01:00
Andy Wilkinson ffc06e1e30 Merge branch '2.3.x' into 2.4.x 
Closes gh-26250
 2021-04-27 11:51:29 +01:00
Andy Wilkinson 715c4febf9 Update maformed address to one that should fail on CI 
Closes gh-26247
 2021-04-27 11:50:52 +01:00
Andy Wilkinson 091907f762 Rename default branch to main 
Closes gh-26248
 2021-04-27 11:27:37 +01:00
Phillip Webb d42ad237f5 Merge branch '2.4.x' 
Closes gh-26242
 2021-04-26 17:44:26 -07:00
Phillip Webb 94a70d6837 Merge branch '2.3.x' into 2.4.x 
Closes gh-26241
 2021-04-26 17:42:00 -07:00
Phillip Webb 1e0a3a946d Fix binding random properties test 
See gh-26201
 2021-04-26 17:36:58 -07:00
Phillip Webb f82b33698d Add missing asciidoctor heading anchors 
Closes gh-26239
 2021-04-26 17:35:14 -07:00
Phillip Webb ba5b36d733 Restore support for binding random properties 
Revert 0588e989af so that `@ConfigurationProperties` can again be
bound using values from the `RandomValuePropertySource`.

Fixes gh-26201
 2021-04-26 15:42:15 -07:00
Phillip Webb 5e8f383947 Extract code samples from docs 
See gh-6313
 2021-04-26 14:01:37 -07:00
Andy Wilkinson 6de10ff791 Merge branch '2.4.x' 
Closes gh-26237
 2021-04-26 15:53:37 +01:00
Andy Wilkinson 11fa850b97 Merge branch '2.3.x' into 2.4.x 
Closes gh-26236
 2021-04-26 15:53:18 +01:00
Andy Wilkinson 4a990f3ed2 Use bean class loader when importing auto-configuration 
Fixes gh-26234
 2021-04-26 15:38:01 +01:00
Brian Clozel 1732d8ccf7 Merge branch '2.4.x' 
Closes gh-26233
 2021-04-26 11:37:20 +02:00
Brian Clozel 7be9c268b8 Fix ignored use-last-modified property in Spring MVC 
Prior to this commit, the `spring.web.resources.cache.use-last-modified`
configuration property support was lost during a merge operation right
before 2.4.2.

This is due to an invalid test that missed this unintended change. This
commit fixes both problems.

Fixes gh-26212
 2021-04-26 11:34:47 +02:00
Phillip Webb 32a87fcbda Extract code samples from docs 
See gh-6313
 2021-04-25 16:07:26 -07:00
Phillip Webb 2f852fa256 Update copyright year of changed files 2021-04-23 23:42:14 -07:00
Phillip Webb f30d48e3b3 Extract code samples from docs 
See gh-6313
 2021-04-23 23:41:06 -07:00
Phillip Webb 02cc778911 Extract code samples from docs 
See gh-6313
 2021-04-23 19:10:09 -07:00
Phillip Webb 3075ac0f54 Formatting 2021-04-23 11:17:49 -07:00
Slawomir Jaranowski 50118f67fd Test Maven plugin against latest Maven versions 
See gh-26200
 2021-04-22 14:59:16 +02:00
Stephane Nicoll a7b0f90609 Merge branch '2.4.x' 
Closes gh-26211
 2021-04-22 14:48:30 +02:00
Stephane Nicoll e424c1c4b4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26210
 2021-04-22 14:48:15 +02:00
Shimizu, Yuko 474e460d5e Align Maven version in system requirements with what is actually tested 
See gh-26209
 2021-04-22 14:47:29 +02:00
Stephane Nicoll 65a7422a45 Upgrade to Kafka 2.6.2 
Closes gh-24247
 2021-04-22 14:12:55 +02:00
Stephane Nicoll e3f81f0243 Merge branch '2.4.x' 2021-04-21 17:23:42 +02:00
Stephane Nicoll db7460ddd5 Polish contribution based on Andy's review 
See gh-26188
 2021-04-21 17:23:21 +02:00
Stephane Nicoll 3ca6ed6246 Polish 
Closes gh-26190
 2021-04-21 17:20:22 +02:00
izeye 4be48d0d50 Polish 
See gh-26188
 2021-04-21 15:20:06 +02:00
Stephane Nicoll 6c68f3652c Merge branch '2.4.x' 
Closes gh-26186
 2021-04-21 10:03:41 +02:00
Stephane Nicoll 8edeb2c7a9 Merge branch '2.3.x' into 2.4.x 
Closes gh-26185
 2021-04-21 10:03:32 +02:00
Stephane Nicoll 856e0d0535 Document that MeterFilters are only applied to a managed registry 
Closes gh-25610
 2021-04-21 10:02:57 +02:00
Stephane Nicoll d403103aac Merge branch '2.4.x' 
Closes gh-26182
 2021-04-20 17:58:30 +02:00
Stephane Nicoll 6fc803c5a2 Merge branch '2.3.x' into 2.4.x 
Closes gh-26181
 2021-04-20 17:58:14 +02:00
Stephane Nicoll 6f73fd6785 Upgrade to Testcontainers 1.15.3 
Closes gh-26179
 2021-04-20 17:05:58 +02:00
Andy Wilkinson b9348c6d28 Merge branch '2.4.x' 
Closes gh-26169
 2021-04-20 11:26:46 +01:00
Andy Wilkinson bc1a462143 Merge branch '2.3.x' into 2.4.x 
Closes gh-26168
 2021-04-20 11:19:10 +01:00
Andy Wilkinson 82198a99e0 Polish nohttp configuration 
Closes gh-26166
 2021-04-20 11:15:13 +01:00
Stephane Nicoll 55b9fc12c7 Merge branch '2.4.x' 
Closes gh-26165
 2021-04-20 10:23:57 +02:00
Stephane Nicoll 52543b84c1 Fix sourceType for spring.profiles.include 
Closes gh-26163
 2021-04-20 10:23:42 +02:00
Stephane Nicoll cf5334da35 Merge branch '2.4.x' 
Closes gh-26164
 2021-04-20 10:22:55 +02:00
Stephane Nicoll 2bd4ccce8a Document spring.profiles.group in configuration metadata 
Closes gh-26127
 2021-04-20 10:22:43 +02:00
izeye e53453c69c Fix broken assertions in tests 
This commit also restores the HTTP response body
assertion that has been dropped in 5873ddd.

See gh-26162
 2021-04-20 10:02:26 +02:00
Stephane Nicoll 57d35aba12 Merge branch '2.4.x' 
Closes gh-26160
 2021-04-19 17:09:45 +02:00
Stephane Nicoll 6bbd36c77a Merge branch '2.3.x' into 2.4.x 
Closes gh-26159
 2021-04-19 17:01:28 +02:00
Stephane Nicoll 03b65f3260 Polish "Enhance multiple entity manager factories how-to" 
See gh-14928
 2021-04-19 16:59:31 +02:00
Niclas Fredriksson 0d9db46f68 Enhance multiple entity manager factories how-to 
See gh-14928
 2021-04-19 16:53:50 +02:00