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
37,048 Commits 23 Branches 348 Tags 290 MiB
Commit Graph

37048 Commits

Author SHA1 Message Date
Moritz Halbritter 1d29081e61 Merge branch '2.7.x' 2022-03-23 13:47:03 +01:00
Moritz Halbritter 3e26c584fd Merge branch '2.6.x' into 2.7.x 2022-03-23 13:46:49 +01:00
Moritz Halbritter 27ddcbd551 Merge branch '2.5.x' into 2.6.x 2022-03-23 13:46:33 +01:00
Moritz Halbritter cd5d3dbf8d Disable SampleSessionWebFluxApplicationTests on Linux aarch64 
These tests use embedded mongo under the hood.

See gh-30082
 2022-03-23 13:45:25 +01:00
Andy Wilkinson 77e6279d03 Merge branch '2.7.x' 2022-03-23 12:11:24 +00:00
Andy Wilkinson 3255da23a2 Merge branch '2.6.x' into 2.7.x 
Closes gh-30388
 2022-03-23 12:11:13 +00:00
Andy Wilkinson c739831087 Merge branch '2.5.x' into 2.6.x 
Closes gh-30387
 2022-03-23 12:11:02 +00:00
Andy Wilkinson d8cf332c2e Document default value of spring.thymeleaf.reactive.media-types 
Closes gh-30280
 2022-03-23 12:09:48 +00:00
Andy Wilkinson a11816f7fd Merge branch '2.7.x' 2022-03-23 11:48:25 +00:00
Andy Wilkinson 3ee44ca0b0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30386
 2022-03-23 11:47:53 +00:00
Andy Wilkinson f378627f94 Merge branch '2.5.x' into 2.6.x 
Closes gh-30385
 2022-03-23 11:45:31 +00:00
Andy Wilkinson 8d882fa09b Fix possible duplicate templateEngine bean in Thymeleaf auto-config 
Closes gh-30384
 2022-03-23 11:44:59 +00:00
Andy Wilkinson e3b2fb5deb Merge branch '2.7.x' 2022-03-23 11:18:28 +00:00
Andy Wilkinson bcb71dfd1b Merge branch '2.6.x' into 2.7.x 
Closes gh-30383
 2022-03-23 11:18:04 +00:00
Andy Wilkinson 1244c429a6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30382
 2022-03-23 11:17:36 +00:00
Andy Wilkinson e927cd71dd Clarify type matching performed by MockBean and SpyBean 
Closes gh-28656
 2022-03-23 11:17:07 +00:00
Moritz Halbritter 1cd16f6718 Merge branch '2.7.x' 2022-03-23 12:10:58 +01:00
Moritz Halbritter 1fec2f0e9b Merge branch '2.6.x' into 2.7.x 2022-03-23 12:06:57 +01:00
Moritz Halbritter 4e09289076 Merge branch '2.5.x' into 2.6.x 
# Conflicts:
#	spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongodb/src/test/java/smoketest/data/mongo/SampleMongoApplicationTests.java
 2022-03-23 12:04:30 +01:00
Moritz Halbritter 1d15e8c8e2 Disable SampleMongoApplicationTests on Linux aarch64 
See gh-30082
 2022-03-23 12:03:35 +01:00
Andy Wilkinson 3410dd67d0 Merge branch '2.7.x' 2022-03-23 09:58:56 +00:00
Andy Wilkinson 47540eec61 Align default indices options with Spring Data Elasticsearch 
Closes gh-30378
 2022-03-23 09:39:05 +00:00
Andy Wilkinson 009666bc64 Merge branch '2.7.x' 2022-03-23 09:36:46 +00:00
Andy Wilkinson ac3b0ea24a Merge branch '2.6.x' into 2.7.x 
Closes gh-30380
 2022-03-23 09:36:31 +00:00
Andy Wilkinson 24aa4070c9 Merge pull request #30349 from hpoettker 
* gh-30349:
  Fix links to Spring Security Reference Guide

Closes gh-30349
 2022-03-23 09:35:58 +00:00
Henning Poettker 22eb301bcf Fix links to Spring Security Reference Guide 
See gh-30349
 2022-03-23 09:35:30 +00:00
Stephane Nicoll 7ec4c1f636 Merge branch '2.7.x' 2022-03-23 08:08:13 +01:00
Stephane Nicoll 724ba69a6d Upgrade to Spring Integration 6.0.0-M2 
Closes gh-30204
 2022-03-23 08:08:01 +01:00
Stephane Nicoll c46953ae06 Merge branch '2.6.x' into 2.7.x 2022-03-23 08:07:31 +01:00
Stephane Nicoll dc7c1f246f Upgrade to Spring Integration 5.5.10 
Closes gh-30193
 2022-03-23 08:07:11 +01:00
Stephane Nicoll 5011a12f71 Merge branch '2.5.x' into 2.6.x 2022-03-23 08:06:34 +01:00
Stephane Nicoll 589804000b Upgrade to Spring Integration 5.5.10 
Closes gh-30183
 2022-03-23 08:06:25 +01:00
Stephane Nicoll acdfa31f5a Upgrade to Spring Integration 5.5.10 
Closes gh-30175
 2022-03-23 08:05:45 +01:00
Andy Wilkinson 48f8dd28ac Upgrade to Spring AMQP 3.0.0-M2 
Closes gh-30201
 2022-03-22 20:34:40 +00:00
Andy Wilkinson c4425598cf Merge branch '2.7.x' 2022-03-22 20:13:16 +00:00
Andy Wilkinson 79ee53a587 Merge branch '2.6.x' into 2.7.x 
Closes gh-30377
 2022-03-22 20:13:04 +00:00
Andy Wilkinson f063da30d2 Merge branch '2.5.x' into 2.6.x 
Closes gh-30376
 2022-03-22 20:12:48 +00:00
Andy Wilkinson a8bddeb9cf Remove redundant setting of refresh policy 
Closes gh-30375
 2022-03-22 20:12:09 +00:00
Andy Wilkinson a9b6ab77ea Upgrade to Spring Security 6.0.0-M3 
Closes gh-30202
 2022-03-22 19:22:22 +00:00
Scott Frederick 256b7b1bed Merge branch '2.7.x' 2022-03-22 13:43:30 -05:00
Scott Frederick e99b13e009 Merge branch '2.6.x' into 2.7.x 
Closes gh-30374
 2022-03-22 13:42:02 -05:00
Scott Frederick 7a8bde5f7b Enable Paketo system tests for Java versions supported by buildpacks 
Closes gh-30373
 2022-03-22 13:41:24 -05:00
Andy Wilkinson d1e0a8ce02 Merge branch '2.7.x' 2022-03-22 17:55:11 +00:00
Andy Wilkinson 219d946e33 Upgrade to Spring for GraphQL 1.0.0-M6 
Closes gh-29637
 2022-03-22 17:30:21 +00:00
Andy Wilkinson 38e3c777b7 Upgrade to Spring Kafka 3.0.0-M3 
Closes gh-30089
 2022-03-22 17:18:05 +00:00
Andy Wilkinson 0817a46be3 Upgrade to Spring REST Docs 3.0.0-M2 
Closes gh-29544
 2022-03-22 17:14:58 +00:00
Stephane Nicoll c92cf8eda0 Upgrade to Spring HATEOAS 2.0.0-M2 
Closes gh-30371
 2022-03-22 16:38:06 +01:00
Stephane Nicoll 9dfc2131b9 Upgrade to RxJava3 3.1.4 
Closes gh-30370
 2022-03-22 16:38:04 +01:00
Stephane Nicoll 14393fd39a Upgrade to Kotlin 1.6.20-RC2 
Closes gh-30369
 2022-03-22 16:38:02 +01:00
Stephane Nicoll f30b747138 Upgrade to jOOQ 3.16.5 
Closes gh-30368
 2022-03-22 16:37:58 +01:00