root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
31,113 Commits 23 Branches 348 Tags 290 MiB
Commit Graph

31113 Commits

Author SHA1 Message Date
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 b1c32f2a8a Merge branch '2.3.x' into 2.4.x 
Closes gh-26245
 2021-04-27 10:39:36 +01:00
Andy Wilkinson ad67c3d50f Avoid using yum (which requires http:// access) in launch script tests 
Fixes gh-26240
 2021-04-27 10:39:19 +01: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 f82b33698d Add missing asciidoctor heading anchors 
Closes gh-26239
 2021-04-26 17:35:14 -07: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 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
Stephane Nicoll e424c1c4b4 Merge branch '2.3.x' into 2.4.x 
Closes gh-26210
 2021-04-22 14:48:15 +02:00
Stephane Nicoll 1d88e8fa65 Merge pull request #26209 from zoosm3 
* pr/26209:
  Align Maven version in system requirements with what is actually tested

Closes gh-26209
 2021-04-22 14:48:06 +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 0ad7597f56 Merge branch '2.3.x' into 2.4.x 2021-04-22 11:09:50 +02:00
Stephane Nicoll df2f6a4b39 Upgrade Java 11 version in CI image 
Closes gh-26194
 2021-04-22 11:09:34 +02:00
Stephane Nicoll 4c6aece927 Upgrade Java 8 version in CI image 
Closes gh-26195
 2021-04-22 11:09:04 +02:00
Stephane Nicoll 410641d336 Upgrade Java 11 version in CI image 
Closes gh-26198
 2021-04-22 11:08:04 +02:00
Stephane Nicoll e5a9defbc5 Upgrade Java 8 version in CI image 
Closes gh-26197
 2021-04-22 11:07:36 +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 b1170efd3b Merge pull request #26188 from izeye 
* pr/26188:
  Polish

Closes gh-26188
 2021-04-21 17:18:53 +02:00
izeye 4be48d0d50 Polish 
See gh-26188
 2021-04-21 15:20:06 +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 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 289ede6541 Merge branch '2.3.x' into 2.4.x 
Closes gh-26177
 2021-04-20 15:52:26 +01:00
Andy Wilkinson 2dce3abe84 Use main branch when working with Homebrew tap's git repo 
Closes gh-26173
 2021-04-20 15:51:06 +01:00
Andy Wilkinson be99f386a8 Merge branch '2.3.x' into 2.4.x 
Closes gh-26175
 2021-04-20 15:47:38 +01:00
Andy Wilkinson 9e5f738f7a Make relative file references in checkstyle.xml more robust 
Closes gh-26174
 2021-04-20 15:47:08 +01:00
Stephane Nicoll 7cbae821b7 Merge branch '2.3.x' into 2.4.x 
Closes gh-26171
 2021-04-20 15:12:29 +02:00
Stephane Nicoll 823840dd21 Merge pull request #26167 from k163377 
* pr/26167:
  Use new update site for Spring Java Format's Eclipse plugin

Closes gh-26167
 2021-04-20 15:12:15 +02:00
wrongwrong 6ee72ff489 Use new update site for Spring Java Format's Eclipse plugin 
See gh-26167
 2021-04-20 15:11:03 +02: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 52543b84c1 Fix sourceType for spring.profiles.include 
Closes gh-26163
 2021-04-20 10:23:42 +02:00
Stephane Nicoll 2bd4ccce8a Document spring.profiles.group in configuration metadata 
Closes gh-26127
 2021-04-20 10:22:43 +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 57c199d4d1 Merge pull request #14928 from nicce 
* pr/14928:
  Polish "Enhance multiple entity manager factories how-to"
  Enhance multiple entity manager factories how-to

Closes gh-14928
 2021-04-19 17:01:09 +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
Stephane Nicoll 54613c77d4 Exclude beans with scheduled methods from global lazy init 
This commit updates TaskSchedulingAutoConfiguration to contribute a
LazyInitializationExcludeFilter that processes beans that have
@Scheduled methods. This lets them be contributed to the context so
that scheduled methods are invoked as expected.

Closes gh-25315
 2021-04-19 14:04:03 +02:00
Andy Wilkinson aa9d0bc421 Merge pull request #26149 from vsriram92 
* gh-26194:
  Polish "Use ConfigDataLocationResolvers' class loader to load resolver names"
  Use ConfigDataLocationResolvers' class loader to load resolver names

Closes gh-26149
 2021-04-19 10:23:41 +01:00
Andy Wilkinson 0c30a5930d Polish "Use ConfigDataLocationResolvers' class loader to load resolver names" 
See gh-26149
 2021-04-19 10:23:27 +01:00
Sriram 4268f8da84 Use ConfigDataLocationResolvers' class loader to load resolver names 
See gh-26149
 2021-04-19 10:06:07 +01:00
Stephane Nicoll d3ca939aa8 Merge branch '2.3.x' into 2.4.x 2021-04-16 09:51:30 +02:00
Stephane Nicoll a1a2f00b65 Upgrade CI to Docker 20.10.6 
Closes gh-26118
 2021-04-16 09:51:14 +02:00
Stephane Nicoll 23cd375e52 Upgrade CI to Docker 20.10.6 
Closes gh-26119
 2021-04-16 09:51:04 +02:00
Phillip Webb 302d500ee9 Add StandardConfigDataResource.getProfile method 
Add a `StandardConfigDataResource.getProfile()` method so that it's
possible to tell the profile used when reading a profile specific
resource.

Fixes gh-25940
 2021-04-15 12:01:34 -07:00
Spring Buildmaster 270bf0f937 Next development version (v2.4.6-SNAPSHOT) 2021-04-15 11:48:25 +00:00
Andy Wilkinson c48a48f0a2 Merge branch '2.3.x' into 2.4.x 2021-04-15 11:48:12 +01:00